From 6c0ba70e29725d82e920f857471cacc13de48d48 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Thu, 10 Sep 2020 08:35:19 -0600
Subject: [PATCH] use ci-job-token
---
.gitlab-ci.yml | 5 ++---
Dockerfile | 6 ++++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6580a72..4e0afc2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,6 @@ variables:
CI_REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
DOCKER_DIR: docker-images
DOCKER_TAR: ${DOCKER_DIR}/app.tar
- GITLAB_TOKEN: '${GITLAB_API_TOKEN}'
IMAGE_NAME: ${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG}
JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html
JUNIT_FILES: build/test-results/test/TEST-*.xml
@@ -161,7 +160,7 @@ Build Image:
script:
- |
docker build \
- --build-arg gitlab_token="${GITLAB_TOKEN}" \
+ --build-arg ci_job_token="${CI_JOB_TOKEN}" \
-t local/${IMAGE_NAME} .
retry:
max: 2
@@ -192,7 +191,7 @@ Build/Publish Data Images:
s3://nshmp-hazard-curves/${data}.nc \
DATA/${data}.nc;
docker build \
- --build-arg gitlab_token="${GITLAB_TOKEN}" \
+ --build-arg ci_job_token="${CI_JOB_TOKEN}" \
--build-arg netcdf_file="DATA/${data}.nc" \
-t ${INTERNAL_IMAGE_NAME} .;
rm DATA/${data}.nc
diff --git a/Dockerfile b/Dockerfile
index 86e00f7..1cd6cc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,12 +18,14 @@ FROM usgs/centos:8 as builder
ENV LANG="en_US.UTF-8"
-ARG gitlab_token
+ARG gitlab_token=null
+ARG ci_job_token=null
ARG libs_dir
ARG jar_file
ARG workdir
-ENV GITLAB_TOKEN ${git_username}
+ENV GITLAB_TOKEN ${gitlab_token}
+ENV CI_JOB_TOKEN ${ci_job_token}
WORKDIR ${workdir}
--
GitLab