Compare commits
3 Commits
bfbc0e22d7
...
ab73132553
Author | SHA1 | Date | |
---|---|---|---|
ab73132553 | |||
76cdb2640e | |||
f1f322d58a |
20
Dockerfile
20
Dockerfile
@ -10,6 +10,7 @@ ENV S6_OVERLAY_ARCH=aarch64
|
|||||||
FROM base-${TARGETARCH}${TARGETVARIANT}
|
FROM base-${TARGETARCH}${TARGETVARIANT}
|
||||||
|
|
||||||
ARG S6_OVERLAY_VERSION=3.1.5.0
|
ARG S6_OVERLAY_VERSION=3.1.5.0
|
||||||
|
ARG CRONICLE_EDGE_VERSION=1.6.2
|
||||||
|
|
||||||
ENV CRONICLE_foreground=1
|
ENV CRONICLE_foreground=1
|
||||||
ENV CRONICLE_echo=1
|
ENV CRONICLE_echo=1
|
||||||
@ -27,8 +28,8 @@ RUN apk update && apk add tzdata curl shadow bash xz git procps nodejs npm
|
|||||||
RUN mkdir /config && \
|
RUN mkdir /config && \
|
||||||
mkdir /app && \
|
mkdir /app && \
|
||||||
#Create default user
|
#Create default user
|
||||||
useradd -u 1000 -U -d /config -s /bin/false mrmeeb && \
|
useradd -u 1000 -U -d /config -s /bin/false cronicle && \
|
||||||
usermod -G users mrmeeb
|
usermod -G users cronicle
|
||||||
|
|
||||||
#Install s6-overlay
|
#Install s6-overlay
|
||||||
RUN curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" | tar Jpxf - -C / && \
|
RUN curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz" | tar Jpxf - -C / && \
|
||||||
@ -38,18 +39,21 @@ RUN curl -fsSL "https://github.com/just-containers/s6-overlay/releases/download/
|
|||||||
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 S6_VERBOSITY=1
|
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 S6_VERBOSITY=1
|
||||||
|
|
||||||
#Install Cronicle
|
#Install Cronicle
|
||||||
RUN git clone https://github.com/cronicle-edge/cronicle-edge.git /app/cronicle
|
RUN mkdir /app/cronicle && \
|
||||||
|
cd /app/cronicle && \
|
||||||
|
wget https://github.com/cronicle-edge/cronicle-edge/archive/refs/tags/v${CRONICLE_EDGE_VERSION}.tar.gz && \
|
||||||
|
tar -xf v${CRONICLE_EDGE_VERSION}.tar.gz --strip-components 1 && \
|
||||||
|
rm -rf /app/cronicle/Docker* && \
|
||||||
|
rm -rf v${CRONICLE_EDGE_VERSION}.tar.gz
|
||||||
|
|
||||||
WORKDIR /app/cronicle
|
WORKDIR /app/cronicle
|
||||||
RUN npm install && \
|
RUN npm install && \
|
||||||
node bin/build dist
|
node bin/build dist
|
||||||
RUN rm -rf /app/cronicle/Docker* .vscode
|
|
||||||
|
|
||||||
#Create Cronicle user, necessary for SSH plugin with default settings
|
|
||||||
RUN adduser --disabled-password --no-create-home cronicle
|
|
||||||
|
|
||||||
COPY root/ /
|
COPY root/ /
|
||||||
RUN chmod +x /cronicle-prepare.sh && \
|
RUN chmod +x /cronicle-prepare.sh && \
|
||||||
chmod +x /container-init.sh
|
chmod +x /container-init.sh && \
|
||||||
|
chown -R ${PUID}:${PGID} /app /config
|
||||||
|
|
||||||
EXPOSE 3012
|
EXPOSE 3012
|
||||||
|
|
||||||
|
@ -28,26 +28,26 @@ MODE=${MODE}
|
|||||||
if [[ ! "${PUID}" -eq 0 ]] && [[ ! "${PGID}" -eq 0 ]]; then
|
if [[ ! "${PUID}" -eq 0 ]] && [[ ! "${PGID}" -eq 0 ]]; then
|
||||||
echo "Executing usermod..."
|
echo "Executing usermod..."
|
||||||
mkdir "/tmp/temphome"
|
mkdir "/tmp/temphome"
|
||||||
usermod -d "/tmp/temphome" mrmeeb
|
usermod -d "/tmp/temphome" cronicle
|
||||||
usermod -o -u "${PUID}" mrmeeb
|
usermod -o -u "${PUID}" cronicle
|
||||||
usermod -d /config mrmeeb
|
usermod -d /config cronicle
|
||||||
rm -rf "/tmp/temphome"
|
rm -rf "/tmp/temphome"
|
||||||
groupmod -o -g "${PGID}" mrmeeb
|
groupmod -o -g "${PGID}" cronicle
|
||||||
else
|
else
|
||||||
echo "Running as root is not supported, please fix your PUID and PGID!"
|
echo "Running as root is not supported, please fix your PUID and PGID!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Checking permissions in /config and /app (this can take some time)."
|
echo "Checking permissions in /config and /app."
|
||||||
|
|
||||||
if [ ! "$(stat -c %u /app)" -eq "${PUID}" ] || [ ! "$(stat -c %g /app)" -eq "${PGID}" ]
|
if [ ! "$(stat -c %u /app)" -eq "${PUID}" ] || [ ! "$(stat -c %g /app)" -eq "${PGID}" ]
|
||||||
then
|
then
|
||||||
echo "Fixing permissions for /app."
|
echo "Fixing permissions for /app (this can take some time)."
|
||||||
chown -R mrmeeb:mrmeeb /app
|
chown -R cronicle:cronicle /app
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! "$(stat -c %u /config)" -eq "${PUID}" ] || [ ! "$(stat -c %g /config)" -eq "${PGID}" ]
|
if [ ! "$(stat -c %u /config)" -eq "${PUID}" ] || [ ! "$(stat -c %g /config)" -eq "${PGID}" ]
|
||||||
then
|
then
|
||||||
echo "Fixing permissions for /config."
|
echo "Fixing permissions for /config (this can take some time)."
|
||||||
chown -R mrmeeb:mrmeeb /config
|
chown -R cronicle:cronicle /config
|
||||||
fi
|
fi
|
@ -1 +1 @@
|
|||||||
exec s6-setuidgid mrmeeb /cronicle-prepare.sh
|
exec s6-setuidgid cronicle /cronicle-prepare.sh
|
@ -1,3 +1,3 @@
|
|||||||
#!/command/with-contenv bash
|
#!/command/with-contenv bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
exec s6-setuidgid mrmeeb node /app/cronicle/lib/main.js --color 1
|
exec s6-setuidgid cronicle node /app/cronicle/lib/main.js --color 1
|
Loading…
x
Reference in New Issue
Block a user