From 9c721a094dee9c7b53c94f6e8aa7a58fbf6bde1d Mon Sep 17 00:00:00 2001 From: Sietse Snel Date: Thu, 29 Feb 2024 16:09:02 +0100 Subject: [PATCH] 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 --- .github/workflows/build-push-image-davrods.yml | 11 ++++++++++- .github/workflows/build-push-image-eus.yml | 11 ++++++++++- .github/workflows/build-push-image-mailpit.yml | 11 +++++++++-- .github/workflows/build-push-image-portal.yml | 11 ++++++++++- .github/workflows/build-push-image-provider.yml | 12 +++++++++++- .github/workflows/build-push-image-public.yml | 12 +++++++++++- .github/workflows/build-push-image-web-mock.yml | 12 +++++++++++- docker/compose-with-bind-mounts/docker-compose.yml | 14 +++++++------- docker/compose/docker-compose.yml | 14 +++++++------- docker/images/davrods/Dockerfile | 3 ++- docker/images/davrods/build.sh | 2 +- docker/images/davrods/davrods_init.sh | 7 ++++++- docker/images/mailpit/build.sh | 9 ++++++++- docker/images/yoda_eus/Dockerfile | 3 ++- docker/images/yoda_eus/build.sh | 2 +- docker/images/yoda_eus/yoda_eus_init.sh | 7 ++++++- docker/images/yoda_irods_icat/Dockerfile | 3 ++- docker/images/yoda_irods_icat/build.sh | 2 +- docker/images/yoda_irods_icat/irods-icat-init.sh | 7 ++++++- docker/images/yoda_portal/Dockerfile | 3 ++- docker/images/yoda_portal/build.sh | 2 +- docker/images/yoda_portal/yoda_portal_init.sh | 7 ++++++- docker/images/yoda_public/Dockerfile | 3 ++- docker/images/yoda_public/build.sh | 2 +- docker/images/yoda_public/yoda_public_init.sh | 7 ++++++- docker/images/yoda_web_mock/Dockerfile | 3 ++- docker/images/yoda_web_mock/build.sh | 2 +- docker/images/yoda_web_mock/yoda_web_mock_init.sh | 7 ++++++- docs/development/docker-setup.md | 2 +- 29 files changed, 149 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build-push-image-davrods.yml b/.github/workflows/build-push-image-davrods.yml index c3323db70..ecf8814ed 100644 --- 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 index f25a3f9c5..5d6799b53 100644 --- 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 index 425c770d6..3e327a2be 100644 --- 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 index 3c9a69ba8..2a48e4aa1 100644 --- 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 index 1bf9047ad..abf6991e5 100644 --- 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 index 7d19d97fa..6008fb92f 100644 --- 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 index c2f6e44e7..c1e0df659 100644 --- 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 index 4ca1f1cc4..433279220 100644 --- 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 index 39308e381..96d13851b 100644 --- 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 index b027b3d40..4eb6559d4 100644 --- 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 index a1afdedf5..57641af71 100755 --- 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 index 52d308b3f..a77b6a048 100755 --- 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 index a4a236187..02e80c3a0 100755 --- 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" "$@" diff --git a/docker/images/yoda_eus/Dockerfile b/docker/images/yoda_eus/Dockerfile index 5b525f04e..a2544f9dd 100644 --- a/docker/images/yoda_eus/Dockerfile +++ b/docker/images/yoda_eus/Dockerfile @@ -2,6 +2,7 @@ FROM centos:7 LABEL maintainer="Yoda team " # Application settings +ARG TAG=development ENV YODA_EUS_REPO "https://github.com/UtrechtUniversity/yoda-external-user-service.git" ENV YODA_EUS_BRANCH "development" ENV YODA_PORTAL_REPO "https://github.com/UtrechtUniversity/yoda-portal.git" @@ -70,4 +71,4 @@ RUN cp -Rdp /var/www/extuser /var/www/extuser-copy VOLUME [ "/sys/fs/cgroup" ] COPY yoda_eus_init.sh /var/lib/irods/scripts/yoda_eus_init.sh RUN chmod 0755 /var/lib/irods/scripts/yoda_eus_init.sh -CMD ["/var/lib/irods/scripts/yoda_eus_init.sh"] +CMD ["/var/lib/irods/scripts/yoda_eus_init.sh", "${TAG}"] diff --git a/docker/images/yoda_eus/build.sh b/docker/images/yoda_eus/build.sh index 9a48b61fc..76983e352 100755 --- a/docker/images/yoda_eus/build.sh +++ b/docker/images/yoda_eus/build.sh @@ -1,3 +1,3 @@ #!/bin/sh export DOCKER_SCAN_SUGGEST=false -docker build . -t ghcr.io/utrechtuniversity/yoda-eus:dev-1.9 "$@" +docker build . -t ghcr.io/utrechtuniversity/yoda-eus:development "$@" diff --git a/docker/images/yoda_eus/yoda_eus_init.sh b/docker/images/yoda_eus/yoda_eus_init.sh index 99f23a7dd..979f95186 100644 --- a/docker/images/yoda_eus/yoda_eus_init.sh +++ b/docker/images/yoda_eus/yoda_eus_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/yoda_irods_icat/Dockerfile b/docker/images/yoda_irods_icat/Dockerfile index 2d21f7e54..b3e8fb29e 100644 --- a/docker/images/yoda_irods_icat/Dockerfile +++ b/docker/images/yoda_irods_icat/Dockerfile @@ -2,6 +2,7 @@ FROM centos:7 LABEL maintainer="Yoda team " # Application settings +ARG TAG=development ENV IRODS_VERSION "4.2.12" ENV IRODS_PREP_VERSION "4.2.12.0" ENV IRODS_INDEX_VERSION "4.2.12.0-1" @@ -182,4 +183,4 @@ COPY irods-icat-init.sh /var/lib/irods/scripts/irods-icat-init.sh RUN chmod 0755 /var/lib/irods/scripts/irods-icat-init.sh VOLUME [ "/sys/fs/cgroup" ] -CMD ["/var/lib/irods/scripts/irods-icat-init.sh"] +CMD ["/var/lib/irods/scripts/irods-icat-init.sh", "${TAG}"] diff --git a/docker/images/yoda_irods_icat/build.sh b/docker/images/yoda_irods_icat/build.sh index 5111d81e0..7f4494a14 100755 --- a/docker/images/yoda_irods_icat/build.sh +++ b/docker/images/yoda_irods_icat/build.sh @@ -1,3 +1,3 @@ #!/bin/sh export DOCKER_SCAN_SUGGEST=false -docker build . -t ghcr.io/utrechtuniversity/yoda-provider:dev-1.9 "$@" +docker build . -t ghcr.io/utrechtuniversity/yoda-provider:development "$@" diff --git a/docker/images/yoda_irods_icat/irods-icat-init.sh b/docker/images/yoda_irods_icat/irods-icat-init.sh index 0bf077bc3..e910a094c 100644 --- a/docker/images/yoda_irods_icat/irods-icat-init.sh +++ b/docker/images/yoda_irods_icat/irods-icat-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/yoda_portal/Dockerfile b/docker/images/yoda_portal/Dockerfile index dc59f5c26..a5b06681f 100644 --- a/docker/images/yoda_portal/Dockerfile +++ b/docker/images/yoda_portal/Dockerfile @@ -2,6 +2,7 @@ FROM centos:7 LABEL maintainer="Yoda team " # Application settings +ARG TAG=development ENV YODA_PORTAL_REPO "https://github.com/UtrechtUniversity/yoda-portal.git" ENV YODA_PORTAL_BRANCH "development" @@ -55,4 +56,4 @@ RUN cp -Rdp /var/www/yoda /var/www/yoda-copy VOLUME [ "/sys/fs/cgroup" ] COPY yoda_portal_init.sh /var/lib/irods/scripts/yoda_portal_init.sh RUN chmod 0755 /var/lib/irods/scripts/yoda_portal_init.sh -CMD ["/var/lib/irods/scripts/yoda_portal_init.sh"] +CMD ["/var/lib/irods/scripts/yoda_portal_init.sh", "${TAG}"] diff --git a/docker/images/yoda_portal/build.sh b/docker/images/yoda_portal/build.sh index 63e6c00c7..fdd411123 100755 --- a/docker/images/yoda_portal/build.sh +++ b/docker/images/yoda_portal/build.sh @@ -1,3 +1,3 @@ #!/bin/sh export DOCKER_SCAN_SUGGEST=false -docker build . -t ghcr.io/utrechtuniversity/yoda-portal:dev-1.9 "$@" +docker build . -t ghcr.io/utrechtuniversity/yoda-portal:development "$@" diff --git a/docker/images/yoda_portal/yoda_portal_init.sh b/docker/images/yoda_portal/yoda_portal_init.sh index 719f91d56..fa2fb2432 100644 --- a/docker/images/yoda_portal/yoda_portal_init.sh +++ b/docker/images/yoda_portal/yoda_portal_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/yoda_public/Dockerfile b/docker/images/yoda_public/Dockerfile index a0fb4f58c..d94167630 100644 --- a/docker/images/yoda_public/Dockerfile +++ b/docker/images/yoda_public/Dockerfile @@ -2,6 +2,7 @@ FROM centos:7 LABEL maintainer="Yoda team " # Application settings +ARG TAG=development ENV MOAI_REPO "https://github.com/UtrechtUniversity/yoda-moai.git" ENV MOAI_BRANCH "development" @@ -96,4 +97,4 @@ RUN cp -Rdp /var/www/moai/yoda-moai /var/www/moai/yoda-moai-copy VOLUME [ "/sys/fs/cgroup" ] COPY yoda_public_init.sh /yoda_public_init.sh RUN chmod 0755 /yoda_public_init.sh -CMD ["/yoda_public_init.sh"] +CMD ["/yoda_public_init.sh", "${TAG}"] diff --git a/docker/images/yoda_public/build.sh b/docker/images/yoda_public/build.sh index f0c45c27a..97664eb1f 100755 --- a/docker/images/yoda_public/build.sh +++ b/docker/images/yoda_public/build.sh @@ -1,3 +1,3 @@ #!/bin/sh export DOCKER_SCAN_SUGGEST=false -docker build . -t ghcr.io/utrechtuniversity/yoda-public:dev-1.9 "$@" +docker build . -t ghcr.io/utrechtuniversity/yoda-public:development "$@" diff --git a/docker/images/yoda_public/yoda_public_init.sh b/docker/images/yoda_public/yoda_public_init.sh index cb7596602..345db59dd 100644 --- a/docker/images/yoda_public/yoda_public_init.sh +++ b/docker/images/yoda_public/yoda_public_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/yoda_web_mock/Dockerfile b/docker/images/yoda_web_mock/Dockerfile index a6528eb0d..38efce94b 100644 --- a/docker/images/yoda_web_mock/Dockerfile +++ b/docker/images/yoda_web_mock/Dockerfile @@ -2,6 +2,7 @@ FROM centos:7 LABEL maintainer="Yoda team " # Application settings +ARG TAG=development ENV YODA_MOCK_REPO "https://github.com/UtrechtUniversity/yoda-web-mock.git" ENV YODA_MOCK_BRANCH "development" @@ -58,4 +59,4 @@ RUN cp -Rdp /var/www/webmock/yoda-web-mock /var/www/webmock/yoda-web-mock-copy VOLUME [ "/sys/fs/cgroup" ] COPY yoda_web_mock_init.sh /yoda_web_mock_init.sh RUN chmod 0755 /yoda_web_mock_init.sh -CMD ["/yoda_web_mock_init.sh"] +CMD ["/yoda_web_mock_init.sh", "${TAG}"] diff --git a/docker/images/yoda_web_mock/build.sh b/docker/images/yoda_web_mock/build.sh index 4d613db14..d0a23c495 100755 --- a/docker/images/yoda_web_mock/build.sh +++ b/docker/images/yoda_web_mock/build.sh @@ -1,3 +1,3 @@ #!/bin/sh export DOCKER_SCAN_SUGGEST=false -docker build . -t ghcr.io/utrechtuniversity/yoda-web-mock:dev-1.9 "$@" +docker build . -t ghcr.io/utrechtuniversity/yoda-web-mock:development "$@" diff --git a/docker/images/yoda_web_mock/yoda_web_mock_init.sh b/docker/images/yoda_web_mock/yoda_web_mock_init.sh index ffdc133ef..e7cd4ed2f 100644 --- a/docker/images/yoda_web_mock/yoda_web_mock_init.sh +++ b/docker/images/yoda_web_mock/yoda_web_mock_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/docs/development/docker-setup.md b/docs/development/docker-setup.md index c2df2e586..5086c9a97 100644 --- a/docs/development/docker-setup.md +++ b/docs/development/docker-setup.md @@ -170,7 +170,7 @@ cd docker/images/yoda_irods_icat ```bash cd docker/images/mailpit -./build.sh +./build.sh development ``` ### Yoda portal