Merge pull request #434 from groldan/docker/default_config_location

Change standalone profile's default config location to /etc/geoserver/

compose/compose.yml

@@ -115,7 +115,7 @@ services:
         condition: service_healthy
         required: true
       discovery:
-        condition: service_healthy
+        condition: service_started
         required: true
 
   wms:
@@ -130,7 +130,7 @@ services:
         condition: service_healthy
         required: true
       discovery:
-        condition: service_healthy
+        condition: service_started
         required: true
 
   wcs:
@@ -145,7 +145,7 @@ services:
         condition: service_healthy
         required: true
       discovery:
-        condition: service_healthy
+        condition: service_started
         required: true
 
   wps:
@@ -160,7 +160,7 @@ services:
         condition: service_healthy
         required: true
       discovery:
-        condition: service_healthy
+        condition: service_started
         required: true
 
   gwc:
@@ -175,7 +175,7 @@ services:
         condition: service_healthy
         required: true
       discovery:
-        condition: service_healthy
+        condition: service_started
         required: true
 
   rest:
@@ -190,7 +190,7 @@ services:
         condition: service_healthy
         required: true
       discovery:
-        condition: service_healthy
+        condition: service_started
         required: true
 
   webui:
@@ -205,6 +205,6 @@ services:
         condition: service_healthy
         required: true
       discovery:
-        condition: service_healthy
+        condition: service_started
         required: true
 

compose/standalone.yml

@@ -1,59 +1,102 @@
 version: "3.8"
 
+# mounts the config volume defined in geoserver.yml under /etc/geoserver/
+# to work with the modified values during development instead of the ones
+# embedded on the docker images
 services:
   discovery:
+    restart: no
     environment:
       SPRING_PROFILES_ACTIVE: "standalone"
     entrypoint: echo "discovery-service disabled."
 
   config:
+    restart: no
     environment:
       SPRING_PROFILES_ACTIVE: "standalone"
     entrypoint: echo "config-service disabled."
 
   admin:
+    restart: no
     environment:
       SPRING_PROFILES_ACTIVE: "standalone"
     entrypoint: echo "admin-service disabled for standalone mode, requires discovery-service."
 
   gateway:
     environment:
       SPRING_PROFILES_ACTIVE: "standalone"
+    depends_on:
+      discovery:
+        required: false
     volumes:
-      - config:/etc/gscloud
+      - config:/etc/geoserver
 
   wfs:
     environment:
       SPRING_PROFILES_ACTIVE: "${GEOSERVER_DEFAULT_PROFILES},standalone"
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
+        required: true
     volumes:
-      - config:/etc/gscloud
+      - config:/etc/geoserver
 
   wms:
     environment:
       SPRING_PROFILES_ACTIVE: "${GEOSERVER_DEFAULT_PROFILES},standalone"
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
+        required: true
     volumes:
-      - config:/etc/gscloud
+      - config:/etc/geoserver
 
   wcs:
     environment:
       SPRING_PROFILES_ACTIVE: "${GEOSERVER_DEFAULT_PROFILES},standalone"
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
+        required: true
     volumes:
-      - config:/etc/gscloud
+      - config:/etc/geoserver
+
+  wps:
+    environment:
+      SPRING_PROFILES_ACTIVE: "${GEOSERVER_DEFAULT_PROFILES},standalone"
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
+        required: true
+    volumes:
+      - config:/etc/geoserver
 
   rest:
     environment:
       SPRING_PROFILES_ACTIVE: "${GEOSERVER_DEFAULT_PROFILES},standalone"
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
+        required: true
     volumes:
-      - config:/etc/gscloud
+      - config:/etc/geoserver
 
   webui:
     environment:
       SPRING_PROFILES_ACTIVE: "${GEOSERVER_DEFAULT_PROFILES},standalone"
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
+        required: true
     volumes:
-      - config:/etc/gscloud
+      - config:/etc/geoserver
 
   gwc:
     environment:
       SPRING_PROFILES_ACTIVE: "${GEOSERVER_DEFAULT_PROFILES},standalone"
+    depends_on:
+      rabbitmq:
+        condition: service_healthy
+        required: true
     volumes:
-      - config:/etc/gscloud
+      - config:/etc/geoserver

src/apps/base-images/spring-boot/Dockerfile

@@ -9,7 +9,7 @@ RUN java -Djarmode=layertools -jar application.jar extract
 ##########
 FROM geoservercloud/gs-cloud-base-jre:$TAG
 
-COPY target/config/ /etc/gscloud/
+COPY target/config/ /etc/geoserver/
 
 RUN mkdir -p /opt/app/bin
 

src/starters/spring-boot/src/main/resources/gs_cloud_bootstrap_profiles.yml

@@ -60,11 +60,11 @@ eureka:
     healthcheck:
       enabled: false # must only be set to true in application.yml, not bootstrap
 ---
-#no config-service, load config from /etc/gscloud if it exists
+#no config-service, load config from /etc/geoserver
+#all Dockerfile files have the default config under that directory
 spring.config.activate.on-profile: bootstrap_standalone
 spring:
-  #config.additional-location: optional:file:/etc/gscloud/
-  config.location: file:/etc/gscloud/
+  config.location: file:/etc/geoserver/
   cloud.config:
     enabled: false
 ---