Merge branch 'docker-fix' into 'master'

Docker fix

See merge request ghsc/nshmp/nshmp-netcdf!23

.gitlab-ci.yml

@@ -76,7 +76,9 @@ stages:
   cache: {}
   image: ${CODE_REGISTRY}/ghsc/hazdev/cloud-formation/hazdev-build-runner:latest
   dependencies:
+  retry: 2
   before_script:
+    - docker stack rm nshmp-netcdf
     - *static-data
     - |
       for data in ${STATIC_DATA}; do

Dockerfile

@@ -49,14 +49,13 @@ ARG netcdf_file="src/main/resources/default.nc"
 
 # The NSHM to use
 ENV NSHM "CONUS_2018"
-ENV CONTEXT_PATH ""
+ENV CONTEXT_PATH "/"
 
 ARG jar_file
 ARG project
 ARG workdir
 ENV PROJECT ${project}
 ENV NETCDF_FILE ${netcdf_file}
-ENV MN_CONTEXT_PATH "-Dmicronaut.server.context-path=${CONTEXT_PATH}"
 
 WORKDIR ${workdir}
 
@@ -67,6 +66,6 @@ RUN yum install -y java-11-openjdk-headless
 
 EXPOSE 8080
 ENTRYPOINT /usr/bin/java -jar ${PROJECT}.jar \
-    ${MN_CONTEXT_PATH} \
+    "-Dmicronaut.server.context-path=${CONTEXT_PATH}" \
     -nshm=${NSHM} \
     -netcdf=${NETCDF_FILE}

build.gradle

@@ -35,7 +35,7 @@ dependencies {
   implementation "edu.ucar:netcdf4:${netcdfVersion}"
   implementation "org.slf4j:slf4j-jdk14:${slfVersion}"
 
-  // micronaut
+  // Micronaut
   annotationProcessor platform("io.micronaut:micronaut-bom:${mnVersion}")
   annotationProcessor "io.micronaut:micronaut-inject-java"
   annotationProcessor "io.micronaut:micronaut-validation"
@@ -46,7 +46,6 @@ dependencies {
   implementation "io.micronaut:micronaut-runtime"
   implementation "io.micronaut:micronaut-http-server-netty"
   implementation "com.fasterxml.jackson.module:jackson-module-parameter-names:${jacksonVersion}"
-  runtimeOnly "io.micronaut:micronaut-runtime-osx"
   runtimeOnly "ch.qos.logback:logback-classic:${logbackVersion}"
 
   // Swagger

scripts/custom.config.sh

 export SERVICE_MAP=(
-  "/nshmp-ws/static/conus-2018":"conus-2018a"
+  "/nshmp/ws/static/conus-2018":"conus-2018a"
 );

scripts/nshmp-netcdf.yml

@@ -22,4 +22,4 @@ services:
     image: ${REGISTRY}/${CI_PROJECT_NAME}:${DATA_CONUS_2018A}
     environment:
       NSHM: CONUS_2018
-      CONTEXT_PATH: /nshmp-ws/static/conus-2018
+      CONTEXT_PATH: /nshmp/ws/static/conus-2018

src/main/resources/swagger/index.html

@@ -11,13 +11,16 @@
 
   <script src="https://unpkg.com/swagger-ui-dist@3/swagger-ui-bundle.js"></script>
   <script>
+    let pathname = window.location.pathname;
+    pathname = pathname == "/" ? "" : pathname;
+
     SwaggerUIBundle({
-        url: "./swagger/netcdf-services.yml",
+        url: `${pathname}/swagger/netcdf-services.yml`,
         dom_id: '#swagger-ui',
         presets: [
           SwaggerUIBundle.presets.apis
         ]
-    })
+    });
   </script>
 </body>
 </html>