|
|
|
@ -10,17 +10,6 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS="2" \
|
|
|
|
|
PUID="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 && \
|
|
|
|
|
apk update && \
|
|
|
|
|
apk add --no-cache --upgrade \
|
|
|
|
@ -37,6 +26,17 @@ RUN mkdir -p /opt/calibre && \
|
|
|
|
|
jq \
|
|
|
|
|
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 ****" && \
|
|
|
|
|
mkdir -p \
|
|
|
|
|
/opt/calibre && \
|
|
|
|
@ -51,7 +51,6 @@ RUN echo "**** install calibre ****" && \
|
|
|
|
|
"$CALIBRE_URL" && \
|
|
|
|
|
tar xvf /tmp/calibre-tarball.txz -C \
|
|
|
|
|
/opt/calibre && \
|
|
|
|
|
ls /opt/calibre && \
|
|
|
|
|
/opt/calibre/calibre_postinstall && \
|
|
|
|
|
dbus-uuidgen > /etc/machine-id
|
|
|
|
|
|
|
|
|
|