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 \
@ -36,24 +25,34 @@ RUN mkdir -p /opt/calibre && \
dbus \ dbus \
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 && \
if [ -z ${CALIBRE_RELEASE+x} ]; then \ if [ -z ${CALIBRE_RELEASE+x} ]; then \
CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \ CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
| jq -r .tag_name); \ | jq -r .tag_name); \
fi && \ fi && \
CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \ CALIBRE_VERSION="$(echo ${CALIBRE_RELEASE} | cut -c2-)" && \
CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-x86_64.txz" && \ CALIBRE_URL="https://download.calibre-ebook.com/${CALIBRE_VERSION}/calibre-${CALIBRE_VERSION}-x86_64.txz" && \
curl -o \ curl -o \
/tmp/calibre-tarball.txz -L \ /tmp/calibre-tarball.txz -L \
"$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
RUN echo "**** cleanup ****" && \ RUN echo "**** cleanup ****" && \
apt-get clean && \ apt-get clean && \

View File

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