Skip to content

Dockerize Upgrade + Proper ARM Support #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion 8.0-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 8.1-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 8.1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 8.2-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 8.3-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 8.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 8.4-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion 8.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion template/Dockerfile.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down