From ebaf93bdff1b8d0695ede1769f31ab37b9cb180d Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 22 Aug 2024 10:54:19 -0600
Subject: [PATCH] test
---
.gitlab-ci.yml | 1 -
Dockerfile | 54 +++++++++++++++++++++++++-------------------------
2 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5efa0ae81..df402930f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,6 @@ default:
done
- |
docker build \
- --debug \
${BUILD_ARGS} \
--pull \
--tag "${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" \
diff --git a/Dockerfile b/Dockerfile
index f7a1d8707..576a64998 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,30 +28,30 @@ WORKDIR /app
RUN /bin/bash scripts/docker-build.sh
-##
-# Application image, run nshmp-apps in nginx
-##
-FROM ${FROM_IMAGE}
-
-# Set environment variables for use by startup hooks
-ENV BASE_SERVICE_URL="https://earthquake.usgs.gov" \
- DOCUMENT_ROOT="/usr/share/nginx/html" \
- HEALTHCHECK_SCRIPT="/healthcheck.sh" \
- NGINX_CONF_DIR="/etc/nginx/default.d"
-
-USER root
-RUN rm -rf ${DOCUMENT_ROOT}/ && \
- mkdir -p ${DOCUMENT_ROOT}/nshmp && \
- chown usgs-user:usgs-user ${HEALTHCHECK_SCRIPT} && \
- chown -R usgs-user:usgs-user /usr/share/nginx && \
- chown -R usgs-user:usgs-user /etc/nginx
-USER usgs-user
-
-COPY --chown=usgs-user:usgs-user hooks /startup-hooks/
-
-COPY --from=buildenv \
- --chown=usgs-user:usgs-user \
- /app/dist/nshmp-apps/browser/ \
- ${DOCUMENT_ROOT}/nshmp/
-
-WORKDIR /usr/share/nginx
+# ##
+# # Application image, run nshmp-apps in nginx
+# ##
+# FROM ${FROM_IMAGE}
+
+# # Set environment variables for use by startup hooks
+# ENV BASE_SERVICE_URL="https://earthquake.usgs.gov" \
+# DOCUMENT_ROOT="/usr/share/nginx/html" \
+# HEALTHCHECK_SCRIPT="/healthcheck.sh" \
+# NGINX_CONF_DIR="/etc/nginx/default.d"
+
+# USER root
+# RUN rm -rf ${DOCUMENT_ROOT}/ && \
+# mkdir -p ${DOCUMENT_ROOT}/nshmp && \
+# chown usgs-user:usgs-user ${HEALTHCHECK_SCRIPT} && \
+# chown -R usgs-user:usgs-user /usr/share/nginx && \
+# chown -R usgs-user:usgs-user /etc/nginx
+# USER usgs-user
+
+# COPY --chown=usgs-user:usgs-user hooks /startup-hooks/
+
+# COPY --from=buildenv \
+# --chown=usgs-user:usgs-user \
+# /app/dist/nshmp-apps/browser/ \
+# ${DOCUMENT_ROOT}/nshmp/
+
+# WORKDIR /usr/share/nginx
--
GitLab