Skip to content

use updated build info variable names #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anarchivist wants to merge 1 commit into
base: main
Choose a base branch
from
Open

use updated build info variable names #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
2 changes: 1 addition & 1 deletion app/lib/build_info.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class BuildInfo
MULTIPLE_HYPHEN_ESCAPE_RE = /((?<=-)-)|(-(?=-))/
HYPHEN_ENTITY_ESCAPE = '&#45;'.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

Expand Down
6 changes: 3 additions & 3 deletions spec/lib/build_info_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down