Skip to content
Snippets Groups Projects
Commit ebaf93bd authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

test

parent 77f0a888
No related branches found
No related tags found
1 merge request!469Images
......@@ -102,7 +102,6 @@ default:
done
- |
docker build \
--debug \
${BUILD_ARGS} \
--pull \
--tag "${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" \
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment