ci: fix failing supervisord tests

Author: lotyp

.github/workflows/test.yml

@@ -92,12 +92,13 @@ jobs:
           files: |
             ./docker-bake.hcl
             ${{ steps.meta.outputs.bake-file }}
+          push: false
           set: |
             *.tags=
             *.platform=linux/${{ matrix.builder.arch }}
             *.cache-from=type=gha,scope=build-${{ env.PLATFORM_CACHE_TAG }}
             *.cache-to=type=gha,scope=build-${{ env.PLATFORM_CACHE_TAG }}
-            *.output=type=docker,"name=${{ env.DOCKER_NAMESPACE }},${{ env.GHCR_NAMESPACE }}",name-canonical=true,push=false
+            *.output=type=docker,"name=${{ env.DOCKER_NAMESPACE }},${{ env.GHCR_NAMESPACE }}",name-canonical=true
 
       - name: 🧪 Test Docker image
         run: |

Makefile

@@ -82,7 +82,7 @@ PHONY: build-from-cache
 
 test: ## Run dgoss tests over docker images
 	set -eux
-	GOSS_FILES_STRATEGY=cp GOSS_FILES_PATH=$(DOCKERFILE_DIR) dgoss run -t $(IMAGE_TAG)
+	GOSS_SLEEP="0.4" GOSS_WAIT_OPTS="-r 40s -s 2s > /dev/stdout" GOSS_FILES_STRATEGY=cp GOSS_FILES_PATH=$(DOCKERFILE_DIR) dgoss run -t $(IMAGE_TAG)
 .PHONY: test
 
 pull: ## Pulls docker image from upstream
@@ -125,19 +125,13 @@ lint-ansible: ## Lint ansible files inside project
 .PHONY: lint-ansible
 
 lint-docker: ## Run hadolint linter over dist Dockerfiles
-	hadolint -V ./dist/dev/7.4-cli-alpine/Dockerfile
-	hadolint -V ./dist/dev/7.4-fpm-alpine/Dockerfile
-	hadolint -V ./dist/dev/7.4-fpm-supervisord/Dockerfile
-	hadolint -V ./dist/dev/8.0-cli-alpine/Dockerfile
-	hadolint -V ./dist/dev/8.0-fpm-alpine/Dockerfile
-	hadolint -V ./dist/dev/8.0-fpm-supervisord/Dockerfile
 	hadolint -V ./dist/dev/8.1-cli-alpine/Dockerfile
 	hadolint -V ./dist/dev/8.1-fpm-alpine/Dockerfile
-	hadolint -V ./dist/dev/8.1-fpm-supervisord/Dockerfile
+	hadolint -V ./dist/dev/8.1-supervisord-alpine/Dockerfile
 	hadolint -V ./dist/dev/8.2-cli-alpine/Dockerfile
 	hadolint -V ./dist/dev/8.2-fpm-alpine/Dockerfile
-	hadolint -V ./dist/dev/8.2-fpm-supervisord/Dockerfile
+	hadolint -V ./dist/dev/8.2-supervisord-alpine/Dockerfile
 	hadolint -V ./dist/dev/8.3-cli-alpine/Dockerfile
 	hadolint -V ./dist/dev/8.3-fpm-alpine/Dockerfile
-	hadolint -V ./dist/dev/8.3-fpm-supervisord/Dockerfile
+	hadolint -V ./dist/dev/8.3-supervisord-alpine/Dockerfile
 .PHONY: lint-docker