Skip to content
Snippets Groups Projects
Commit 6c0ba70e authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

use ci-job-token

parent 193e61dd
No related branches found
No related tags found
1 merge request!37Maven Registry
...@@ -3,7 +3,6 @@ variables: ...@@ -3,7 +3,6 @@ variables:
CI_REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE} CI_REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
DOCKER_DIR: docker-images DOCKER_DIR: docker-images
DOCKER_TAR: ${DOCKER_DIR}/app.tar DOCKER_TAR: ${DOCKER_DIR}/app.tar
GITLAB_TOKEN: '${GITLAB_API_TOKEN}'
IMAGE_NAME: ${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG} IMAGE_NAME: ${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG}
JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html
JUNIT_FILES: build/test-results/test/TEST-*.xml JUNIT_FILES: build/test-results/test/TEST-*.xml
...@@ -161,7 +160,7 @@ Build Image: ...@@ -161,7 +160,7 @@ Build Image:
script: script:
- | - |
docker build \ docker build \
--build-arg gitlab_token="${GITLAB_TOKEN}" \ --build-arg ci_job_token="${CI_JOB_TOKEN}" \
-t local/${IMAGE_NAME} . -t local/${IMAGE_NAME} .
retry: retry:
max: 2 max: 2
...@@ -192,7 +191,7 @@ Build/Publish Data Images: ...@@ -192,7 +191,7 @@ Build/Publish Data Images:
s3://nshmp-hazard-curves/${data}.nc \ s3://nshmp-hazard-curves/${data}.nc \
DATA/${data}.nc; DATA/${data}.nc;
docker build \ docker build \
--build-arg gitlab_token="${GITLAB_TOKEN}" \ --build-arg ci_job_token="${CI_JOB_TOKEN}" \
--build-arg netcdf_file="DATA/${data}.nc" \ --build-arg netcdf_file="DATA/${data}.nc" \
-t ${INTERNAL_IMAGE_NAME} .; -t ${INTERNAL_IMAGE_NAME} .;
rm DATA/${data}.nc rm DATA/${data}.nc
......
...@@ -18,12 +18,14 @@ FROM usgs/centos:8 as builder ...@@ -18,12 +18,14 @@ FROM usgs/centos:8 as builder
ENV LANG="en_US.UTF-8" ENV LANG="en_US.UTF-8"
ARG gitlab_token ARG gitlab_token=null
ARG ci_job_token=null
ARG libs_dir ARG libs_dir
ARG jar_file ARG jar_file
ARG workdir ARG workdir
ENV GITLAB_TOKEN ${git_username} ENV GITLAB_TOKEN ${gitlab_token}
ENV CI_JOB_TOKEN ${ci_job_token}
WORKDIR ${workdir} WORKDIR ${workdir}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment