From 2a197dda250044c43391b223f7fbe99732fd7a3c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 2 Aug 2023 13:43:41 -0600
Subject: [PATCH] switch images
---
.gitlab-ci.yml | 20 ++++++++++----------
Dockerfile | 6 +++---
ws.Dockerfile | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64c6076dd..18b3ede2f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,11 +70,12 @@ default:
##
# 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
@@ -142,8 +143,8 @@ default:
variables:
DOCKERFILE: Dockerfile
DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
- FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+ BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
+ FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
PUSH_DOCKER: 'false'
REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
@@ -157,7 +158,7 @@ default:
# General Java setup
##
.java:
- image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+ image: ${CI_REGISTRY}/devops/images/usgs/java:11
####
# Stage: build
@@ -180,8 +181,8 @@ CHS Registry:
TAG: build
variables:
DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
- FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+ BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
+ FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
CI_PROJECT_URL=${CI_PROJECT_URL}
PUSH_DOCKER: 'true'
@@ -206,8 +207,8 @@ Container Registry:
TAG: nshmp
variables:
DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
- FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+ BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
+ FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
CI_PROJECT_URL=${CI_PROJECT_URL}
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
@@ -292,7 +293,6 @@ Trigger nshmp-haz-ws CDK:
- *staging-env
- *production-env
script:
- - apk add curl
- |
if [ "${ENVIRONMENT}" == 'production' ]; then
REF="production";
diff --git a/Dockerfile b/Dockerfile
index eaaf180b2..660f0160c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,8 +27,8 @@
# docker build -t nshmp-haz .
####
-ARG BUILD_IMAGE=usgs/amazoncorretto:11
-ARG FROM_IMAGE=usgs/amazoncorretto:11
+ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
+ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
####
# Builder image: Build jar file.
@@ -69,7 +69,7 @@ WORKDIR /app
COPY --from=builder /app/build/libs/nshmp-haz.jar .
COPY scripts scripts
-RUN yum install -y jq \
+RUN apit-get install -y jq \
&& echo "{}" > "${CONFIG_FILE}"
ENTRYPOINT [ "bash", "scripts/docker-entrypoint.sh" ]
diff --git a/ws.Dockerfile b/ws.Dockerfile
index 69a5349a0..19f1c2719 100644
--- a/ws.Dockerfile
+++ b/ws.Dockerfile
@@ -17,8 +17,8 @@
# nshmp-haz-ws
####
-ARG BUILD_IMAGE=usgs/amazoncorretto:11
-ARG FROM_IMAGE=usgs/amazoncorretto:11
+ARG BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
+ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
####
# Builder image: Build jar file.
--
GitLab