Skip to content

Commit

Permalink
remove latest build tags and images from standard process and require…
Browse files Browse the repository at this point in the history
… usage of explicit branch commit tags
  • Loading branch information
trautmane committed Feb 6, 2024
1 parent 9879215 commit 30fabad
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions docker-build-and-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,12 @@ LAST_LOG=$(git log -1 --oneline) # 62b496e9 (HEAD -> ibeam_msem, origin/i
LAST_COMMIT_ABBREV="${LAST_LOG%% *}" # 62b496e9

BRANCH_COMMIT_TAG="${CURR_BRANCH}-${BUILD_TIMESTAMP}-${LAST_COMMIT_ABBREV}"
LATEST_BRANCH_TAG="${CURR_BRANCH}-latest"

RENDER_ARCHIVE_NAMESPACE="${RENDER_ARCHIVE_NAMESPACE:-registry.int.janelia.org/janelia-render/archive}"
RENDER_ARCHIVE_TAGS="-t ${RENDER_ARCHIVE_NAMESPACE}:${BRANCH_COMMIT_TAG} -t ${RENDER_ARCHIVE_NAMESPACE}:${LATEST_BRANCH_TAG}"
RENDER_ARCHIVE_TAGS="-t ${RENDER_ARCHIVE_NAMESPACE}:${BRANCH_COMMIT_TAG}"

RENDER_WS_NAMESPACE="${RENDER_WS_NAMESPACE:-registry.int.janelia.org/janelia-render/render-ws}"
RENDER_WS_TAGS="-t ${RENDER_WS_NAMESPACE}:${BRANCH_COMMIT_TAG} -t ${RENDER_WS_NAMESPACE}:${LATEST_BRANCH_TAG}"
RENDER_WS_TAGS="-t ${RENDER_WS_NAMESPACE}:${BRANCH_COMMIT_TAG}"

if (( $# > 0 )); then

Expand All @@ -69,10 +68,7 @@ docker build ${RENDER_ARCHIVE_TAGS} --target archive .
docker build ${RENDER_WS_TAGS} --target render-ws .
docker image push ${RENDER_ARCHIVE_NAMESPACE}:${BRANCH_COMMIT_TAG}
docker image push ${RENDER_ARCHIVE_NAMESPACE}:${LATEST_BRANCH_TAG}
docker image push ${RENDER_WS_NAMESPACE}:${BRANCH_COMMIT_TAG}
docker image push ${RENDER_WS_NAMESPACE}:${LATEST_BRANCH_TAG}
"

else
Expand All @@ -81,9 +77,6 @@ else
docker build ${RENDER_WS_TAGS} --target render-ws .

docker image push ${RENDER_ARCHIVE_NAMESPACE}:${BRANCH_COMMIT_TAG}
docker image push ${RENDER_ARCHIVE_NAMESPACE}:${LATEST_BRANCH_TAG}

docker image push ${RENDER_WS_NAMESPACE}:${BRANCH_COMMIT_TAG}
docker image push ${RENDER_WS_NAMESPACE}:${LATEST_BRANCH_TAG}

fi

0 comments on commit 30fabad

Please sign in to comment.