Skip to content
Merged
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
3 changes: 1 addition & 2 deletions 8.2-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ RUN adduser -D -u 1337 kool \
&& addgroup kool www-data \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# deps
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
freetype libpng libjpeg-turbo libzip-dev ghostscript imagemagick \
Expand Down
3 changes: 1 addition & 2 deletions 8.2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ RUN adduser -D -u 1337 kool \
&& addgroup kool www-data \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# deps
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
freetype libpng libjpeg-turbo libzip-dev ghostscript imagemagick \
Expand Down
3 changes: 1 addition & 2 deletions 8.3-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ RUN adduser -D -u 1337 kool \
&& addgroup kool www-data \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# deps
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
freetype libpng libjpeg-turbo libzip-dev ghostscript imagemagick \
Expand Down
3 changes: 1 addition & 2 deletions 8.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ RUN adduser -D -u 1337 kool \
&& addgroup kool www-data \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# deps
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
freetype libpng libjpeg-turbo libzip-dev ghostscript imagemagick \
Expand Down
3 changes: 1 addition & 2 deletions 8.4-debian-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ RUN useradd -m -u 1337 kool \
&& usermod -aG www-data kool \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# gosu
&& GOSU_ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
&& curl -L "https://github.com/tianon/gosu/releases/download/1.17/gosu-${GOSU_ARCH}" -o /usr/local/bin/gosu \
Expand Down
3 changes: 1 addition & 2 deletions 8.4-debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ RUN useradd -m -u 1337 kool \
&& usermod -aG www-data kool \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# gosu
&& GOSU_ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
&& curl -L "https://github.com/tianon/gosu/releases/download/1.17/gosu-${GOSU_ARCH}" -o /usr/local/bin/gosu \
Expand Down
3 changes: 1 addition & 2 deletions 8.4-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ RUN adduser -D -u 1337 kool \
&& addgroup kool www-data \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# deps
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
freetype libpng libjpeg-turbo libzip-dev ghostscript imagemagick \
Expand Down
3 changes: 1 addition & 2 deletions 8.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ RUN adduser -D -u 1337 kool \
&& addgroup kool www-data \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# deps
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
freetype libpng libjpeg-turbo libzip-dev ghostscript imagemagick \
Expand Down
3 changes: 1 addition & 2 deletions 8.5-debian-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ RUN useradd -m -u 1337 kool \
&& usermod -aG www-data kool \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# gosu
&& GOSU_ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
&& curl -L "https://github.com/tianon/gosu/releases/download/1.17/gosu-${GOSU_ARCH}" -o /usr/local/bin/gosu \
Expand Down
3 changes: 1 addition & 2 deletions 8.5-debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ RUN useradd -m -u 1337 kool \
&& usermod -aG www-data kool \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# gosu
&& GOSU_ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
&& curl -L "https://github.com/tianon/gosu/releases/download/1.17/gosu-${GOSU_ARCH}" -o /usr/local/bin/gosu \
Expand Down
3 changes: 1 addition & 2 deletions 8.5-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ RUN adduser -D -u 1337 kool \
&& addgroup kool www-data \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# deps
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
freetype libpng libjpeg-turbo libzip-dev ghostscript imagemagick \
Expand Down
3 changes: 1 addition & 2 deletions 8.5/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ RUN adduser -D -u 1337 kool \
&& addgroup kool www-data \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# deps
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
freetype libpng libjpeg-turbo libzip-dev ghostscript imagemagick \
Expand Down
4 changes: 4 additions & 0 deletions scripts/test-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ test "$(docker run --rm -e ASUSER=1000 "$image" id -u)" = 1000

run dockerize --version
run sh -c 'echo "{{ .Env.TEST_VAR }}" > /tmp/test.tmpl; TEST_VAR=hello dockerize -template /tmp/test.tmpl:/tmp/test.out; test "$(cat /tmp/test.out)" = hello'
# The entrypoint runs dockerize as root, so only root may own it; and the
# release tarball's LICENSE/README.md must not be left behind in /app.
test "$(run stat -c %u:%g /usr/local/bin/dockerize)" = 0:0
run sh -c 'test ! -e /app/LICENSE && test ! -e /app/README.md'

# Read the module list once, and match whole names (e.g. zip, not gzip).
modules=$(run php -m)
Expand Down
3 changes: 1 addition & 2 deletions template/Dockerfile-debian.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
&& usermod -aG www-data kool \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# gosu
&& GOSU_ARCH="$( [ "$(uname -m)" = "aarch64" ] && echo arm64 || echo amd64 )" \
&& curl -L "https://github.com/tianon/gosu/releases/download/1.17/gosu-${GOSU_ARCH}" -o /usr/local/bin/gosu \
Expand Down
3 changes: 1 addition & 2 deletions template/Dockerfile.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
&& addgroup kool www-data \
# dockerize
&& 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 \
&& curl -L "https://github.com/jwilder/dockerize/releases/download/v0.15.2/dockerize-linux-${DOCKERIZE_ARCH}-v0.15.2.tar.gz" | tar xz -C /usr/local/bin --no-same-owner dockerize \
# deps
&& apk --no-cache add su-exec bash sed git openssh-client icu shadow procps \
freetype libpng libjpeg-turbo libzip-dev ghostscript imagemagick \
Expand Down
Loading