diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f71dd940c0f234b78f67ecb3364060b8e565d11..2b3661bb95a6596be61af19c2db75babdea45c9d 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 8fe300315d5f2fc1cd21dd23013a3af787d7c2cf..9289bafed0957994af1be836e790e6ca073cd24e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,6 +45,7 @@ WORKDIR ${builder_workdir} COPY . . +RUN env RUN ./gradlew assemble ####