This commit is contained in:
MrTyton 2022-03-25 18:18:04 -04:00
parent 5a09dea983
commit b936c04575
2 changed files with 28 additions and 29 deletions

View File

@ -10,17 +10,6 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS="2" \
PUID="911" \ PUID="911" \
PGID="911" PGID="911"
RUN set -x && \
addgroup --gid "$PGID" abc && \
adduser \
--gecos "" \
--disabled-password \
--no-create-home \
--uid "$PUID" \
--ingroup abc \
--shell /bin/bash \
abc
RUN mkdir -p /opt/calibre && \ RUN mkdir -p /opt/calibre && \
apk update && \ apk update && \
apk add --no-cache --upgrade \ apk add --no-cache --upgrade \
@ -37,6 +26,17 @@ RUN mkdir -p /opt/calibre && \
jq \ jq \
python3 python3
RUN set -x && \
addgroup --gid "$PGID" abc && \
adduser \
--gecos "" \
--disabled-password \
--no-create-home \
--uid "$PUID" \
--ingroup abc \
--shell /bin/bash \
abc
RUN echo "**** install calibre ****" && \ RUN echo "**** install calibre ****" && \
mkdir -p \ mkdir -p \
/opt/calibre && \ /opt/calibre && \
@ -51,7 +51,6 @@ RUN echo "**** install calibre ****" && \
"$CALIBRE_URL" && \ "$CALIBRE_URL" && \
tar xvf /tmp/calibre-tarball.txz -C \ tar xvf /tmp/calibre-tarball.txz -C \
/opt/calibre && \ /opt/calibre && \
ls /opt/calibre && \
/opt/calibre/calibre_postinstall && \ /opt/calibre/calibre_postinstall && \
dbus-uuidgen > /etc/machine-id dbus-uuidgen > /etc/machine-id

View File

@ -1 +1 @@
v2022.03.25-3 v2022.03.25-4