From df0133c6e48c0b9706d00b7fdd918cf83b157436 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 29 Oct 2024 09:26:19 -0600
Subject: [PATCH 1/4] update docker image and dont push to docker hub
---
.gitlab-ci.yml | 31 ++++++-------------------------
1 file changed, 6 insertions(+), 25 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee30d24b..5442f8a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,8 @@ variables:
PRODUCTION_BRANCH: legacy-ws-production
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
+image: ${CI_REGISTRY}/devops/images/usgs/java:8
+
# Do not run for merge requests
workflow:
rules:
@@ -58,16 +60,6 @@ default:
variables:
ENVIRONMENT: production
-####
-# Java Templates
-####
-
-##
-# General Java setup
-##
-.java:
- image: ${DEVOPS_REGISTRY}usgs/amazoncorretto:8
-
####
# Docker Templates
####
@@ -76,10 +68,10 @@ 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
@@ -118,18 +110,9 @@ default:
docker tag "${env_image_name}" "${sha_image_name}";
docker push "${sha_image_name}";
- |
- docker_latest_image="usgs/${CI_PROJECT_NAME}:latest";
- docker_env_image="usgs/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
-
- docker tag "${env_image_name}" "${docker_env_image}";
- docker push "${docker_env_image}";
-
if [[ "${ENVIRONMENT}" != "development" ]]; then
docker tag "${env_image_name}" "${latest_image_name}";
docker push "${latest_image_name}";
-
- docker tag "${env_image_name}" "${docker_latest_image}";
- docker push "${docker_latest_image}";
fi
- |
printf "
@@ -150,14 +133,12 @@ Build Image:
- .docker-build
variables:
DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:8
- FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:8
+ BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:8
+ FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:8
DOCKERFILE: Dockerfile
IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
Build Project:
- extends:
- - .java
before_script:
- mkdir -p ${DIR}
- mv $(ls -1 | grep -v $(basename $(dirname ${DIR}))) ${DIR}/.
--
GitLab
From a34136ede83c617f83b6161e9253a9c7276ccd06 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 29 Oct 2024 09:31:08 -0600
Subject: [PATCH 2/4] change image
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5442f8a3..384c4d77 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
PRODUCTION_BRANCH: legacy-ws-production
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
-image: ${CI_REGISTRY}/devops/images/usgs/java:8
+image: ${CI_REGISTRY}/devops/images/usgs/java:11
# Do not run for merge requests
workflow:
@@ -133,8 +133,8 @@ Build Image:
- .docker-build
variables:
DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:8
- FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:8
+ BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
+ FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11
DOCKERFILE: Dockerfile
IMAGE_TAG: ${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
--
GitLab
From cf626373dabd6b6fda0b1c5bb1c4a4ebdd17f77c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 29 Oct 2024 09:37:41 -0600
Subject: [PATCH 3/4] update docker
---
Dockerfile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index fa5ab6f2..be213074 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@
# OutOfMemoryError. Increase -Xmx to -Xmx16g or -Xmx24g, if available.
####
-ARG FROM_IMAGE=usgs/amazoncorretto:8
+ARG FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/java:11
####
# Build nshmp-haz-ws
@@ -43,7 +43,10 @@ ENV TOMCAT_URL=${TOMCAT_SOURCE}/tomcat-8/v${TOMCAT_VERSION}/bin/apache-tomcat-${
# Install Tomcat
WORKDIR ${CATALINA_HOME}
-RUN curl -L ${TOMCAT_URL} | tar -xz --strip-components=1
+USER root
+RUN yum install -y tar \
+ && curl -L ${TOMCAT_URL} | tar -xz --strip-components=1
+USER usgs-user
ENV WORKDIR=/app
ENV WAR_PATH=${WORKDIR}/build/libs/nshmp-haz-ws.war
--
GitLab
From 11581daaf574cd4030df5b10d4229d193172d0a1 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 29 Oct 2024 09:42:40 -0600
Subject: [PATCH 4/4] remove apk
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 384c4d77..72f034fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -164,7 +164,6 @@ Trigger nshmp-haz-ws Legacy CDK:
- *staging-env
- *production-env
script:
- - apk add curl
- |
if [ "${ENVIRONMENT}" == 'production' ]; then
REF="production";
--
GitLab