Skip to content

Commit 1576216

Browse files
fabriciojsfabriciojs
authored
Merge pull request #112 from kool-dev/dockerize
Dockerize Upgrade + Proper ARM Support
2 parents 58a4622 + 3180610 commit 1576216

File tree

10 files changed

+20
-9
lines changed

10 files changed

+20
-9
lines changed

‎.github/workflows/ci-cd.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ jobs:
8989
docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -v
9090
docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} composer -V
9191
docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} composer1 -V
92+
docker run -e ASUSER=1000 kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} dockerize --version
93+
9294
docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -m | grep readline
9395
docker run -e ENABLE_XDEBUG=true kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -m
9496

‎8.1-prod/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ WORKDIR /app
2020
RUN adduser -D -u 1337 kool \
2121
&& addgroup kool www-data \
2222
# dockerize
23-
&& curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
23+
&& ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
24+
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
2425
&& mv dockerize /usr/local/bin/dockerize \
2526
# deps
2627
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \

‎8.1/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ WORKDIR /app
2121
RUN adduser -D -u 1337 kool \
2222
&& addgroup kool www-data \
2323
# dockerize
24-
&& curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
24+
&& ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
25+
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
2526
&& mv dockerize /usr/local/bin/dockerize \
2627
# deps
2728
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \

‎8.2-prod/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ WORKDIR /app
2020
RUN adduser -D -u 1337 kool \
2121
&& addgroup kool www-data \
2222
# dockerize
23-
&& curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
23+
&& ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
24+
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
2425
&& mv dockerize /usr/local/bin/dockerize \
2526
# deps
2627
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \

‎8.2/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ WORKDIR /app
2121
RUN adduser -D -u 1337 kool \
2222
&& addgroup kool www-data \
2323
# dockerize
24-
&& curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
24+
&& ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
25+
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
2526
&& mv dockerize /usr/local/bin/dockerize \
2627
# deps
2728
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \

‎8.3-prod/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ WORKDIR /app
2020
RUN adduser -D -u 1337 kool \
2121
&& addgroup kool www-data \
2222
# dockerize
23-
&& curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
23+
&& ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
24+
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
2425
&& mv dockerize /usr/local/bin/dockerize \
2526
# deps
2627
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \

‎8.3/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ WORKDIR /app
2121
RUN adduser -D -u 1337 kool \
2222
&& addgroup kool www-data \
2323
# dockerize
24-
&& curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
24+
&& ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
25+
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
2526
&& mv dockerize /usr/local/bin/dockerize \
2627
# deps
2728
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \

‎8.4-prod/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ WORKDIR /app
2020
RUN adduser -D -u 1337 kool \
2121
&& addgroup kool www-data \
2222
# dockerize
23-
&& curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
23+
&& ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
24+
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
2425
&& mv dockerize /usr/local/bin/dockerize \
2526
# deps
2627
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \

‎8.4/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ WORKDIR /app
2121
RUN adduser -D -u 1337 kool \
2222
&& addgroup kool www-data \
2323
# dockerize
24-
&& curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
24+
&& ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
25+
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${ARCH}-v0.9.3.tar.gz" | tar xz \
2526
&& mv dockerize /usr/local/bin/dockerize \
2627
# deps
2728
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \

‎template/Dockerfile.blade.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
RUN adduser -D -u 1337 kool \
2424
&& addgroup kool www-data \
2525
# dockerize
26-
&& curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.1/dockerize-alpine-linux-amd64-v0.6.1.tar.gz | tar xz \
26+
&& DOCKERIZE_ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
27+
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.9.3/dockerize-linux-${DOCKERIZE_ARCH}-v0.9.3.tar.gz" | tar xz \
2728
&& mv dockerize /usr/local/bin/dockerize \
2829
# deps
2930
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \

0 commit comments

Comments
 (0)