Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-haz
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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-haz
Commits
68b41f96
Commit
68b41f96
authored
3 years ago
by
Clayton, Brandon Scott
Browse files
Options
Downloads
Patches
Plain Diff
Switch to amazon corretto
parent
86e622c5
No related branches found
No related tags found
2 merge requests
!577
Production Release | nshmp-haz
,
!571
Switch to amazon corretto
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+5
-5
5 additions, 5 deletions
.gitlab-ci.yml
Dockerfile
+2
-2
2 additions, 2 deletions
Dockerfile
ws.Dockerfile
+2
-2
2 additions, 2 deletions
ws.Dockerfile
with
9 additions
and
9 deletions
.gitlab-ci.yml
+
5
−
5
View file @
68b41f96
...
...
@@ -22,7 +22,7 @@ stages:
####
.gradle
:
image
:
${DEVOPS_REGISTRY}usgs/
java:11-jdk
image
:
${DEVOPS_REGISTRY}usgs/
amazoncorretto:11
stage
:
build
tags
:
-
development
...
...
@@ -45,8 +45,8 @@ Build Image Haz:
variables
:
CI_PROJECT_NAME
:
nshmp-haz
DOCKER_BUILD_ARGS
:
|
BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/
java
:11
FROM_IMAGE=${DEVOPS_REGISTRY}usgs/
java
:11
BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/
amazoncorretto
:11
FROM_IMAGE=${DEVOPS_REGISTRY}usgs/
amazoncorretto
:11
CI_JOB_TOKEN=${CI_JOB_TOKEN}
UPSTREAM_PATH
:
ghsc/nshmp/nshmp-haz
...
...
@@ -56,8 +56,8 @@ Build Image WS:
variables
:
CI_PROJECT_NAME
:
nshmp-haz-ws
DOCKER_BUILD_ARGS
:
|
BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/
java
:11
FROM_IMAGE=${DEVOPS_REGISTRY}usgs/
java
:11
BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/
amazoncorretto
:11
FROM_IMAGE=${DEVOPS_REGISTRY}usgs/
amazoncorretto
:11
CI_JOB_TOKEN=${CI_JOB_TOKEN}
DOCKERFILE
:
ws.Dockerfile
UPSTREAM_PATH
:
ghsc/nshmp/nshmp-haz
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
2
−
2
View file @
68b41f96
...
...
@@ -27,8 +27,8 @@
# docker build -t nshmp-haz .
####
ARG
BUILD_IMAGE=usgs/
java
:11
ARG
FROM_IMAGE=usgs/
java
:11
ARG
BUILD_IMAGE=usgs/
amazoncorretto
:11
ARG
FROM_IMAGE=usgs/
amazoncorretto
:11
####
# Builder image: Build jar file.
...
...
This diff is collapsed.
Click to expand it.
ws.Dockerfile
+
2
−
2
View file @
68b41f96
...
...
@@ -13,8 +13,8 @@
# nshmp-haz-ws
####
ARG
BUILD_IMAGE=usgs/
java
:11
ARG
FROM_IMAGE=usgs/
java
:11
ARG
BUILD_IMAGE=usgs/
amazoncorretto
:11
ARG
FROM_IMAGE=usgs/
amazoncorretto
:11
####
# Builder image: Build jar file.
...
...
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