Skip to content
9 changes: 8 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ build-review-image:
- mkdir -p /kaniko/.docker
- echo ${CI_ENVIRONMENT_SLUG}
- echo $CI_ENVIRONMENT_SLUG
- echo $CI_COMMIT_BRANCH
- echo $CI_COMMIT_SHA
- |-
KANIKOCFG="\"credsStore\":\"ecr-login\""
if [ "x${http_proxy}" != "x" -o "x${https_proxy}" != "x" ]; then
Expand All @@ -134,7 +136,12 @@ build-review-image:
--cache-ttl=168h
--cache=true
--compressed-caching=false
--build-arg "http_proxy=${http_proxy}" --build-arg "https_proxy=${https_proxy}" --build-arg "no_proxy=${no_proxy}" --build-arg "ARG_CI_ENVIRONMENT_SLUG=${CI_ENVIRONMENT_SLUG}"
--build-arg "http_proxy=${http_proxy}"
--build-arg "https_proxy=${https_proxy}"
--build-arg "no_proxy=${no_proxy}"
--build-arg "ARG_CI_ENVIRONMENT_SLUG=${CI_ENVIRONMENT_SLUG}"
--build-arg "ARG_CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}"
--build-arg "ARG_CI_COMMIT_SHA=${CI_COMMIT_SHA}"

check_changelog:
stage: test
Expand Down
7 changes: 7 additions & 0 deletions dockerfiles/idp_review_app.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ FROM ruby:3.2.2-slim

# Set environment variables
ARG ARG_CI_ENVIRONMENT_SLUG="placeholder"
ARG ARG_CI_COMMIT_BRANCH="branch_placeholder"
ARG ARG_CI_COMMIT_SHA="sha_placeholder"
ENV CI_ENVIRONMENT_SLUG=${ARG_CI_ENVIRONMENT_SLUG}
ENV CI_COMMIT_BRANCH=${ARG_CI_COMMIT_BRANCH}
ENV CI_COMMIT_SHA=${ARG_CI_COMMIT_SHA}
ENV RAILS_ROOT /app
ENV RAILS_ENV production
ENV NODE_ENV production
Expand Down Expand Up @@ -124,6 +128,9 @@ COPY --chown=app:app ./babel.config.js ./babel.config.js
COPY --chown=app:app ./webpack.config.js ./webpack.config.js
COPY --chown=app:app ./.browserslistrc ./.browserslistrc

RUN mkdir -p $RAILS_ROOT/public/api/
RUN echo "{\"branch\":\"$CI_COMMIT_BRANCH\",\"git_sha\":\"$CI_COMMIT_SHA\"}" > $RAILS_ROOT/public/api/deploy.json

# Copy keys
COPY --chown=app:app keys.example $RAILS_ROOT/keys

Expand Down