From 25157c735854e217cfbea1a46cb0c57ba0a4e780 Mon Sep 17 00:00:00 2001 From: Sietse Snel Date: Mon, 4 Mar 2024 15:56:49 +0100 Subject: [PATCH] Docker images: check out matching branches Ensure that code branches in containers match the branch that the container was built for. --- docker/images/yoda_eus/Dockerfile | 4 ++-- docker/images/yoda_irods_icat/Dockerfile | 2 +- docker/images/yoda_portal/Dockerfile | 2 +- docker/images/yoda_public/Dockerfile | 2 +- docker/images/yoda_web_mock/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/images/yoda_eus/Dockerfile b/docker/images/yoda_eus/Dockerfile index 2fa2fcde2..14015c020 100644 --- a/docker/images/yoda_eus/Dockerfile +++ b/docker/images/yoda_eus/Dockerfile @@ -4,9 +4,9 @@ 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_EUS_BRANCH "$TAG" ENV YODA_PORTAL_REPO "https://github.com/UtrechtUniversity/yoda-portal.git" -ENV YODA_PORTAL_BRANCH "development" +ENV YODA_PORTAL_BRANCH "$TAG" # Network settings EXPOSE 80 diff --git a/docker/images/yoda_irods_icat/Dockerfile b/docker/images/yoda_irods_icat/Dockerfile index 4c9628f6c..f05171834 100644 --- a/docker/images/yoda_irods_icat/Dockerfile +++ b/docker/images/yoda_irods_icat/Dockerfile @@ -12,7 +12,7 @@ ENV IRODS_UU_MSVC_VERSION_RELEASE "2" 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" ENV YODA_RULESET_REPO "https://github.com/UtrechtUniversity/yoda-ruleset.git" -ENV YODA_RULESET_BRANCH "development" +ENV YODA_RULESET_BRANCH "$TAG" ENV PRE_BUILD_RULESET_DEPENDENCIES "yes" # Network settings diff --git a/docker/images/yoda_portal/Dockerfile b/docker/images/yoda_portal/Dockerfile index e460f710d..aca2d4858 100644 --- a/docker/images/yoda_portal/Dockerfile +++ b/docker/images/yoda_portal/Dockerfile @@ -4,7 +4,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" +ENV YODA_PORTAL_BRANCH="$TAG" # Network settings EXPOSE 80 diff --git a/docker/images/yoda_public/Dockerfile b/docker/images/yoda_public/Dockerfile index 83c12efe8..dbe904f6b 100644 --- a/docker/images/yoda_public/Dockerfile +++ b/docker/images/yoda_public/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="Yoda team " # Application settings ARG TAG=development ENV MOAI_REPO "https://github.com/UtrechtUniversity/yoda-moai.git" -ENV MOAI_BRANCH "development" +ENV MOAI_BRANCH "$TAG" # Network settings EXPOSE 80 diff --git a/docker/images/yoda_web_mock/Dockerfile b/docker/images/yoda_web_mock/Dockerfile index da7c6370e..a66bbae83 100644 --- a/docker/images/yoda_web_mock/Dockerfile +++ b/docker/images/yoda_web_mock/Dockerfile @@ -4,7 +4,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" +ENV YODA_MOCK_BRANCH "$TAG" # Network settings EXPOSE 80