Merge pull request #308 from theseion/wait-for-logs-when-verifying

fix: wait for logs when verifying
coreruleset · Dec 12, 2024 · a5c93c7 · a5c93c7
2 parents 5c7dd53 + 9cd2f33
commit a5c93c7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.github/workflows/verifyimage.yml b/.github/workflows/verifyimage.yml
@@ -64,6 +64,7 @@ jobs:
         run: |
           echo "Starting container ${{ matrix.target }}"
           docker run --pull "never" -d --name ${{ matrix.target }}-test "${REPO}:${{ matrix.target }}"
+          sleep 30
           docker logs ${{ matrix.target }}-test
 
       - name: Verify ${{ matrix.target }}

diff --git a/openresty/Dockerfile-alpine b/openresty/Dockerfile-alpine
@@ -224,6 +224,7 @@ RUN set -eux; \
         git \
         moreutils \
         tzdata \
+        openssl \
         pcre \
         pcre2 \
         # Alpine needs GNU 'sed' because the 'sed' program shipped with busybox does not support 'z' parameter for separating lines with a 'NUL' character.

diff --git a/openresty/docker-entrypoint.d/10-generate-certificate.sh b/openresty/docker-entrypoint.d/10-generate-certificate.sh
@@ -7,6 +7,6 @@ LC_ALL=C
 ME=$( basename "$0" )
 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-/usr/local/bin/generate-certificate /usr/local/openresty/nginx/conf
+/usr/local/bin/generate-certificate /usr/local/openresty/nginx
 
 exit 0