diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 8f96781..f4be74a 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -89,6 +89,8 @@ jobs: docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -v docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} composer -V docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} composer1 -V + docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} dockerize --version + docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -m | grep readline docker run -e ENABLE_XDEBUG=true kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -m diff --git a/8.0-prod/Dockerfile b/8.0-prod/Dockerfile index 8f26161..e27a6c7 100644 --- a/8.0-prod/Dockerfile +++ b/8.0-prod/Dockerfile @@ -20,7 +20,8 @@ WORKDIR /app RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \ diff --git a/8.0/Dockerfile b/8.0/Dockerfile index ce1de02..738e23c 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -21,7 +21,8 @@ WORKDIR /app RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \ diff --git a/8.1-prod/Dockerfile b/8.1-prod/Dockerfile index b1bb041..69b8f1c 100644 --- a/8.1-prod/Dockerfile +++ b/8.1-prod/Dockerfile @@ -20,7 +20,8 @@ WORKDIR /app RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \ diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 0acdbca..0b1d3c2 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -21,7 +21,8 @@ WORKDIR /app RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \ diff --git a/8.2-prod/Dockerfile b/8.2-prod/Dockerfile index 725cd80..2dcc0b5 100644 --- a/8.2-prod/Dockerfile +++ b/8.2-prod/Dockerfile @@ -20,7 +20,8 @@ WORKDIR /app RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \ diff --git a/8.2/Dockerfile b/8.2/Dockerfile index fbfd0fe..c74bc6a 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -21,7 +21,8 @@ WORKDIR /app RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \ diff --git a/8.3-prod/Dockerfile b/8.3-prod/Dockerfile index 67d0b41..164683a 100644 --- a/8.3-prod/Dockerfile +++ b/8.3-prod/Dockerfile @@ -20,7 +20,8 @@ WORKDIR /app RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \ diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 2707461..b5077c0 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -21,7 +21,8 @@ WORKDIR /app RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \ diff --git a/8.4-prod/Dockerfile b/8.4-prod/Dockerfile index a491625..0d9a148 100644 --- a/8.4-prod/Dockerfile +++ b/8.4-prod/Dockerfile @@ -20,7 +20,8 @@ WORKDIR /app RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \ diff --git a/8.4/Dockerfile b/8.4/Dockerfile index 85723c7..b54dc51 100644 --- a/8.4/Dockerfile +++ b/8.4/Dockerfile @@ -21,7 +21,8 @@ WORKDIR /app RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \ diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php index 28ca5fa..e26acc2 100644 --- a/template/Dockerfile.blade.php +++ b/template/Dockerfile.blade.php @@ -23,7 +23,8 @@ RUN adduser -D -u 1337 kool \ && addgroup kool www-data \ # dockerize - && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \ + && DOCKERIZE_ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \ + && curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${DOCKERIZE_ARCH}-v0.9.3.tar.gz" | tar xz \ && mv dockerize /usr/local/bin/dockerize \ # deps && apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \