Move off of alpine
This commit is contained in:
parent
412f19cca9
commit
86222b54d3
2
.github/workflows/docker-image.yml
vendored
2
.github/workflows/docker-image.yml
vendored
@ -1,4 +1,4 @@
|
|||||||
name: Publish DOcker Image
|
name: Publish Docker Image
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM python:3.9-alpine
|
FROM python:3.9-slim
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
@ -11,8 +11,8 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS="2" \
|
|||||||
PGID="911"
|
PGID="911"
|
||||||
|
|
||||||
RUN mkdir -p /opt/calibre && \
|
RUN mkdir -p /opt/calibre && \
|
||||||
apk update && \
|
apt-get update && \
|
||||||
apk add --no-cache --upgrade \
|
apt-get install --no-cache --upgrade \
|
||||||
bash \
|
bash \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
gcc \
|
gcc \
|
||||||
@ -51,6 +51,7 @@ 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 && \
|
||||||
|
/opt/calibre/calibre_postinstall && \
|
||||||
dbus-uuidgen > /etc/machine-id
|
dbus-uuidgen > /etc/machine-id
|
||||||
|
|
||||||
RUN echo "**** cleanup ****" && \
|
RUN echo "**** cleanup ****" && \
|
||||||
@ -61,7 +62,7 @@ RUN echo "**** cleanup ****" && \
|
|||||||
/var/tmp/*
|
/var/tmp/*
|
||||||
|
|
||||||
RUN echo *** Install Packages *** && \
|
RUN echo *** Install Packages *** && \
|
||||||
apk add --no-cache --upgrade py-pillow && \
|
apt-get install --no-cache --upgrade py-pillow && \
|
||||||
if [ -z ${FFF_RELEASE+x} ]; then \
|
if [ -z ${FFF_RELEASE+x} ]; then \
|
||||||
python3 -m pip --no-cache-dir install FanFicFare \
|
python3 -m pip --no-cache-dir install FanFicFare \
|
||||||
else \
|
else \
|
||||||
|
@ -1 +1 @@
|
|||||||
v2022.03.25-5
|
v2022.03.25-6
|
||||||
|
Loading…
Reference in New Issue
Block a user