From 023fba5ed018a99ba9a4d12334f12acbdab27ef2 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 10:29:36 -0600
Subject: [PATCH 01/15] ignore version file
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index df0ac6ee9..099780875 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ config.properties
libs
.factorypath
.apt_generated*
+*version.json
# Node
node_modules
--
GitLab
From ef3eba65d0097b84ea82ff9a1952e6e0132e4f1a Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 10:29:47 -0600
Subject: [PATCH 02/15] import app version gradle file
---
build.gradle | 2 ++
1 file changed, 2 insertions(+)
diff --git a/build.gradle b/build.gradle
index 5a8318fc9..684942bb1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,6 +33,7 @@ plugins {
id "com.github.johnrengelman.shadow" version "${shadowVersion}"
id "com.github.node-gradle.node" version "${nodePluginVersion}"
id "com.github.spotbugs" version "${spotbugsVersion}"
+ id "com.palantir.git-version" version "${gitVersionVersion}"
id "com.star-zero.gradle.githook" version "${githooksVersion}"
id "eclipse-wtp"
id "io.micronaut.application" version "${micronautPluginVersion}"
@@ -40,6 +41,7 @@ plugins {
id "maven-publish"
}
+apply from: "${projectDir}/gradle/app-version.gradle"
apply from: "${projectDir}/gradle/dependencies.gradle"
apply from: "${projectDir}/gradle/ext.gradle"
apply from: "${projectDir}/gradle/jar.gradle"
--
GitLab
From 1f1ea3eec4ffddac7433091235e7a919454d5323 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 10:29:55 -0600
Subject: [PATCH 03/15] create version file
---
gradle/app-version.gradle | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 gradle/app-version.gradle
diff --git a/gradle/app-version.gradle b/gradle/app-version.gradle
new file mode 100644
index 000000000..3b525ba73
--- /dev/null
+++ b/gradle/app-version.gradle
@@ -0,0 +1,23 @@
+apply plugin: "com.palantir.git-version"
+
+
+tasks.withType(JavaCompile) {
+ doFirst {
+ def versionFile = new File("${projectDir}/src/main/resources/version/nshmp-haz-version.json")
+ new File(versionFile.getParent()).mkdirs()
+ def details = versionDetails()
+ def versionInfo = [
+ branchName: details.branchName,
+ commitDistance: details.commitDistance,
+ gitHash: details.gitHash,
+ gitHashFull: details.gitHashFull,
+ isCleanTag: details.isCleanTag,
+ lastTag: details.lastTag,
+ projectName: project.name,
+ url: 'git config --get remote.origin.url'.execute().text.replace('\n', ''),
+ version: details.version,
+ ]
+ def json = groovy.json.JsonOutput.toJson(versionInfo)
+ versionFile.write(groovy.json.JsonOutput.prettyPrint(json))
+ }
+}
--
GitLab
From d98477ba8641b38e8397d6f7207a42205e6ce701 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 10:30:30 -0600
Subject: [PATCH 04/15] cleanup
---
gradle/app-version.gradle | 1 -
1 file changed, 1 deletion(-)
diff --git a/gradle/app-version.gradle b/gradle/app-version.gradle
index 3b525ba73..7b856e7d8 100644
--- a/gradle/app-version.gradle
+++ b/gradle/app-version.gradle
@@ -1,6 +1,5 @@
apply plugin: "com.palantir.git-version"
-
tasks.withType(JavaCompile) {
doFirst {
def versionFile = new File("${projectDir}/src/main/resources/version/nshmp-haz-version.json")
--
GitLab
From bf24a163f0326f93c1426e7357a20bceb1fd0631 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 10:30:54 -0600
Subject: [PATCH 05/15] read in version file
---
.../gov/usgs/earthquake/nshmp/www/HazVersion.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java b/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
new file mode 100644
index 000000000..6bb54983d
--- /dev/null
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
@@ -0,0 +1,13 @@
+package gov.usgs.earthquake.nshmp.www;
+
+import com.google.common.io.Resources;
+
+import gov.usgs.earthquake.nshmp.internal.AppVersion;
+
+public class HazVersion implements AppVersion {
+
+ public VersionInfo getVersionInfo() {
+ var resource = Resources.getResource("version/nshmp-haz-version.json");
+ return AppVersion.versionInfo(resource);
+ }
+}
--
GitLab
From 79cc4a2e7c93e57aa3619049fc1780d5edeb9575 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 12:52:32 -0600
Subject: [PATCH 06/15] add method to return all versions
---
.../java/gov/usgs/earthquake/nshmp/www/HazVersion.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java b/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
index 6bb54983d..b8ad00946 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
@@ -3,9 +3,19 @@ package gov.usgs.earthquake.nshmp.www;
import com.google.common.io.Resources;
import gov.usgs.earthquake.nshmp.internal.AppVersion;
+import gov.usgs.earthquake.nshmp.internal.LibVersion;
public class HazVersion implements AppVersion {
+ public static VersionInfo[] appVersions() {
+ VersionInfo[] versions = {
+ new HazVersion().getVersionInfo(),
+ new LibVersion().getVersionInfo(),
+ new WsUtilsVersion().getVersionInfo(),
+ };
+ return versions;
+ }
+
public VersionInfo getVersionInfo() {
var resource = Resources.getResource("version/nshmp-haz-version.json");
return AppVersion.versionInfo(resource);
--
GitLab
From 9ce6575d64718b01a0f44a1e85dc7d9e737d3f2c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 12:53:28 -0600
Subject: [PATCH 07/15] add metadata to builder
---
.../gov/usgs/earthquake/nshmp/www/ServletUtil.java | 1 +
.../earthquake/nshmp/www/hazard/DisaggService.java | 5 +++++
.../earthquake/nshmp/www/hazard/HazardService.java | 4 ++++
.../earthquake/nshmp/www/services/RateService.java | 14 +++++++++-----
.../www/services/SourceLogicTreesService.java | 4 ++++
.../nshmp/www/services/SourceServices.java | 3 +++
6 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
index 449c5ec3a..acf6f397b 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
@@ -166,6 +166,7 @@ public class ServletUtil {
var svcResponse = ResponseBody.error()
.name(name)
.url(url)
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.request(url)
.response(msg)
.build();
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
index a4e527bf7..8a41630ea 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
@@ -28,7 +28,9 @@ import gov.usgs.earthquake.nshmp.calc.Site;
import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.gmm.Imt;
import gov.usgs.earthquake.nshmp.model.HazardModel;
+import gov.usgs.earthquake.nshmp.www.HazVersion;
import gov.usgs.earthquake.nshmp.www.ResponseBody;
+import gov.usgs.earthquake.nshmp.www.ResponseMetadata;
import gov.usgs.earthquake.nshmp.www.ServletUtil;
import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Metadata;
import gov.usgs.earthquake.nshmp.www.meta.Parameter;
@@ -73,6 +75,7 @@ public final class DisaggService {
var response = ResponseBody.usage()
.name(NAME)
.url(url)
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.request(url)
.response(usage)
.build();
@@ -93,6 +96,7 @@ public final class DisaggService {
var body = ResponseBody.success()
.name(NAME)
.url(request.http.getUri().toString())
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.request(request)
.response(response)
.build();
@@ -113,6 +117,7 @@ public final class DisaggService {
var body = ResponseBody.success()
.name(NAME)
.url(request.http.getUri().toString())
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.request(request)
.response(response)
.build();
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
index e87db5fef..c324da5cf 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
@@ -34,7 +34,9 @@ import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.gmm.Imt;
import gov.usgs.earthquake.nshmp.model.HazardModel;
import gov.usgs.earthquake.nshmp.model.SourceType;
+import gov.usgs.earthquake.nshmp.www.HazVersion;
import gov.usgs.earthquake.nshmp.www.ResponseBody;
+import gov.usgs.earthquake.nshmp.www.ResponseMetadata;
import gov.usgs.earthquake.nshmp.www.ServletUtil;
import gov.usgs.earthquake.nshmp.www.meta.DoubleParameter;
import gov.usgs.earthquake.nshmp.www.meta.Parameter;
@@ -92,6 +94,7 @@ public final class HazardService {
var body = ResponseBody.usage()
.name(NAME)
.url(url)
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.request(url)
.response(usage)
.build();
@@ -112,6 +115,7 @@ public final class HazardService {
var body = ResponseBody.success()
.name(NAME)
.url(request.http.getUri().toString())
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.request(request)
.response(response)
.build();
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
index c0bcb47fd..b4ce06c52 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
@@ -18,8 +18,10 @@ import gov.usgs.earthquake.nshmp.calc.EqRate;
import gov.usgs.earthquake.nshmp.calc.Site;
import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.model.HazardModel;
+import gov.usgs.earthquake.nshmp.www.HazVersion;
import gov.usgs.earthquake.nshmp.www.RateController;
import gov.usgs.earthquake.nshmp.www.ResponseBody;
+import gov.usgs.earthquake.nshmp.www.ResponseMetadata;
import gov.usgs.earthquake.nshmp.www.ServicesUtil.Key;
import gov.usgs.earthquake.nshmp.www.ServicesUtil.ServiceQueryData;
import gov.usgs.earthquake.nshmp.www.ServicesUtil.ServiceRequestData;
@@ -107,6 +109,7 @@ public final class RateService {
return ResponseBody.<String, Usage> usage()
.name(service.name)
.url(url)
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.request(url)
.response(usage)
.build();
@@ -118,10 +121,11 @@ public final class RateService {
RequestData data) throws InterruptedException, ExecutionException {
var timer = Stopwatch.createStarted();
var rates = calc(service, data);
- var responseData = new ResponseData(new ResponseMetadata(service, data), rates, timer);
+ var responseData = new ResponseData(new ServiceResponseMetadata(service, data), rates, timer);
return ResponseBody.<RequestData, ResponseData> success()
.name(service.name)
.request(data)
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.response(responseData)
.url(request.getUri().getPath())
.build();
@@ -249,7 +253,7 @@ public final class RateService {
}
}
- private static final class ResponseMetadata {
+ private static final class ServiceResponseMetadata {
final double latitude;
final double longitude;
final double distance;
@@ -258,7 +262,7 @@ public final class RateService {
final String xlabel = "Magnitude (Mw)";
final String ylabel;
- ResponseMetadata(Service service, RequestData request) {
+ ServiceResponseMetadata(Service service, RequestData request) {
var isProbability = service == Service.PROBABILITY;
this.longitude = request.longitude;
this.latitude = request.latitude;
@@ -270,10 +274,10 @@ public final class RateService {
private static final class ResponseData {
final Object server;
- final ResponseMetadata metadata;
+ final ServiceResponseMetadata metadata;
final List<Sequence> data;
- ResponseData(ResponseMetadata metadata, EqRate rates, Stopwatch timer) {
+ ResponseData(ServiceResponseMetadata metadata, EqRate rates, Stopwatch timer) {
server = ServletUtil.serverData(ServletUtil.THREAD_COUNT, timer);
this.metadata = metadata;
this.data = buildSequence(rates);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceLogicTreesService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceLogicTreesService.java
index 01e2d4c21..5525e3964 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceLogicTreesService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceLogicTreesService.java
@@ -4,7 +4,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import gov.usgs.earthquake.nshmp.model.Models;
+import gov.usgs.earthquake.nshmp.www.HazVersion;
import gov.usgs.earthquake.nshmp.www.ResponseBody;
+import gov.usgs.earthquake.nshmp.www.ResponseMetadata;
import gov.usgs.earthquake.nshmp.www.ServletUtil;
import gov.usgs.earthquake.nshmp.www.SourceLogicTreesController;
@@ -33,6 +35,7 @@ public class SourceLogicTreesService {
var response = ResponseBody.success()
.name(NAME)
.url(url)
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.request(url)
.response(trees)
.build();
@@ -52,6 +55,7 @@ public class SourceLogicTreesService {
var response = ResponseBody.success()
.name(NAME)
.url(url)
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.request(requestData)
.response(tree)
.build();
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java
index 03704247e..f72a1546e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/SourceServices.java
@@ -17,7 +17,9 @@ import gov.usgs.earthquake.nshmp.gmm.Gmm;
import gov.usgs.earthquake.nshmp.gmm.Imt;
import gov.usgs.earthquake.nshmp.gmm.NehrpSiteClass;
import gov.usgs.earthquake.nshmp.model.HazardModel;
+import gov.usgs.earthquake.nshmp.www.HazVersion;
import gov.usgs.earthquake.nshmp.www.ResponseBody;
+import gov.usgs.earthquake.nshmp.www.ResponseMetadata;
import gov.usgs.earthquake.nshmp.www.ServletUtil;
import gov.usgs.earthquake.nshmp.www.WsUtils;
import gov.usgs.earthquake.nshmp.www.meta.Parameter;
@@ -59,6 +61,7 @@ public class SourceServices {
var response = ResponseBody.usage()
.name(NAME)
.url(url)
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
.request(url)
.response(new ResponseData())
.build();
--
GitLab
From 726f68e35a4e3a5dd46c44ad4c185dd0cff5cef1 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 12:53:50 -0600
Subject: [PATCH 08/15] format
---
src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java b/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
index b8ad00946..c8ad4aecb 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/HazVersion.java
@@ -9,9 +9,9 @@ public class HazVersion implements AppVersion {
public static VersionInfo[] appVersions() {
VersionInfo[] versions = {
- new HazVersion().getVersionInfo(),
- new LibVersion().getVersionInfo(),
- new WsUtilsVersion().getVersionInfo(),
+ new HazVersion().getVersionInfo(),
+ new LibVersion().getVersionInfo(),
+ new WsUtilsVersion().getVersionInfo(),
};
return versions;
}
--
GitLab
From 72ff1e65748814b272a016e3443c3b13cedd0903 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 14:07:33 -0600
Subject: [PATCH 09/15] update deps
---
gradle.properties | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index ac6c4824c..d3bac3e39 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,6 +3,7 @@ awsLambdaCoreVersion = 1.1.0
awsLambdaVersion = 1.11.461
awsS3Version = 1.11.579
githooksVersion = 1.2.0
+gitVersionVersion = 0.15.0
jacksonVersion = 2.9.0
junitVersion = 5.8.2
micronautVersion = 3.2.3
@@ -10,9 +11,9 @@ micronautRxVersion = 2.1.1
micronautPluginVersion = 3.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.0.4
-nshmpWsUtilsVersion = 0.3.5
+nshmpLibVersion = 1.0.6
+nshmpWsUtilsVersion = 0.3.7
shadowVersion = 7.1.2
spotbugsVersion = 4.7.0
spotlessVersion = 6.0.4
-swaggerVersion = 2.1.7
+swaggerVersion = 2.2.0
--
GitLab
From acd003fbbd45b17f17fe9572c71e9e7d674f954c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 14:15:06 -0600
Subject: [PATCH 10/15] add version to server
---
src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
index acf6f397b..4896b9c81 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/ServletUtil.java
@@ -207,8 +207,7 @@ public class ServletUtil {
Server(int threads, Stopwatch timer) {
this.threads = threads;
this.timer = timer.toString();
- this.version = "TODO where to get version?";
+ this.version = new HazVersion().getVersionInfo().version;
}
}
-
}
--
GitLab
From ceab015e3e0cee3397511881a64ab56e4fb370d0 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 14:19:33 -0600
Subject: [PATCH 11/15] add envrionment check
---
gradle/app-version.gradle | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gradle/app-version.gradle b/gradle/app-version.gradle
index 7b856e7d8..a5baa6409 100644
--- a/gradle/app-version.gradle
+++ b/gradle/app-version.gradle
@@ -5,6 +5,7 @@ tasks.withType(JavaCompile) {
def versionFile = new File("${projectDir}/src/main/resources/version/nshmp-haz-version.json")
new File(versionFile.getParent()).mkdirs()
def details = versionDetails()
+ def ciProjectUrl = System.getenv("CI_PROJECT_URL")
def versionInfo = [
branchName: details.branchName,
commitDistance: details.commitDistance,
@@ -13,7 +14,7 @@ tasks.withType(JavaCompile) {
isCleanTag: details.isCleanTag,
lastTag: details.lastTag,
projectName: project.name,
- url: 'git config --get remote.origin.url'.execute().text.replace('\n', ''),
+ url: ciProjectUrl ? ciProjectUrl : 'git config --get remote.origin.url'.execute().text.replace('\n', ''),
version: details.version,
]
def json = groovy.json.JsonOutput.toJson(versionInfo)
--
GitLab
From b2910ad3d18b908c7f060afc094a4ae1974b72f6 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 16:23:41 -0600
Subject: [PATCH 12/15] add build args
---
.gitlab-ci.yml | 4 ++++
Dockerfile | 2 ++
2 files changed, 6 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c76c4088..949b1dc95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -166,7 +166,9 @@ CHS Registry:
DOCKER_BUILD_ARGS: |
BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+ CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
CI_JOB_TOKEN=${CI_JOB_TOKEN}
+ CI_PROJECT_URL=${CI_PROJECT_URL}
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
Container Registry:
@@ -190,7 +192,9 @@ Container Registry:
DOCKER_BUILD_ARGS: |
BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+ CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
CI_JOB_TOKEN=${CI_JOB_TOKEN}
+ CI_PROJECT_URL=${CI_PROJECT_URL}
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
Build Project:
diff --git a/Dockerfile b/Dockerfile
index 367f83e95..7a5ba31d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,6 +39,8 @@ FROM ${BUILD_IMAGE} as builder
# Remove once nshmp-lib is public
ARG GITLAB_TOKEN=null
ARG CI_JOB_TOKEN=null
+ARG CI_PROJECT_URL=null
+ARG CI_COMMIT_BRANCH=null
WORKDIR /app
--
GitLab
From 8f4e36f75d11e2043505f312d44ddfbfeda399bf Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 16:23:54 -0600
Subject: [PATCH 13/15] check branch env var
---
gradle/app-version.gradle | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gradle/app-version.gradle b/gradle/app-version.gradle
index a5baa6409..2367ef400 100644
--- a/gradle/app-version.gradle
+++ b/gradle/app-version.gradle
@@ -6,8 +6,9 @@ tasks.withType(JavaCompile) {
new File(versionFile.getParent()).mkdirs()
def details = versionDetails()
def ciProjectUrl = System.getenv("CI_PROJECT_URL")
+ def branch = System.getenv("CI_COMMIT_BRANCH")
def versionInfo = [
- branchName: details.branchName,
+ branchName: branch ? branch : details.branchName,
commitDistance: details.commitDistance,
gitHash: details.gitHash,
gitHashFull: details.gitHashFull,
--
GitLab
From 5b0d9792f3e3d314fb1cc5efb445f5b36390920c Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 17:46:24 -0600
Subject: [PATCH 14/15] test
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 7a5ba31d4..c8f845dbb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,7 @@ WORKDIR /app
COPY . .
-RUN ./gradlew assemble
+RUN ./gradlew assemble && cat src/main/resources/*
####
# Application image: Run jar file.
--
GitLab
From 05c3f695da32efc506b56ddee7b2a91bbfc9173a Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 20 Apr 2022 17:52:42 -0600
Subject: [PATCH 15/15] add build args
---
Dockerfile | 2 +-
ws.Dockerfile | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index c8f845dbb..7a5ba31d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,7 @@ WORKDIR /app
COPY . .
-RUN ./gradlew assemble && cat src/main/resources/*
+RUN ./gradlew assemble
####
# Application image: Run jar file.
diff --git a/ws.Dockerfile b/ws.Dockerfile
index 4d1e9f44b..cae23f1bb 100644
--- a/ws.Dockerfile
+++ b/ws.Dockerfile
@@ -27,6 +27,8 @@ ARG builder_workdir
# Remove once nshmp-lib is public
ARG GITLAB_TOKEN=null
ARG CI_JOB_TOKEN=null
+ARG CI_PROJECT_URL=null
+ARG CI_COMMIT_BRANCH=null
WORKDIR /app
--
GitLab