Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-ws-static
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-ws-static
Commits
6c0ba70e
Commit
6c0ba70e
authored
4 years ago
by
Clayton, Brandon Scott
Browse files
Options
Downloads
Patches
Plain Diff
use ci-job-token
parent
193e61dd
No related branches found
No related tags found
1 merge request
!37
Maven Registry
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+2
-3
2 additions, 3 deletions
.gitlab-ci.yml
Dockerfile
+4
-2
4 additions, 2 deletions
Dockerfile
with
6 additions
and
5 deletions
.gitlab-ci.yml
+
2
−
3
View file @
6c0ba70e
...
@@ -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
gitla
b_token="${
GITLA
B_TOKEN}" \
--build-arg
ci_jo
b_token="${
CI_JO
B_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
gitla
b_token="${
GITLA
B_TOKEN}" \
--build-arg
ci_jo
b_token="${
CI_JO
B_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
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
4
−
2
View file @
6c0ba70e
...
@@ -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}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment