CI: update Docker image build logic

- Change development image tags to "development" so that branch name and tag name are the same (and we don't need any logic to translate between branch names and tag names) - Also build images for release-1.9 branch - Also re-build images if their build workflow changes
UtrechtUniversity · Feb 29, 2024 · 9c721a0 · 9c721a0
1 parent 80211fc
commit 9c721a0
Show file tree

Hide file tree

Showing 29 changed files with 149 additions and 42 deletions.
diff --git a/.github/workflows/build-push-image-davrods.yml b/.github/workflows/build-push-image-davrods.yml
@@ -5,7 +5,9 @@ on:
  push:
  branches:
  - 'development'
+ - 'release-1.9'
  paths:
+ - '.github/workflows/build-push-image-davrods.yml'
  - 'docker/images/davrods/**'
 
 jobs:
@@ -16,6 +18,11 @@ jobs:
  contents: read
  packages: write
  steps:
+ - name: Extract branch name
+ shell: bash
+ run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+ id: extract_branch
+
  - name: Check out Yoda repository
  uses: actions/checkout@v3
  with:
@@ -36,4 +43,6 @@ jobs:
  context: yoda/docker/images/davrods
  file: yoda/docker/images/davrods/Dockerfile
  push: true
- tags: ghcr.io/utrechtuniversity/davrods:dev-1.9
+ tags: ghcr.io/utrechtuniversity/davrods:${{ steps.extract_branch.outputs.branch }}
+ build-args: |
+ TAG=${{ steps.extract_branch.outputs.branch }}
diff --git a/.github/workflows/build-push-image-eus.yml b/.github/workflows/build-push-image-eus.yml
@@ -5,7 +5,9 @@ on:
  push:
  branches:
  - 'development'
+ - 'release-1.9'
  paths:
+ - '.github/workflows/build-push-image-eus.yml'
  - 'docker/images/yoda_eus/**'
 
 jobs:
@@ -16,6 +18,11 @@ jobs:
  contents: read
  packages: write
  steps:
+ - name: Extract branch name
+ shell: bash
+ run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+ id: extract_branch
+
  - name: Check out Yoda repository
  uses: actions/checkout@v3
  with:
@@ -36,4 +43,6 @@ jobs:
  context: yoda/docker/images/yoda_eus
  file: yoda/docker/images/yoda_eus/Dockerfile
  push: true
- tags: ghcr.io/utrechtuniversity/yoda-eus:dev-1.9
+ tags: ghcr.io/utrechtuniversity/yoda-eus:${{ steps.extract_branch.outputs.branch }}
+ build-args: |
+ TAG=${{ steps.extract_branch.outputs.branch }}
diff --git a/.github/workflows/build-push-image-mailpit.yml b/.github/workflows/build-push-image-mailpit.yml
@@ -5,7 +5,9 @@ on:
  push:
  branches:
  - 'development'
+ - 'release-1.9'
  paths:
+ - '.github/workflows/build-push-image-mailpit.yml'
  - 'docker/images/mailpit/**'
 
 jobs:
@@ -16,6 +18,11 @@ jobs:
  contents: read
  packages: write
  steps:
+ - name: Extract branch name
+ shell: bash
+ run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+ id: extract_branch
+
  - name: Check out Yoda repository
  uses: actions/checkout@v3
  with:
@@ -36,5 +43,5 @@ jobs:
  - name: Build and push Docker image
  run: |
  cd yoda/docker/images/mailpit
- ./build.sh
- docker push ghcr.io/utrechtuniversity/yoda-mailpit:dev-1.9
+ ./build.sh "${{ steps.extract_branch.outputs.branch }}"
+ docker push ghcr.io/utrechtuniversity/yoda-mailpit:${{ steps.extract_branch.outputs.branch }}
diff --git a/.github/workflows/build-push-image-portal.yml b/.github/workflows/build-push-image-portal.yml
@@ -5,7 +5,9 @@ on:
  push:
  branches:
  - 'development'
+ - 'release-1.9'
  paths:
+ - '.github/workflows/build-push-image-portal.yml'
  - 'docker/images/yoda_portal/**'
 
 jobs:
@@ -16,6 +18,11 @@ jobs:
  contents: read
  packages: write
  steps:
+ - name: Extract branch name
+ shell: bash
+ run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+ id: extract_branch
+
  - name: Check out Yoda repository
  uses: actions/checkout@v3
  with:
@@ -36,4 +43,6 @@ jobs:
  context: yoda/docker/images/yoda_portal
  file: yoda/docker/images/yoda_portal/Dockerfile
  push: true
- tags: ghcr.io/utrechtuniversity/yoda-portal:dev-1.9
+ tags: ghcr.io/utrechtuniversity/yoda-portal:${{ steps.extract_branch.outputs.branch }}
+ build-args: |
+ TAG=${{ steps.extract_branch.outputs.branch }}
diff --git a/.github/workflows/build-push-image-provider.yml b/.github/workflows/build-push-image-provider.yml
@@ -5,7 +5,9 @@ on:
  push:
  branches:
  - 'development'
+ - 'release-1.9'
  paths:
+ - '.github/workflows/build-push-image-provider.yml'
  - 'docker/images/yoda_irods_icat/**'
  - 'roles/irods_completion/files/irods_completion.sh'
  - 'roles/pam_python/files/pam_python.so'
@@ -19,6 +21,11 @@ jobs:
  contents: read
  packages: write
  steps:
+ - name: Extract branch name
+ shell: bash
+ run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+ id: extract_branch
+
  - name: Check out Yoda repository
  uses: actions/checkout@v3
  with:
@@ -44,4 +51,7 @@ jobs:
  context: yoda/docker/images/yoda_irods_icat
  file: yoda/docker/images/yoda_irods_icat/Dockerfile
  push: true
- tags: ghcr.io/utrechtuniversity/yoda-provider:dev-1.9
+ tags: ghcr.io/utrechtuniversity/yoda-provider:${{ steps.extract_branch.outputs.branch }}
+ build-args: |
+ TAG=${{ steps.extract_branch.outputs.branch }}
+
diff --git a/.github/workflows/build-push-image-public.yml b/.github/workflows/build-push-image-public.yml
@@ -5,7 +5,9 @@ on:
  push:
  branches:
  - 'development'
+ - 'release-1.9'
  paths:
+ - '.github/workflows/build-push-image-public.yml'
  - 'docker/images/yoda_public/**'
  - 'roles/yoda_landingpages/files/**'
 
@@ -17,6 +19,11 @@ jobs:
  contents: read
  packages: write
  steps:
+ - name: Extract branch name
+ shell: bash
+ run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+ id: extract_branch
+
  - name: Check out Yoda repository
  uses: actions/checkout@v3
  with:
@@ -42,4 +49,7 @@ jobs:
  context: yoda/docker/images/yoda_public
  file: yoda/docker/images/yoda_public/Dockerfile
  push: true
- tags: ghcr.io/utrechtuniversity/yoda-public:dev-1.9
+ tags: ghcr.io/utrechtuniversity/yoda-public:${{ steps.extract_branch.outputs.branch }}
+ build-args: |
+ TAG=${{ steps.extract_branch.outputs.branch }}
+
diff --git a/.github/workflows/build-push-image-web-mock.yml b/.github/workflows/build-push-image-web-mock.yml
@@ -5,7 +5,9 @@ on:
  push:
  branches:
  - 'development'
+ - 'release-1.9'
  paths:
+ - '.github/workflows/build-push-image-web-mock.yml'
  - 'docker/images/yoda_web_mock/**'
 
 jobs:
@@ -16,6 +18,11 @@ jobs:
  contents: read
  packages: write
  steps:
+ - name: Extract branch name
+ shell: bash
+ run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+ id: extract_branch
+
  - name: Check out Yoda repository
  uses: actions/checkout@v3
  with:
@@ -36,4 +43,7 @@ jobs:
  context: yoda/docker/images/yoda_web_mock
  file: yoda/docker/images/yoda_web_mock/Dockerfile
  push: true
- tags: ghcr.io/utrechtuniversity/yoda-web-mock:dev-1.9
+ tags: ghcr.io/utrechtuniversity/yoda-web-mock:${{ steps.extract_branch.outputs.branch }}
+ build-args: |
+ TAG=${{ steps.extract_branch.outputs.branch }}
+
diff --git a/docker/compose-with-bind-mounts/docker-compose.yml b/docker/compose-with-bind-mounts/docker-compose.yml
@@ -11,7 +11,7 @@ services:
  container_name: provider.yoda
  platform: linux/amd64
  hostname: provider.yoda
- image: ghcr.io/utrechtuniversity/yoda-provider:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-provider:development
  ports:
  - "8247:1247"
  - "20000-20199:20000-20199"
@@ -61,7 +61,7 @@ services:
  container_name: portal.yoda
  platform: linux/amd64
  hostname: portal.yoda
- image: ghcr.io/utrechtuniversity/yoda-portal:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-portal:development
  depends_on:
  - provider
  - eus
@@ -79,7 +79,7 @@ services:
  container_name: eus.yoda
  platform: linux/amd64
  hostname: eus.yoda
- image: ghcr.io/utrechtuniversity/yoda-eus:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-eus:development
  depends_on:
  - extuserdb
  - mailpit
@@ -100,7 +100,7 @@ services:
  container_name: public.yoda
  platform: linux/amd64
  hostname: public.yoda
- image: ghcr.io/utrechtuniversity/yoda-public:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-public:development
  ports:
  - "8446:443"
  build:
@@ -117,7 +117,7 @@ services:
  container_name: data.yoda
  platform: linux/amd64
  hostname: data.yoda
- image: ghcr.io/utrechtuniversity/davrods:dev-1.9
+ image: ghcr.io/utrechtuniversity/davrods:development
  depends_on:
  - provider
  ports:
@@ -130,7 +130,7 @@ services:
  container_name: mailpit.yoda
  platform: linux/amd64
  hostname: mailpit.yoda
- image: ghcr.io/utrechtuniversity/yoda-mailpit:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-mailpit:development
  environment:
  - TZ=Europe/Amsterdam
  build:
@@ -143,7 +143,7 @@ services:
  container_name: datacite-mock.yoda
  platform: linux/amd64
  hostname: datacite-mock.yoda
- image: ghcr.io/utrechtuniversity/yoda-web-mock:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-web-mock:development
  environment:
  - MOCKNAME=datacite
  - MOCKFQDN=datacite-mock.yoda

diff --git a/docker/compose/docker-compose.yml b/docker/compose/docker-compose.yml
@@ -11,7 +11,7 @@ services:
  container_name: provider.yoda
  platform: linux/amd64
  hostname: provider.yoda
- image: ghcr.io/utrechtuniversity/yoda-provider:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-provider:development
  ports:
  - "8247:1247"
  - "20000-20199:20000-20199"
@@ -55,7 +55,7 @@ services:
  container_name: portal.yoda
  platform: linux/amd64
  hostname: portal.yoda
- image: ghcr.io/utrechtuniversity/yoda-portal:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-portal:development
  depends_on:
  - provider
  - eus
@@ -69,7 +69,7 @@ services:
  container_name: eus.yoda
  platform: linux/amd64
  hostname: eus.yoda
- image: ghcr.io/utrechtuniversity/yoda-eus:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-eus:development
  depends_on:
  - extuserdb
  - mailpit
@@ -83,7 +83,7 @@ services:
  container_name: public.yoda
  platform: linux/amd64
  hostname: public.yoda
- image: ghcr.io/utrechtuniversity/yoda-public:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-public:development
  ports:
  - "8446:443"
  build:
@@ -97,7 +97,7 @@ services:
  container_name: data.yoda
  platform: linux/amd64
  hostname: data.yoda
- image: ghcr.io/utrechtuniversity/davrods:dev-1.9
+ image: ghcr.io/utrechtuniversity/davrods:development
  depends_on:
  - provider
  ports:
@@ -110,7 +110,7 @@ services:
  container_name: mailpit.yoda
  platform: linux/amd64
  hostname: mailpit.yoda
- image: ghcr.io/utrechtuniversity/yoda-mailpit:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-mailpit:development
  environment:
  - TZ=Europe/Amsterdam
  build:
@@ -123,7 +123,7 @@ services:
  container_name: datacite-mock.yoda
  platform: linux/amd64
  hostname: datacite-mock.yoda
- image: ghcr.io/utrechtuniversity/yoda-web-mock:dev-1.9
+ image: ghcr.io/utrechtuniversity/yoda-web-mock:development
  environment:
  - MOCKNAME=datacite
  - MOCKFQDN=datacite-mock.yoda

diff --git a/docker/images/davrods/Dockerfile b/docker/images/davrods/Dockerfile
@@ -6,6 +6,7 @@ EXPOSE 80
 EXPOSE 443
 
 # Application settings
+ARG TAG=development
 ENV IRODS_VERSION="4.2.11"
 ENV YUM_REPO_FILE_LOC "https://packages.irods.org/renci-irods.yum.repo"
 ENV YUM_IRODS_REPO_SIGNING_KEY_LOC="https://packages.irods.org/irods-signing-key.asc"
@@ -61,4 +62,4 @@ COPY footer.html /etc/httpd/irods/footer.html
 VOLUME [ "/sys/fs/cgroup" ]
 COPY davrods_init.sh /var/lib/irods/scripts/davrods_init.sh
 RUN chmod 0755 /var/lib/irods/scripts/davrods_init.sh
-CMD ["/var/lib/irods/scripts/davrods_init.sh"]
+CMD ["/var/lib/irods/scripts/davrods_init.sh", "${TAG}"]
diff --git a/docker/images/davrods/build.sh b/docker/images/davrods/build.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 export DOCKER_SCAN_SUGGEST=false
-docker build . -t ghcr.io/utrechtuniversity/davrods:dev-1.9 "$@"
+docker build . -t "ghcr.io/utrechtuniversity/davrods:development" "$@"
diff --git a/docker/images/davrods/davrods_init.sh b/docker/images/davrods/davrods_init.sh
@@ -4,7 +4,12 @@ set -e
 set -o pipefail
 set -u
 
-DATA_VERSION="dev-1.9"
+DATA_VERSION="$1"
+
+if [ -z "$DATA_VERSION" ]
+then echo "Error: no data version argument provided."
+ exit 1
+fi
 
 function before_update {
  echo -e "[...] ${1}"

diff --git a/docker/images/mailpit/build.sh b/docker/images/mailpit/build.sh
@@ -6,6 +6,13 @@ set -x
 
 export MAILPIT_VERSION=1.13.1
 export DOCKER_SCAN_SUGGEST=false
+DOCKER_TAG="$1"
+
+if [ -z "$DOCKER_TAG" ]
+then echo "Error: no docker tag argument provided."
+ exit 1
+else shift
+fi
 
 if [ -d "mailpit" ]
 then rm -rf mailpit
@@ -14,4 +21,4 @@ fi
 git clone https://github.com/axllent/mailpit.git
 cd mailpit
 git checkout "v$MAILPIT_VERSION"
-docker build . -t ghcr.io/utrechtuniversity/yoda-mailpit:dev-1.9 --build-arg VERSION="$MAILPIT_VERSION" "$@"
+docker build . -t "ghcr.io/utrechtuniversity/yoda-mailpit:$DOCKER_TAG" --build-arg VERSION="$MAILPIT_VERSION" "$@"