From 9382f9aae4faaf6198dd4053dc939ea2af6cbc5e Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Fri, 30 Oct 2020 11:12:44 -0600
Subject: [PATCH] update
---
.gitlab-ci.yml | 6 ++----
Dockerfile | 1 +
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f71dd940..2b3661bb9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,4 @@
variables:
- GIT_NSHMP_PASSWORD: ${GITLAB_API_TOKEN}
- GIT_NSHMP_USERNAME: ${GITLAB_USER_EMAIL}
JACOCO_HTML_DIR: build/reports/jacoco/test/html
JUNIT_FILES: build/test-results/test/TEST-*.xml
@@ -32,8 +30,8 @@ stages:
BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
FROM_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
ci_job_token=${CI_JOB_TOKEN}
- git_username=${GIT_NSHMP_USERNAME}
- git_password=${GIT_NSHMP_PASSWORD}
+ git_username=${GITLAB_USER_EMAIL}
+ git_password=${GITLAB_API_TOKEN}
.templates:
adjust-ref: &adjust-ref |
diff --git a/Dockerfile b/Dockerfile
index 8fe300315..9289bafed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,6 +45,7 @@ WORKDIR ${builder_workdir}
COPY . .
+RUN env
RUN ./gradlew assemble
####
--
GitLab