|
@@ -1,7 +1,7 @@
|
|
-FROM alpine:3.20
|
|
|
|
|
|
+FROM alpine:3.21
|
|
|
|
|
|
-ARG S6_VER=3.2.0.0
|
|
|
|
-ARG JOPLIN_VER=3.0.1
|
|
|
|
|
|
+ARG S6_VER=3.2.0.2
|
|
|
|
+ARG JOPLIN_VER=3.2.1
|
|
|
|
|
|
ENV UID=1000
|
|
ENV UID=1000
|
|
ENV GID=1000
|
|
ENV GID=1000
|
|
@@ -15,7 +15,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
|
|
|
|
|
|
COPY --chmod=755 root /
|
|
COPY --chmod=755 root /
|
|
|
|
|
|
-RUN apk add --no-cache shadow bash ca-certificates tzdata wget npm socat inotify-tools jq \
|
|
|
|
|
|
+RUN apk add --no-cache shadow bash ca-certificates tzdata wget npm socat inotify-tools jq coreutils \
|
|
# install s6-overlay
|
|
# install s6-overlay
|
|
&& if [ "$(uname -m)" = "x86_64" ];then s6_arch=x86_64;elif [ "$(uname -m)" = "aarch64" ];then s6_arch=aarch64;elif [ "$(uname -m)" = "armv7l" ];then s6_arch=arm; fi \
|
|
&& if [ "$(uname -m)" = "x86_64" ];then s6_arch=x86_64;elif [ "$(uname -m)" = "aarch64" ];then s6_arch=aarch64;elif [ "$(uname -m)" = "armv7l" ];then s6_arch=arm; fi \
|
|
&& wget -P /tmp https://github.com/just-containers/s6-overlay/releases/download/v${S6_VER}/s6-overlay-noarch.tar.xz \
|
|
&& wget -P /tmp https://github.com/just-containers/s6-overlay/releases/download/v${S6_VER}/s6-overlay-noarch.tar.xz \
|