diff --git a/Dockerfile b/Dockerfile index 8411eff..efac0ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -177,14 +177,14 @@ RUN rm -r .cache/yarn ARG BUILD_TIMESTAMP ARG BUILD_URL ARG DOCKER_TAG -ARG GIT_BRANCH -ARG GIT_COMMIT -ARG GIT_URL +ARG GIT_REF_NAME +ARG GIT_SHA +ARG GIT_REPOSITORY_URL # build arguments aren't persisted in the image, but ENV values are ENV BUILD_TIMESTAMP="${BUILD_TIMESTAMP}" ENV BUILD_URL="${BUILD_URL}" ENV DOCKER_TAG="${DOCKER_TAG}" -ENV GIT_BRANCH="${GIT_BRANCH}" -ENV GIT_COMMIT="${GIT_COMMIT}" -ENV GIT_URL="${GIT_URL}" +ENV GIT_REF_NAME="${GIT_REF_NAME}" +ENV GIT_SHA="${GIT_SHA}" +ENV GIT_REPOSITORY_URL="${GIT_REPOSITORY_URL}" diff --git a/app/lib/build_info.rb b/app/lib/build_info.rb index 1bfb773..562302c 100644 --- a/app/lib/build_info.rb +++ b/app/lib/build_info.rb @@ -4,7 +4,7 @@ class BuildInfo MULTIPLE_HYPHEN_ESCAPE_RE = /((?<=-)-)|(-(?=-))/ HYPHEN_ENTITY_ESCAPE = '-'.freeze - BUILD_VARS = %w[CI BUILD_TIMESTAMP BUILD_URL DOCKER_TAG GIT_BRANCH GIT_COMMIT GIT_URL].freeze + BUILD_VARS = %w[CI BUILD_TIMESTAMP BUILD_URL DOCKER_TAG GIT_REF_NAME GIT_SHA GIT_REPOSITORY_URL].freeze attr_reader :info diff --git a/spec/lib/build_info_spec.rb b/spec/lib/build_info_spec.rb index b15d061..def165d 100644 --- a/spec/lib/build_info_spec.rb +++ b/spec/lib/build_info_spec.rb @@ -10,9 +10,9 @@ BUILD_TIMESTAMP: '2021-03-22T21:57:07+0000', BUILD_URL: 'https://jenkins.lib.berkeley.edu/job/gitlab/job/lap/job/lap%252Fucbears/job/LIT-2266-build-args/1/', DOCKER_TAG: 'containers.lib.berkeley.edu/lap/ucbears/lit-2266-build-args:build-1', - GIT_BRANCH: 'LIT-2266-build-args', - GIT_COMMIT: 'e2493452b7e6ebe98856fa3aff6b2c8f24063586', - GIT_URL: 'git@git.lib.berkeley.edu:lap/ucbears.git' + GIT_REF_NAME: 'LIT-2266-build-args', + GIT_SHA: 'e2493452b7e6ebe98856fa3aff6b2c8f24063586', + GIT_REPOSITORY_URL: 'git@git.lib.berkeley.edu:lap/ucbears.git' }.freeze end