Switch to gosu

anonaddy · Mar 2, 2021 · 6bf6ca7 · 6bf6ca7
1 parent a726543
commit 6bf6ca7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.7.1-r2 (2021/03/02)
+
+* Switch to `gosu`
+
 ## 0.7.1-r1 (2021/02/28)
 
 * Fix permissions

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,11 @@
 ARG ANONADDY_VERSION=0.7.1
 
+FROM --platform=${TARGETPLATFORM:-linux/amd64} crazymax/gosu:latest AS gosu
 FROM --platform=${TARGETPLATFORM:-linux/amd64} crazymax/alpine-s6:3.13-2.1.0.2
 LABEL maintainer="CrazyMax"
 
+ARG TARGETPLATFORM
+COPY --from=gosu / /
 RUN apk --update --no-cache add \
     bash \
     ca-certificates \
@@ -49,7 +52,6 @@ RUN apk --update --no-cache add \
     postfix \
     postfix-mysql \
     shadow \
-    su-exec \
     tar \
     tzdata \
   && apk --update-cache --repository https://dl-cdn.alpinelinux.org/alpine/edge/testing add \

diff --git a/rootfs/usr/local/bin/anonaddy b/rootfs/usr/local/bin/anonaddy
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-su-exec anonaddy:anonaddy php /var/www/anonaddy/artisan "$@"
+gosu anonaddy:anonaddy php /var/www/anonaddy/artisan "$@"