Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-apps
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-apps
Commits
ebaf93bd
Commit
ebaf93bd
authored
7 months ago
by
Clayton, Brandon Scott
Browse files
Options
Downloads
Patches
Plain Diff
test
parent
77f0a888
No related branches found
No related tags found
1 merge request
!469
Images
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+0
-1
0 additions, 1 deletion
.gitlab-ci.yml
Dockerfile
+27
-27
27 additions, 27 deletions
Dockerfile
with
27 additions
and
28 deletions
.gitlab-ci.yml
+
0
−
1
View file @
ebaf93bd
...
...
@@ -102,7 +102,6 @@ default:
done
-
|
docker build \
--debug \
${BUILD_ARGS} \
--pull \
--tag "${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}" \
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
27
−
27
View file @
ebaf93bd
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment