Merge pull request #161 from crazy-max/desktop-test-postgres

test postgis image
tonistiigi · Feb 15, 2024 · ba27ffd · ba27ffd
2 parents 5033c77 + 9415e62
commit ba27ffd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -154,7 +154,13 @@ jobs:
           - target: desktop
             dockerfile: tini
             platform: linux/arm64
-            run: true
+            run_args: --rm
+          - target: desktop
+            dockerfile: postgis
+            platform: linux/arm64
+            run_args: -d --name postgis
+            logs_ctn_name: postgis
+            logs_check: "UTC [1] LOG:  database system is ready to accept connections"
     steps:
       -
         name: Checkout
@@ -183,16 +189,24 @@ jobs:
           docker buildx build --platform ${{ matrix.platform }} --output type=cacheonly .
       -
         name: Load image
-        if: ${{ matrix.run }}
+        if: ${{ matrix.run_args != '' }}
         working-directory: test/dockerfiles/${{ matrix.dockerfile }}
         run: |
           docker buildx build --platform ${{ matrix.platform }} -t ${{ matrix.dockerfile }}:local --load .
       -
         name: Run
-        if: ${{ matrix.run }}
+        if: ${{ matrix.run_args != '' }}
         working-directory: test/dockerfiles/${{ matrix.dockerfile }}
         run: |
-          docker run --rm --platform ${{ matrix.platform }} ${{ matrix.dockerfile }}:local
+          docker run ${{ matrix.run_args }} --platform ${{ matrix.platform }} ${{ matrix.dockerfile }}:local
+      -
+        name: Check container logs
+        if: ${{ matrix.logs_ctn_name != '' && matrix.logs_check != '' }}
+        uses: crazy-max/.github/.github/actions/container-logs-check@main
+        with:
+          container_name: ${{ matrix.logs_ctn_name }}
+          log_check: ${{ matrix.logs_check }}
+          timeout: 120
 
   build:
     runs-on: ubuntu-latest

diff --git a/test/dockerfiles/postgis/Dockerfile b/test/dockerfiles/postgis/Dockerfile
@@ -0,0 +1,2 @@
+FROM postgis/postgis:15-master
+ENV POSTGRES_PASSWORD=password