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
5037ec10
Commit
5037ec10
authored
8 months ago
by
Clayton, Brandon Scott
Browse files
Options
Downloads
Patches
Plain Diff
lock into node version
parent
d0ed16b7
No related branches found
No related tags found
1 merge request
!443
Signals and Reactive Forms: AWS Applications
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+4
-4
4 additions, 4 deletions
.gitlab-ci.yml
.gitlab/Dockerfile
+1
-1
1 addition, 1 deletion
.gitlab/Dockerfile
Dockerfile
+1
-1
1 addition, 1 deletion
Dockerfile
with
6 additions
and
6 deletions
.gitlab-ci.yml
+
4
−
4
View file @
5037ec10
...
...
@@ -5,7 +5,7 @@ variables:
NODE_IMAGE
:
${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG}--node
UPSTREAM_PATH
:
ghsc/nshmp/nshmp-apps
image
:
${CI_REGISTRY}/devops/images/usgs/node:
lts
image
:
${CI_REGISTRY}/devops/images/usgs/node:
20
# Do not run for merge requests
workflow
:
...
...
@@ -155,7 +155,7 @@ Build Node Image:
script
:
-
|
docker build \
--build-arg FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:
lts
\
--build-arg FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:
20
\
--file ".gitlab/Dockerfile" \
--pull \
--tag ${NODE_IMAGE} \
...
...
@@ -202,7 +202,7 @@ Build Image:
-
build
variables
:
DOCKER_BUILD_ARGS
:
|
BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:
lts
BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/node:
20
FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/nginx:latest
USE_DIST=true
...
...
@@ -317,7 +317,7 @@ pages:
artifacts
:
paths
:
-
public
image
:
${DEVOPS_REGISTRY}usgs/node:
16
image
:
${DEVOPS_REGISTRY}usgs/node:
20
rules
:
-
if
:
>
$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
...
...
This diff is collapsed.
Click to expand it.
.gitlab/Dockerfile
+
1
−
1
View file @
5037ec10
ARG
FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/node:
lts
ARG
FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/node:
20
FROM
${FROM_IMAGE}
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
1
−
1
View file @
5037ec10
...
...
@@ -8,7 +8,7 @@
# docker run -p <PORT>:8080 -d <IMAGE_NAME>:<IMAGE_TAG>
####
ARG
BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/node:
lts
ARG
BUILD_IMAGE=code.usgs.gov:5001/devops/images/usgs/node:
20
ARG
FROM_IMAGE=code.usgs.gov:5001/devops/images/usgs/nginx:latest
##
...
...
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