#149 fix: various issues with image build and test

.github/workflows/test.yml

@@ -49,6 +49,12 @@ jobs:
       matrix: ${{ fromJSON(needs.matrix.outputs.matrix) }}
       fail-fast: false
     steps:
+      # v1.3.1
+      - uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
+        # Some of our services need a lot of free disk. We run this action to
+        # free up some disk space, however it is slow, so we conditionally do
+        # this only on those services that need it.
+        if: matrix.service == 'opensearch' || matrix.service == 'dynamodb'
       - uses: actions/checkout@v3
       - name: Install dependencies
         run: sudo apt-get update

Taskfile.yml

@@ -92,7 +92,7 @@ tasks:
       - buildkitd.toml
     status:
       # Exits zero (up to date) if there is already a builder.
-      - docker buildx ls | grep -q '^{{.BUILDX_BUILDER}}\s'
+      - docker buildx ls | grep -q '^{{.BUILDX_BUILDER}}'
     cmds:
       - docker buildx create
           --name "{{.BUILDX_BUILDER}}"

scripts/generate.sh

@@ -26,7 +26,7 @@ function getTags() {
             perl -pe 's/;SharedTags:/,/g;' -e 's/;/\n/g' |
             sort |
             sed 's/^.*Tags: //g' |
-            grep -v -e alpine -e slim -e onbuild -e windows -e wheezy -e nanoserver -e alpha -e beta |
+            grep -v -e alpine -e slim -e onbuild -e windows -e wheezy -e nanoserver -e alpha -e beta -e 'ubi[0-9]' |
             ${filter} |
             sed 's/, /,/g'
     done

scripts/test.sh

@@ -52,17 +52,23 @@ healthcheck() {
 }
 
 for x in "$servicedir"/*/NAME; do
-    tag=$(basename "$(dirname "$x")")
+    dirname=$(dirname "$x")
+    tag=$(basename "$dirname")
     image=$NAMESPACE/$NAME:$tag
-    container=$(docker create "$image")
-    trap - EXIT
-    trap 'docker rm -f "$container" >/dev/null' EXIT
-    docker start "$container" >/dev/null
+    if [[ $(docker inspect "$image" --format '{{.Config.Healthcheck}}') = "<nil>" ]]; then
+        echo "$image SKIPPED"
+        continue
+    fi
+    platform=$(cat "$dirname/PLATFORM")
+    container=$(docker run --rm --detach --platform "$platform" "$image")
     if ! healthcheck "$container"; then
+        echo
+        docker logs --follow -n 5 "$container" &
+        docker stop "$container" >/dev/null
         echo "$image FAILED"
         exit 1
     else
+        docker stop "$container" >/dev/null
         echo "$image PASSED"
     fi
-    docker rm -f "$container" >/dev/null
 done

services/couchdb/Dockerfile

@@ -1 +1,3 @@
-HEALTHCHECK CMD /bin/nc -z 127.0.0.1 5984
+ENV COUCHDB_USER=tugboat \
+    COUCHDB_PASSWORD=tugboat
+HEALTHCHECK CMD /bin/nc -z 127.0.0.1 5984

services/percona/manifest

@@ -1,3 +1,5 @@
 NAME=percona
 FROM=percona
 TEMPLATE=yum
+# Filter out centos 5.6 and percona with mongodb.
+FILTER="grep -v -e 5.6-centos -e psmdb"

services/varnish/Dockerfile

@@ -1 +1 @@
-HEALTHCHECK CMD /usr/bin/varnishadm status
+HEALTHCHECK CMD /usr/bin/varnishadm status || /usr/local/bin/varnishadm status