Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

nshmp-haz
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

cc6a1909

Commit cc6a1909 authored 4 years ago by Powers, Peter M.

Downloads
- Plain Diff

Merge branch 'deploy' into 'master'

Docker and Web Services

See merge request ghsc/nshmp/nshmp-haz-v2!503

parents 97298746 79a7b69f

No related branches found

No related tags found

Loading

Pipeline #31950 passed 4 years ago

Stage: build

Stage: publish

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 14 additions, 82 deletions

.gitlab-ci.yml
scripts/docker-entrypoint.ws.sh 0 additions, 20 deletions

scripts/docker-entrypoint.ws.sh
scripts/docker-functions.inc.sh 1 addition, 53 deletions

scripts/docker-functions.inc.sh
scripts/gitlab-ci/docker-build.sh 44 additions, 0 deletions

scripts/gitlab-ci/docker-build.sh
settings.gradle 15 additions, 4 deletions

settings.gradle
src/main/java/gov/usgs/earthquake/nshmp/www/DeaggEpsilonController.java 0 additions, 7 deletions

...gov/usgs/earthquake/nshmp/www/DeaggEpsilonController.java
src/main/java/gov/usgs/earthquake/nshmp/www/services/DeaggEpsilonService.java 3 additions, 25 deletions

...gs/earthquake/nshmp/www/services/DeaggEpsilonService.java
src/main/resources/application.yml 6 additions, 0 deletions

src/main/resources/application.yml
ws.Dockerfile 18 additions, 12 deletions

ws.Dockerfile

with 101 additions and 203 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment