Docker images: check out matching branches

Ensure that code branches in containers match the branch that the container was built for.
UtrechtUniversity · Mar 4, 2024 · 15ae3ea · 15ae3ea
1 parent cd5d7fb
commit 15ae3ea
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/docker/images/yoda_eus/Dockerfile b/docker/images/yoda_eus/Dockerfile
@@ -4,9 +4,9 @@ LABEL maintainer="Yoda team <yoda@uu.nl>"
 # 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
@@ -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
@@ -4,7 +4,7 @@ LABEL maintainer="Yoda team <yoda@uu.nl>"
 # 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
@@ -4,7 +4,7 @@ LABEL maintainer="Yoda team <yoda@uu.nl>"
 # 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
@@ -4,7 +4,7 @@ LABEL maintainer="Yoda team <yoda@uu.nl>"
 # 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