Merge pull request #400 from mmd-osm/patch/dockertest

Docker image smoke test
zerebubuth · Apr 23, 2024 · ee804f6 · ee804f6
2 parents 6c0c600 + c9d3ed2
commit ee804f6
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/.github/workflows/docker_2004.yml b/.github/workflows/docker_2004.yml
@@ -7,9 +7,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Build Docker images
         uses: docker/build-push-action@v5
         with:
-           file: docker/ubuntu/Dockerfile
+           file: docker/ubuntu/Dockerfile
+           load: true
+           tags: cgimap:2004
+      - name: Running Docker image
+        run: |
+           docker run --entrypoint /bin/bash cgimap:2004 -c "/usr/local/bin/openstreetmap-cgimap --help"
diff --git a/.github/workflows/docker_2204.yml b/.github/workflows/docker_2204.yml
@@ -7,9 +7,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Build Docker images
         uses: docker/build-push-action@v5
         with:
-           file: docker/ubuntu/Dockerfile2204
+           file: docker/ubuntu/Dockerfile2204
+           load: true
+           tags: cgimap:2204
+      - name: Running Docker image
+        run: |
+           docker run --entrypoint /bin/bash cgimap:2204 -c "/usr/local/bin/openstreetmap-cgimap --help"
diff --git a/.github/workflows/docker_bookworm.yml b/.github/workflows/docker_bookworm.yml
@@ -7,10 +7,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Build Docker images
         uses: docker/build-push-action@v5
         with:
            file: docker/debian/Dockerfile_bookworm
-
+           load: true
+           tags: cgimap:bookworm
+      - name: Running Docker image
+        run: |
+           docker run --entrypoint /bin/bash cgimap:bookworm -c "/usr/local/bin/openstreetmap-cgimap --help"
diff --git a/.github/workflows/docker_trixie.yml b/.github/workflows/docker_trixie.yml
@@ -7,10 +7,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Build Docker images
         uses: docker/build-push-action@v5
         with:
            file: docker/debian/Dockerfile_trixie
+           load: true
+           tags: cgimap:trixie
+      - name: Running Docker image
+        run: |
+           docker run --entrypoint /bin/bash cgimap:trixie -c "/usr/local/bin/openstreetmap-cgimap --help"
 
diff --git a/docker/debian/Dockerfile_trixie b/docker/debian/Dockerfile_trixie
@@ -30,7 +30,7 @@ FROM debian:trixie
 
 RUN apt-get update -qq && \
     apt-get install -y \
-       libfcgi-bin libmemcached11 libboost-program-options1.74.0 \
+       libfcgi-bin libmemcached11 libboost-program-options1.83.0 \
        libxml2 libcrypto++8 libyajl2 libpqxx-7.8 zlib1g libbrotli1 libfmt9 \
        --no-install-recommends && \
     apt-get clean && \