Merge pull request #457 from hotosm/ci/test-failure-signals

Correctly handle exit signal on ci test pass/fail

.github/workflows/build_ci_img.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   underpass-ci-build:
-    uses: hotosm/gh-workflows/.github/workflows/[email protected].0
+    uses: hotosm/gh-workflows/.github/workflows/[email protected].1
     with:
       dockerfile: docker/underpass.dockerfile
       scan_dockerfile: false

.github/workflows/docs.yml

@@ -4,29 +4,12 @@ on:
   push:
     paths:
       - docs/**
+      - src/**
       - mkdocs.yml
-    branches:
-      - master
-
-permissions:
-  contents: write
+    branches: [master]
+  # Allow manual trigger (workflow_dispatch)
+  workflow_dispatch:
 
 jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: 3.x
-      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV 
-
-
-      - uses: actions/cache@v3
-        with:
-          key: mkdocs-material-${{ env.cache_id }}
-          path: .cache
-          restore-keys: |
-            mkdocs-material-
-      - run: pip install mkdocs-material mkdocs-exclude mkdocstrings
-      - run: mkdocs gh-deploy --force
+  publish_docs:
+    uses: hotosm/gh-workflows/.github/workflows/[email protected]

.github/workflows/release_img.yml

@@ -11,19 +11,22 @@ jobs:
     uses: hotosm/gh-workflows/.github/workflows/[email protected]
     with:
       dockerfile: docker/underpass.dockerfile
+      scan_dockerfile: false
       build_target: prod
       image_name: ghcr.io/${{ github.repository }}
 
   api-build:
     uses: hotosm/gh-workflows/.github/workflows/[email protected]
     with:
       dockerfile: docker/underpass-api.dockerfile
+      scan_dockerfile: false
       build_target: prod
       image_name: ghcr.io/${{ github.repository }}/api
 
   ui-build:
     uses: hotosm/gh-workflows/.github/workflows/[email protected]
     with:
       dockerfile: docker/underpass-ui.dockerfile
+      scan_dockerfile: false
       build_target: prod
       image_name: ghcr.io/${{ github.repository }}/ui

.github/workflows/tests.yml

@@ -21,7 +21,8 @@ jobs:
       image_name: ghcr.io/${{ github.repository }}
       build_dockerfile: docker/underpass.dockerfile
       compose_service: underpass
-      compose_command: echo "Tests complete."
+      compose_command: '"make check -j $(nproc)"'
+      tag_override: ci
       # TODO update postgis image to use github repo var ${{ vars.POSTGIS_TAG }}
       cache_extra_imgs: |
         "docker.io/postgis/postgis:15-3.3-alpine"

ci/ci_local.sh

@@ -19,11 +19,19 @@ cd ${TEMP_DIR}
 make distclean -j `nproc` || true
 make clean -j `nproc` || true
 
-# Run CI
-APP_VERSION=ci docker compose run underpass --exit-code-from=underpass
+# Stop containers if running
+docker rm --force underpass underpass_postgis underpass_api underpass_ui || true
 
-# Shut down containers
-APP_VERSION=ci docker compose down
+# Run CI
+export TAG_OVERRIDE=ci
+echo
+# Use -t flag to pass signals via tty
+docker compose run -t --rm --build underpass
+echo "Returned signal from tests: $?"
+echo
+
+# Cleanup containers
+docker rm --force underpass underpass_postgis underpass_api underpass_ui || true
 
 echo "Remove temporary folder ${TEMP_DIR}"
 sudo rm -rf ${TEMP_DIR}

docker-compose.yml

@@ -43,21 +43,21 @@ services:
 
   # Underpass
   underpass:
-    image: "ghcr.io/hotosm/underpass:${APP_VERSION:-debug}"
+    image: "ghcr.io/hotosm/underpass:${TAG_OVERRIDE:-debug}"
     container_name: "underpass"
     build:
      context: .
      dockerfile: docker/underpass.dockerfile
-     target: debug
+     target: ${TAG_OVERRIDE:-debug}
      args:
         APP_VERSION: ${APP_VERSION:-debug}
     depends_on: [postgis]
     environment:
       - REPLICATOR_UNDERPASS_DB_URL=underpass:underpass@postgis/underpass
     command: tail -f /dev/null
-    volumes:
-      - ./replication:/code/build/replication
-      # - ./:/code
+    # volumes:
+      # - ${PWD}:/code
+      # - ./replication:/code/build/replication
     networks:
       internal:
 

docker/underpass.dockerfile

@@ -27,6 +27,7 @@ RUN set -ex \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install \
     -y --no-install-recommends \
+        "git" \
         "software-properties-common" \
         "libboost-all-dev" \
         "autotools-dev" \
@@ -42,21 +43,15 @@ RUN set -ex \
         "libgdal-dev" \
         "libosmium2-dev" \
         "libpqxx-dev" \
-        "postgresql" \
+        "postgresql-postgis" \
         "libgumbo-dev" \
         "librange-v3-dev" \
         "libtool" \
+        "osm2pgsql" \
     && rm -rf /var/lib/apt/lists/*
 
 
 
-FROM deps as ci
-COPY docker/build-and-test.sh /build-and-test.sh
-RUN chmod +x /build-and-test.sh
-ENTRYPOINT [ "/bin/bash", "-c" ]
-
-
-
 FROM deps as build
 # Build underpass
 COPY . .
@@ -68,11 +63,22 @@ RUN ../configure && \
 
 
 
+FROM build as ci
+ENV LD_LIBRARY_PATH=/code/build/.libs/
+WORKDIR /code/build
+ENTRYPOINT [ "/bin/bash", "-c" ]
+CMD ["make", "check", "-j", "$(nproc)"]
+
+
+
 FROM deps as debug
 # Local debug with all dev deps
-ENV PATH=$PATH:/code/build \
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/code/build/.libs
-COPY --from=build /code/build /code/build
+ENV LD_LIBRARY_PATH=/code/build/.libs/
+COPY --from=build /usr/local/bin /usr/local/bin
+COPY --from=build /code/build/.libs/ \
+    /code/build/.libs/
+COPY --from=build /usr/local/lib/underpass/config \
+    /usr/local/lib/underpass/config
 WORKDIR /code/build
 # Add non-root user
 RUN useradd -r -u 1001 -m -c "hotosm account" -d /home/appuser -s /bin/false appuser
@@ -83,8 +89,7 @@ USER appuser
 
 FROM base as prod
 # Production image with minimal deps
-ENV PATH=$PATH:/code/build \
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/code/build/.libs
+ENV LD_LIBRARY_PATH=/usr/local/lib
 RUN set -ex \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install \
@@ -96,8 +101,14 @@ RUN set -ex \
         "libjemalloc2" \
         "libpqxx-6.4" \
         "libgumbo1" \
+        "postgresql-client" \
+        "osm2pgsql" \
     && rm -rf /var/lib/apt/lists/*
-COPY --from=build /code/build /code/build
+COPY --from=build /usr/local/bin /usr/local/bin
+COPY --from=build /code/build/.libs/ \
+    /usr/local/lib/
+COPY --from=build /usr/local/lib/underpass/config \
+    /usr/local/lib/underpass/config
 WORKDIR /code/build
 # Add non-root user
 RUN useradd -r -u 1001 -m -c "hotosm account" -d /home/appuser -s /bin/false appuser