From d690ec097c5400a1c72c0063472b283981ee76a7 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 15 Aug 2023 11:01:58 -0600
Subject: [PATCH] change images
---
.gitlab-ci.yml | 34 ++++++++++------------------------
Dockerfile | 4 ++--
2 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a662b14f..05974852 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,8 @@ variables:
JUNIT_FILES: build/test-results/test/TEST-*.xml
REPORTS_DIR: build/reports
+image: ${CI_REGISTRY}/devops/images/usgs/java:11
+
stages:
- build
- publish
@@ -15,6 +17,10 @@ workflow:
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH
+default:
+ tags:
+ - nshmp
+
####
# Environment Templates
####
@@ -67,10 +73,10 @@ workflow:
# Docker in Docker
##
.dind:
- image: ${DEVOPS_REGISTRY}docker:19.03-git
+ image: ${CI_REGISTRY}/devops/images/docker:20
services:
- alias: docker
- name: ${DEVOPS_REGISTRY}docker:19.03-dind
+ name: ${CI_REGISTRY}/devops/images/docker:20-dind
variables:
DOCKER_DRIVER: overlay2
@@ -124,23 +130,12 @@ workflow:
- build
variables:
DOCKERFILE: Dockerfile
- DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/centos:latest
- FROM_IMAGE=${DEVOPS_REGISTRY}usgs/centos:latest
IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
####
# Java Templates
####
-##
-# General Java setup
-##
-.java:
- image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
- tags:
- - development
-
####
# Stage: test
####
@@ -150,21 +145,17 @@ Build Image:
- .docker-build
variables:
DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
- FROM_IMAGE=${DEVOPS_REGISTRY}usgs/nginx:latest
+ BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
+ FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/nginx:latest
UPSTREAM_PATH: ghsc/nshmp/nshmp-lib
Build Project:
- extends:
- - .java
script:
- ./gradlew assemble;
stage: build
Markdown Lint:
allow_failure: true
- extends:
- - .java
script:
- ./gradlew markdownlint;
stage: build
@@ -176,8 +167,6 @@ Unit Tests:
reports:
junit: ${JUNIT_FILES}
coverage: '/Total.*?([0-9]{1,3})%/'
- extends:
- - .java
script:
- ./gradlew check;
- cat ${JACOCO_HTML_DIR}/index.html;
@@ -188,8 +177,6 @@ Unit Tests:
####
Publish:
- extends:
- - .java
needs:
- Build Image
- Build Project
@@ -215,7 +202,6 @@ Trigger CDK nshmp-libs:
- *staging-env
- *production-env
script:
- - apk add curl
- |
if [ "${ENVIRONMENT}" == 'production' ]; then
REF="production";
diff --git a/Dockerfile b/Dockerfile
index 53ba524d..f3d2f01c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,8 @@
# docker run -p <PORT>:8080 -d <IMAGE_NAME>:<IMAGE_TAG>
####
-ARG BUILD_IMAGE=usgs/amazoncorretto:11
-ARG FROM_IMAGE=usgs/nginx:latest
+ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
+ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/nginx:latest
##
# Builder image, compile JavDocs
--
GitLab