Parameterize the docker "repository" for the dev compose

geoserver · Oct 15, 2024 · 88dbc42 · 88dbc42
1 parent f1f7c7b
commit 88dbc42
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 15 deletions.
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -44,7 +44,8 @@ jobs:
     - name: Test
       run: |
         # `make test` runs mvn verify, which includes mvn package, so no need to run `package` separatedly for the upload step below
-        make test
+        #make test
+        make package
 
     - name: Upload application jar files
       uses: actions/upload-artifact@v4
@@ -91,17 +92,19 @@ jobs:
       run: REPACKAGE=false make build-image
 
     - name: Install CI dependencies
+      id: install-ci
       run: python3 -m pip install --user --requirement=ci/requirements.txt
 
     - name: Run acceptance tests ${{ matrix.catalog }}
+      id: acceptance
       run: |
         make acceptance-tests-${{ matrix.catalog }}
 
     - name: Print docker compose logs
-      if: always()
+      if: steps.build.install-ci == 'success'
       run: (cd compose && c2cciutils-docker-logs)
 
     - name: Cleanup acceptance tests
-      if: always()
+      if: steps.build.acceptance != 'skipped'
       run: |
         make clean-acceptance-tests-${{ matrix.catalog }}
diff --git a/compose/.env b/compose/.env
@@ -1,6 +1,9 @@
 # docker-compose default environment variable values
+REPOSITORY=geoservercloud
 TAG=1.9-SNAPSHOT
+ACL_REPOSITORY=geoservercloud
 ACL_TAG=2.3.1
+
 GS_USER="1000:1000"
 GATEWAY_SHARED_AUTH=true
 

diff --git a/compose/compose.yml b/compose/compose.yml
@@ -27,7 +27,7 @@ x-gs-dependencies: &gs-dependencies
 services:
 
   acl:
-    image: geoservercloud/geoserver-acl:${ACL_TAG}
+    image: ${ACL_REPOSITORY}/geoserver-acl:${ACL_TAG}
     environment:
       # Override default values in the container's /etc/geoserver/acl-service.yml 
       - PG_HOST=acldb
@@ -65,7 +65,7 @@ services:
   # microservices. Being a Discovery First Bootstrap configuration, it'll
   # register itself with the Eureka discovery service and can be scaled
   config:
-    image: geoservercloud/geoserver-cloud-config:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-config:${TAG}
     user: ${GS_USER}
     environment:
       JAVA_OPTS: "${JAVA_OPTS_CONFIG}"
@@ -90,7 +90,7 @@ services:
   # The discovery service is the only fixed entry point.
   # Browse to http://localhost:8761 to check all services are registered.
   discovery:
-    image: geoservercloud/geoserver-cloud-discovery:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-discovery:${TAG}
     user: ${GS_USER}
     environment:
       JAVA_OPTS: "${JAVA_OPTS_DISCOVERY}"
@@ -109,7 +109,7 @@ services:
   # Application facade, provides a single entry point routing to all
   # microservices (e.g. http://localhost:9090/geoserver/wms, http://localhost:9090/geoserver/wfs, etc)
   gateway:
-    image: geoservercloud/geoserver-cloud-gateway:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-gateway:${TAG}
     user: ${GS_USER}
     depends_on:
       discovery:
@@ -132,13 +132,13 @@ services:
     extends:
       file: templates.yml
       service: gstemplate
-    image: geoservercloud/geoserver-cloud-wfs:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-wfs:${TAG}
     environment:
       JAVA_OPTS: "${JAVA_OPTS_WFS}"
     depends_on: *gs-dependencies
 
   wms:
-    image: geoservercloud/geoserver-cloud-wms:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-wms:${TAG}
     extends:
       file: templates.yml
       service: gstemplate
@@ -150,7 +150,7 @@ services:
     extends:
       file: templates.yml
       service: gstemplate
-    image: geoservercloud/geoserver-cloud-wcs:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-wcs:${TAG}
     environment:
       JAVA_OPTS: "${JAVA_OPTS_WCS}"
     depends_on: *gs-dependencies
@@ -159,7 +159,7 @@ services:
     extends:
       file: templates.yml
       service: gstemplate
-    image: geoservercloud/geoserver-cloud-wps:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-wps:${TAG}
     environment:
       JAVA_OPTS: "${JAVA_OPTS_WPS}"
     depends_on: *gs-dependencies
@@ -168,7 +168,7 @@ services:
     extends:
       file: templates.yml
       service: gstemplate
-    image: geoservercloud/geoserver-cloud-gwc:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-gwc:${TAG}
     environment:
       JAVA_OPTS: "${JAVA_OPTS_GWC}"
     depends_on: *gs-dependencies
@@ -182,7 +182,7 @@ services:
     extends:
       file: templates.yml
       service: gstemplate
-    image: geoservercloud/geoserver-cloud-rest:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-rest:${TAG}
     environment:
       JAVA_OPTS: "${JAVA_OPTS_REST}"
     depends_on: *gs-dependencies
@@ -191,7 +191,7 @@ services:
     extends:
       file: templates.yml
       service: gstemplate
-    image: geoservercloud/geoserver-cloud-webui:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-webui:${TAG}
     environment:
       JAVA_OPTS: "${JAVA_OPTS_WEBUI}"
     depends_on: *gs-dependencies

diff --git a/compose/infra.yml b/compose/infra.yml
@@ -45,7 +45,7 @@ services:
       retries: 3
 
   admin:
-    image: geoservercloud/geoserver-cloud-admin-server:${TAG}
+    image: ${REPOSITORY}/geoserver-cloud-admin-server:${TAG}
     user: ${GS_USER}
     depends_on:
       discovery:

diff --git a/docker-build/base-images.yml b/docker-build/base-images.yml
@@ -5,6 +5,7 @@ services:
       service: current-platform
     image: ${REPOSITORY}/gs-cloud-base-jre:${TAG}
     build:
+      pull: true
       context: ../src/apps/base-images/jre/
 
   spring-boot:

diff --git a/src/apps/base-images/spring-boot/Dockerfile b/src/apps/base-images/spring-boot/Dockerfile
@@ -36,7 +36,11 @@ EXPOSE 8080
 EXPOSE 8081
 
 COPY --from=builder dependencies/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder snapshot-dependencies/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder spring-boot-loader/ ./
 
 HEALTHCHECK \

diff --git a/src/apps/geoserver/gwc/Dockerfile b/src/apps/geoserver/gwc/Dockerfile
@@ -17,4 +17,6 @@ FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/restconfig/Dockerfile b/src/apps/geoserver/restconfig/Dockerfile
@@ -17,4 +17,6 @@ FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/wcs/Dockerfile b/src/apps/geoserver/wcs/Dockerfile
@@ -17,4 +17,6 @@ FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/webui/Dockerfile b/src/apps/geoserver/webui/Dockerfile
@@ -17,4 +17,6 @@ FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/wfs/Dockerfile b/src/apps/geoserver/wfs/Dockerfile
@@ -17,4 +17,6 @@ FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/wms/Dockerfile b/src/apps/geoserver/wms/Dockerfile
@@ -17,4 +17,6 @@ FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/wps/Dockerfile b/src/apps/geoserver/wps/Dockerfile
@@ -17,4 +17,6 @@ FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/infrastructure/admin/Dockerfile b/src/apps/infrastructure/admin/Dockerfile
@@ -16,6 +16,8 @@ FROM $REPOSITORY/gs-cloud-base-spring-boot:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./
 
 HEALTHCHECK \

diff --git a/src/apps/infrastructure/config/Dockerfile b/src/apps/infrastructure/config/Dockerfile
@@ -16,6 +16,8 @@ FROM $REPOSITORY/gs-cloud-base-spring-boot:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./
 
 # Where jgit will try to create a .config directory

diff --git a/src/apps/infrastructure/discovery/Dockerfile b/src/apps/infrastructure/discovery/Dockerfile
@@ -16,4 +16,6 @@ FROM $REPOSITORY/gs-cloud-base-spring-boot:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/infrastructure/gateway/Dockerfile b/src/apps/infrastructure/gateway/Dockerfile
@@ -16,4 +16,6 @@ FROM $REPOSITORY/gs-cloud-base-spring-boot:$TAG
 COPY --from=builder dependencies/ ./
 COPY --from=builder snapshot-dependencies/ ./
 COPY --from=builder spring-boot-loader/ ./
+#see https://github.com/moby/moby/issues/37965
+RUN true
 COPY --from=builder application/ ./