add test-docker-compose.yml

.github/workflows/build-and-push-docker.yml

@@ -26,21 +26,23 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Build and push GWS amd64
-        if: false
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/gws-amd64/Dockerfile
           push: true
+          platforms: linux/amd64
+          provenance: false
           tags: gplates/gws:amd64-${{github.ref_name}}
       -
         name: Build and push GWS arm64
-        if: false
         uses: docker/build-push-action@v5
         with:
           context: .
           file: ./docker/gws-arm64/Dockerfile
           push: true
+          platforms: linux/arm64
+          provenance: false
           tags: gplates/gws:arm64-${{github.ref_name}}
       -
         name: Build and push PostGIS amd64
@@ -66,5 +68,5 @@ jobs:
         name: Create cross-platform images
         run: |
             docker buildx imagetools create -t gplates/postgis:${{github.ref_name}} gplates/postgis:amd64-${{github.ref_name}} gplates/postgis:arm64-${{github.ref_name}}
-#    docker buildx imagetools create -t gplates/gws:${{github.ref_name}} gplates/gws:amd64-${{github.ref_name}} gplates/gws:arm64-${{github.ref_name}}
+            docker buildx imagetools create -t gplates/gws:${{github.ref_name}} gplates/gws:amd64-${{github.ref_name}} gplates/gws:arm64-${{github.ref_name}}
             

.github/workflows/test-docker-compose.yml

@@ -0,0 +1,33 @@
+name: Test Docker Compose
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  test-docker-compose:
+    runs-on: ubuntu-latest
+
+    steps:
+      -
+        name: Start Docker compose
+        run: |   
+          cd docker
+          docker-compose up -d
+      - 
+        name: Sleep for 30 seconds
+        run: sleep 30s
+        shell: bash
+      -  
+        name: Check Docker compose
+        if: always()
+        run: |
+           docker ps
+           docker network ls
+           docker inspect gws -f "{{json .NetworkSettings.Networks }}"
+           wget http://localhost:18000
+           curl --fail -s http://localhost:18000/raster/query?lon=128.86&lat=-12.42&raster_name=crustal_thickness
+           
+
+          
+

.github/workflows/test.yml

@@ -78,5 +78,30 @@ jobs:
         if: always()
         run: |
           docker exec gws cat /var/log/apache2/error.log
+  
+  test-docker-compose:
+    runs-on: ubuntu-latest
+
+    steps:
+      -
+        name: Start Docker compose
+        run: |   
+          cd docker
+          docker-compose up -d
+      - 
+        name: Sleep for 30 seconds
+        run: sleep 30s
+        shell: bash
+      -  
+        name: Check Docker compose
+        if: always()
+        run: |
+           docker ps
+           docker network ls
+           docker inspect gws -f "{{json .NetworkSettings.Networks }}"
+           wget http://localhost:18000
+           curl --fail -s http://localhost:18000/raster/query?lon=128.86&lat=-12.42&raster_name=crustal_thickness
+           
+
           
 

docker/docker-compose-mc.yml

@@ -0,0 +1,65 @@
+# This is for Michael Chin only... 
+version: '3.9'
+
+volumes:
+  gws-code:
+    external: true
+    name: gws-code
+  gws-db-data:
+    external: true
+    name: gws-db-data-new
+
+services:
+  gws-postgis:
+    image: gplates/postgis
+    networks:
+      - gws-net
+    hostname: gws-postgis
+    volumes:
+      - gws-db-data:/var/lib/postgresql/15/main
+    ports:
+      - 5432:5432
+    environment:
+      - POSTGRES_PASSWORD="this is not a real password! go away!"
+    restart: on-failure
+    healthcheck:
+      test: pg_isready -U gplates -d gplates
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+
+  gws:
+    image: gplates/gws
+    networks:
+      - gws-net
+    hostname: gws
+    depends_on:
+      - gws-postgis
+      - gws-redis
+    volumes:
+      - gws-code:/gws
+    ports:
+      - 18000:80
+    restart: on-failure
+    healthcheck:
+      test: curl --fail -s "http://localhost:80/raster/query?lon=128.86&lat=-12.42&raster_name=crustal_thickness" || exit 1
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+
+  gws-redis:
+    image: redis
+    networks:
+      - gws-net
+    hostname: gws-redis
+    restart: on-failure
+    healthcheck:
+      test: redis-cli -h gws-redis ping  
+      interval: 1m30s
+      timeout: 10s
+      retries: 3
+
+
+networks:
+  gws-net:
+    external: true

docker/docker-compose.yml

@@ -1,23 +1,9 @@
 version: '3.9'
 
-volumes:
-  gws-code:
-    external: true
-    name: gws-code
-  gws-db-data:
-    external: true
-    name: gws-db-data-new
-
 services:
   gws-postgis:
     image: gplates/postgis
-    networks:
-      - gws-net
     hostname: gws-postgis
-    volumes:
-      - gws-db-data:/var/lib/postgresql/15/main
-    ports:
-      - 5432:5432
     environment:
       - POSTGRES_PASSWORD="this is not a real password! go away!"
     restart: on-failure
@@ -29,14 +15,10 @@ services:
 
   gws:
     image: gplates/gws
-    networks:
-      - gws-net
     hostname: gws
     depends_on:
       - gws-postgis
       - gws-redis
-    volumes:
-      - gws-code:/gws
     ports:
       - 18000:80
     restart: on-failure
@@ -48,8 +30,6 @@ services:
 
   gws-redis:
     image: redis
-    networks:
-      - gws-net
     hostname: gws-redis
     restart: on-failure
     healthcheck:
@@ -58,7 +38,3 @@ services:
       timeout: 10s
       retries: 3
 
-
-networks:
-  gws-net:
-    external: true

docker/gws-amd64/Dockerfile

@@ -53,7 +53,7 @@ RUN pip3 install plate-model-manager --upgrade
 RUN pip3 install redis
 
 ADD . /gws
-
+RUN mv /gws/django/GWS/env.template /gws/django/GWS/.env
 RUN pmm download all /gws/django/GWS/data/model-repo/
 
 # Add Tini

docker/gws-arm64/Dockerfile

@@ -53,7 +53,7 @@ RUN pip3 install plate-model-manager --upgrade
 RUN pip3 install redis
 
 ADD . /gws
-
+RUN mv /gws/django/GWS/env.template /gws/django/GWS/.env
 RUN pmm download all /gws/django/GWS/data/model-repo/
 
 # Add Tini