From 5a23c24ab48a52fa1b3868d8069bd6f331fc7aaf Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Thu, 29 Oct 2020 15:30:42 -0600
Subject: [PATCH] cleanup
---
.gitlab-ci.yml | 4 +++-
Dockerfile | 2 +-
gradle/repositories.gradle | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29c8dac..08981c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,9 @@ Build Image:
- .build
variables:
DOCKER_BUILD_ARGS: |
- ci_job_token="${CI_JOB_TOKEN}"
+ BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
+ FROM_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
+ ci_job_token=${CI_JOB_TOKEN}
Unit Tests:
extends:
diff --git a/Dockerfile b/Dockerfile
index 3ac48a8..6c5bba9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,7 @@ COPY settings.gradle .
COPY src src
COPY openapi.properties .
-RUN ./gradlew --no-daemon assemble \
+RUN ./gradlew assemble \
&& mv ${libs_dir}/*-all.jar ${jar_file}
####
diff --git a/gradle/repositories.gradle b/gradle/repositories.gradle
index 784c51c..6a505b0 100644
--- a/gradle/repositories.gradle
+++ b/gradle/repositories.gradle
@@ -34,7 +34,7 @@ repositories {
maven {
url "https://code.usgs.gov/api/v4/groups/160/-/packages/maven"
name "GitLab"
- if (System.getenv('CI_JOB_TOKEN')) {
+ if (System.getenv("CI_JOB_TOKEN") != null) {
credentials(HttpHeaderCredentials) {
name = 'Job-Token'
value = System.getenv("CI_JOB_TOKEN")
--
GitLab