Skip to content

Commit

Permalink
Docker images: check out matching branches
Browse files Browse the repository at this point in the history
Ensure that code branches in containers match the branch that the
container was built for.
  • Loading branch information
stsnel committed Mar 4, 2024
1 parent b4fc7fe commit 25157c7
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docker/images/yoda_eus/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ LABEL maintainer="Yoda team <[email protected]>"
# 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
Expand Down
2 changes: 1 addition & 1 deletion docker/images/yoda_irods_icat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/images/yoda_portal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LABEL maintainer="Yoda team <[email protected]>"
# 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
Expand Down
2 changes: 1 addition & 1 deletion docker/images/yoda_public/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LABEL maintainer="Yoda team <[email protected]>"
# 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
Expand Down
2 changes: 1 addition & 1 deletion docker/images/yoda_web_mock/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ LABEL maintainer="Yoda team <[email protected]>"
# 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
Expand Down

0 comments on commit 25157c7

Please sign in to comment.