diff --git a/.github/workflows/docker-publish-base.yml b/.github/workflows/docker-publish-base.yml index e44b698..9a11bf9 100644 --- a/.github/workflows/docker-publish-base.yml +++ b/.github/workflows/docker-publish-base.yml @@ -1,22 +1,26 @@ name: Update base image + on: workflow_dispatch: schedule: - cron: '0 2 * * *' # Daily at 02:00 +env: + IMAGE_NAME: delib/iadelib + jobs: base: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish base image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - tags: | - imiobe/iadelib:base - "${{ secrets.HARBOR_URL }}/delib/iadelib:base" - dockerfile: ./docker/Dockerfile-base \ No newline at end of file + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:base" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + CONTEXT: '.' + DOCKERFILE: './docker/Dockerfile-base' diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 9c1d1ed..fdaaf10 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -1,32 +1,47 @@ name: Update images + on: workflow_dispatch: push: branches: [ master ] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + +env: + IMAGE_NAME: delib/iadelib + jobs: - docker: - runs-on: ubuntu-latest + docker-latest: + runs-on: gha-runners-delib steps: - - name: Build latest - uses: IMIO/buildout.pm/actions/harbor@master + - name: Build and publish communes image to harbor + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - tags: | - imiobe/iadelib:latest - "${{ secrets.HARBOR_URL }}/delib/iadelib:latest" - dockerfile: ./docker/Dockerfile-latest + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:latest" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + CONTEXT: '.' + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=communes.cfg' + + docker-dev: + runs-on: gha-runners-delib + steps: - name: Build and publish dev image - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - tags: imiobe/iadelib:dev - dockerfile: ./docker/Dockerfile-dev - profile: communes-dev + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:dev" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + CONTEXT: '.' + DOCKERFILE: './docker/Dockerfile-dev' + BUILD_ARGS: 'PROFILE=communes-dev.cfg' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ebb450e..e868170 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,167 +1,183 @@ name: Release on: + workflow_dispatch: create: tag: + push: + tags: + - '**' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + +env: + IMAGE_NAME: delib/iadelib jobs: communes: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish communes image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - tags: | - "imiobe/iadelib:${{ github.ref_name }}" - "imiobe/iadelib:communes-${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:communes-${{ github.ref_name }}" + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}" + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:communes-${{ github.ref_name }}" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + CONTEXT: '.' + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=communes.cfg' bep: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish bep image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - profile: bep - tags: | - "imiobe/iadelib:bep-${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:bep-${{ github.ref_name }}" + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:bep-${{ github.ref_name }}" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + CONTEXT: '.' + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=bep.cfg' charleroi: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish charleroi image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - profile: charleroi - tags: | - "imiobe/iadelib:charleroi-${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:charleroi-${{ github.ref_name }}" + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:charleroi-${{ github.ref_name }}" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + CONTEXT: '.' + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=charleroi.cfg' hainaut-prov: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish hainaut-prov image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - profile: hainaut-prov - tags: | - "imiobe/iadelib:hainaut-prov-${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:hainaut-prov-${{ github.ref_name }}" + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:hainaut-prov-${{ github.ref_name }}" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + CONTEXT: '.' + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=hainaut-prov.cfg' lalouviere: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish lalouviere image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - profile: lalouviere - tags: | - "imiobe/iadelib:lalouviere-${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:lalouviere-${{ github.ref_name }}" + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:lalouviere-${{ github.ref_name }}" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + CONTEXT: '.' + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=lalouviere.cfg' lalouviere-cpas: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish lalouviere-cpas image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - profile: lalouviere-cpas - tags: | - "imiobe/iadelib:lalouviere-cpas-${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:lalouviere-cpas-${{ github.ref_name }}" + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:lalouviere-cpas-${{ github.ref_name }}" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + CONTEXT: '.' + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=lalouviere-cpas.cfg' liege: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish liege image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - profile: liege - tags: | - "imiobe/iadelib:liege-${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:liege-${{ github.ref_name }}" + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:liege-${{ github.ref_name }}" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=liege.cfg' mons: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish mons image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - profile: mons - tags: | - "imiobe/iadelib:mons-${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:mons-${{ github.ref_name }}" + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:mons-${{ github.ref_name }}" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=mons.cfg' namur: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish namur image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - profile: namur - tags: | - "imiobe/iadelib:namur-${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:namur-${{ github.ref_name }}" + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:namur-${{ github.ref_name }}" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=namur.cfg' seraing: - runs-on: ubuntu-latest + runs-on: gha-runners-delib steps: - name: Build and publish seraing image to harbor - uses: IMIO/buildout.pm/actions/harbor@master + uses: IMIO/gha/build-push-notify@v3.2 with: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} - HARBOR_URL: ${{ secrets.HARBOR_URL }} - DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} - DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} - profile: seraing - tags: | - "imiobe/iadelib:seraing-${{ github.ref_name }}" - "${{ secrets.HARBOR_URL }}/delib/iadelib:seraing-${{ github.ref_name }}" + IMAGE_NAME: ${{ env.IMAGE_NAME }} + IMAGE_TAGS: | + "${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:seraing-${{ github.ref_name }}" + REGISTRY_URL: ${{ secrets.HARBOR_URL }} + REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }} + REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }} + MATTERMOST_WEBHOOK_URL: ${{ secrets.DELIB_MATTERMOST_WEBHOOK_URL }} + DOCKERFILE: './docker/Dockerfile-latest' + BUILD_ARGS: 'PROFILE=seraing.cfg' diff --git a/actions/harbor/action.yml b/actions/harbor/action.yml deleted file mode 100644 index 235d940..0000000 --- a/actions/harbor/action.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: 'Build and publish to harbor' -description: 'Build and publish to dockerhub and IMIO container registry' -inputs: - DOCKERHUB_USERNAME: - description: 'DOCKERHUB_USERNAME' - required: true - DOCKERHUB_PASSWORD: - description: 'DOCKERHUB_PASSWORD' - required: true - HARBOR_URL: - description: 'HARBOR_URL' - required: true - DELIB_HARBOR_USERNAME: - description: 'DELIB_HARBOR_USERNAME' - required: true - DELIB_HARBOR_PASSWORD: - description: 'DELIB_HARBOR_PASSWORD' - required: true - profile: - description: 'Buildout profile' - required: true - default: 'communes' - tags: - description: 'Tag name' - required: false - dockerfile: - description: 'Path to Dockerfile' - required: true - default: ./docker/Dockerfile-latest -runs: - using: "composite" - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ inputs.DOCKERHUB_USERNAME }} - password: ${{ inputs.DOCKERHUB_PASSWORD }} - - name: Login to Harbor - uses: docker/login-action@v3 - with: - registry: ${{ inputs.HARBOR_URL }} - username: ${{ inputs.DELIB_HARBOR_USERNAME }} - password: ${{ inputs.DELIB_HARBOR_PASSWORD }} - - name: Build and push - uses: docker/build-push-action@v5 - with: - context: . - file: ${{ inputs.dockerfile }} - tags: ${{ inputs.tags }} - platforms: linux/amd64 - pull: true - push: true - build-args: PROFILE=${{ inputs.profile }}.cfg \ No newline at end of file diff --git a/docker/Dockerfile-base b/docker/Dockerfile-base index 2f98b6b..349ff09 100644 --- a/docker/Dockerfile-base +++ b/docker/Dockerfile-base @@ -1,4 +1,4 @@ -FROM imiobe/plone-base:4.3.20-ubuntu as builder +FROM harbor.imio.be/common/plone-base:4.3.20-ubuntu as builder ARG PROFILE="communes.cfg" @@ -77,7 +77,7 @@ RUN apt-get update -qqy \ && su -c "bin/buildout -t 30 -N" -s /bin/bash imio \ && rm -rf develop-eggs src var/blobstorage var/filestorage parts bin/instance? parts .git/hooks/pre-commit var/tmp -FROM imiobe/plone-base:4.3.20-ubuntu +FROM harbor.imio.be/common/plone-base:4.3.20-ubuntu ENV DELIB_MAJOR=4.2 LABEL delib=$DELIB_VERSION \ diff --git a/docker/Dockerfile-dev b/docker/Dockerfile-dev index 42687fb..15558be 100644 --- a/docker/Dockerfile-dev +++ b/docker/Dockerfile-dev @@ -1,4 +1,4 @@ -FROM imiobe/iadelib:latest +FROM harbor.imio.be/delib/iadelib:latest ARG PROFILE="communes-dev.cfg" diff --git a/docker/Dockerfile-latest b/docker/Dockerfile-latest index a475fda..a130754 100644 --- a/docker/Dockerfile-latest +++ b/docker/Dockerfile-latest @@ -1,4 +1,4 @@ -FROM imiobe/iadelib:base as builder +FROM harbor.imio.be/delib/iadelib:base as builder ARG PROFILE="communes.cfg" @@ -78,12 +78,12 @@ RUN apt-get update \ && rm /plone/get_run_scripts.sh -FROM imiobe/iadelib:base +FROM harbor.imio.be/delib/iadelib:base ENV DELIB_MAJOR=4.2 LABEL delib=$DELIB_VERSION \ name="ia.Delib" \ - description="ia.Delib image, based on imiobe/plone-base:4.3.20-ubuntu-20.04" \ + description="ia.Delib image, based on harbor.imio.be/common/plone-base:4.3.20-ubuntu-20.04" \ maintainer="iMio" COPY --from=builder /usr/local/lib/python2.7/dist-packages /usr/local/lib/python2.7/dist-packages diff --git a/docker/Dockerfile-test b/docker/Dockerfile-test index ab9ffb0..888a8d9 100644 --- a/docker/Dockerfile-test +++ b/docker/Dockerfile-test @@ -1,4 +1,4 @@ -FROM imiobe/iadelib:dev +FROM harbor.imio.be/delib/iadelib:dev ARG PROFILE="communes-dev.cfg" ARG PR_NUM='' diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml index 6d697f9..7b135c0 100644 --- a/docker/docker-compose-dev.yml +++ b/docker/docker-compose-dev.yml @@ -19,7 +19,7 @@ services: mem_swappiness: 0 zeo: - image: imiobe/iadelib:dev + image: harbor.imio.be/delib/iadelib:dev command: zeoserver environment: - HOSTNAME=zeo @@ -35,7 +35,7 @@ services: test: "/plone/zeo_healthcheck.sh" instance: - image: imiobe/iadelib:dev + image: harbor.imio.be/delib/iadelib:dev command: instance ports: - "20081:8081" @@ -62,7 +62,7 @@ services: SERVICE_NAME: "instance1" worker-async: - image: imiobe/iadelib:dev + image: harbor.imio.be/delib/iadelib:dev command: instance-async networks: - delib_internal @@ -85,7 +85,7 @@ services: SERVICE_NAME: "worker-async" maintenance: - image: imiobe/iadelib:dev + image: harbor.imio.be/delib/iadelib:dev ports: - "20089:8080" networks: diff --git a/docker/docker-compose-jenkins.yml b/docker/docker-compose-jenkins.yml index 5cbce1b..a78354a 100644 --- a/docker/docker-compose-jenkins.yml +++ b/docker/docker-compose-jenkins.yml @@ -18,7 +18,7 @@ services: mem_swappiness: 0 instance: - image: imiobe/iadelib:dev + image: harbor.imio.be/delib/iadelib:dev command: bin/testmc -t testAdvice depends_on: - loffice diff --git a/docker/docker-compose-minimal.yml b/docker/docker-compose-minimal.yml index 6647d06..9655e53 100644 --- a/docker/docker-compose-minimal.yml +++ b/docker/docker-compose-minimal.yml @@ -20,7 +20,7 @@ services: mem_swappiness: 0 zeo: - image: imiobe/iadelib:latest + image: harbor.imio.be/delib/iadelib:latest command: zeoserver environment: - HOSTNAME=zeo @@ -36,7 +36,7 @@ services: test: "/plone/zeo_healthcheck.sh" instance: - image: imiobe/iadelib:latest + image: harbor.imio.be/delib/iadelib:latest command: instance ports: - "20081:8081" diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 087643b..d99c197 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -20,7 +20,7 @@ services: mem_swappiness: 0 zeo: - image: imiobe/iadelib:latest + image: harbor.imio.be/delib/iadelib:latest command: zeoserver environment: - HOSTNAME=zeo @@ -36,7 +36,7 @@ services: test: "/plone/zeo_healthcheck.sh" instance: - image: imiobe/iadelib:latest + image: harbor.imio.be/delib/iadelib:latest command: instance ports: - "20081:8081" @@ -63,7 +63,7 @@ services: SERVICE_NAME: "instance1" worker-async: - image: imiobe/iadelib:latest + image: harbor.imio.be/delib/iadelib:latest command: instance-async networks: - delib_internal @@ -86,7 +86,7 @@ services: SERVICE_NAME: "worker-async" worker-amqp: - image: imiobe/iadelib:latest + image: harbor.imio.be/delib/iadelib:latest command: instance-amqp ports: - "20085:8286" @@ -119,7 +119,7 @@ services: SERVICE_NAME: "worker-amqp" maintenance: - image: imiobe/iadelib:latest + image: harbor.imio.be/delib/iadelib:latest ports: - "20089:8080" networks: