diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index c894cff..3c76d87 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.1-prod/Dockerfile b/8.1-prod/Dockerfile index 0085a05..73972a4 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 21ee990..d0fc00a 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 fa0ba14..e99ca40 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 9374056..a08a73b 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 00a9519..c9a42ce 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 df80b36..c0c3fb7 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 c9ffc3e..e598c23 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 a4780d2..9cb9fc1 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 0b23cb5..898e69a 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 \