Skip to content

Commit 70aea25

Browse files
committed
Switch to gosu
1 parent f0271d2 commit 70aea25

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 2020-07-29-r7 (2021/03/02)
4+
5+
* Switch to `gosu`
6+
37
## 2020-07-29-r6 (2021/02/20)
48

59
* Downgrade s6-overlay to 2.1.0.2 (#29)

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
ARG DOKUWIKI_VERSION="2020-07-29"
22
ARG DOKUWIKI_MD5="8867b6a5d71ecb5203402fe5e8fa18c9"
33

4+
FROM --platform=${TARGETPLATFORM:-linux/amd64} crazymax/gosu:latest AS gosu
45
FROM --platform=${TARGETPLATFORM:-linux/amd64} crazymax/alpine-s6:3.12-2.1.0.2
56
LABEL maintainer="CrazyMax"
67

8+
COPY --from=gosu / /
79
RUN apk --update --no-cache add \
810
curl \
911
imagemagick \
@@ -30,7 +32,6 @@ RUN apk --update --no-cache add \
3032
php7-zip \
3133
php7-zlib \
3234
shadow \
33-
su-exec \
3435
tar \
3536
tzdata \
3637
&& rm -rf /tmp/* /var/cache/apk/* /var/www/*

rootfs/etc/cont-init.d/03-config.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/with-contenv sh
22

33
runas_user() {
4-
su-exec dokuwiki:dokuwiki "$@"
4+
gosu dokuwiki:dokuwiki "$@"
55
}
66

77
TZ=${TZ:-UTC}

0 commit comments

Comments
 (0)