coop-cloud-chaos-patchs/docker-calibre-web
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change to release based tagging

Browse Source 
Rebase on Ubuntu baseimage.
This commit is contained in:
chbmb 2019-06-02 15:42:37 +01:00
parent cea504468f
commit 63a4fcaacc
4 changed files with 66 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
Dockerfile
View File

@ -1,60 +1,32 @@
FROM lsiobase/python:3.9 FROM lsiobase/ubuntu:bionic
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG CALIBRE_COMMIT ARG CALIBRE_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="chbmb" LABEL maintainer="chbmb"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apt-get update && \
file \ apt-get install -y \
fontconfig-dev \ git \
freetype-dev \ python-pip && \
g++ \
gcc \
ghostscript-dev \
lcms2-dev \
libjpeg-turbo-dev \
libpng-dev \
libtool \
libwebp-dev \
libxml2-dev \
libxslt-dev \
make \
perl-dev \
python2-dev \
tiff-dev \
xz \
zlib-dev && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apt-get install -y \
fontconfig \ imagemagick \
freetype \ python-minimal && \
ghostscript \
imagemagick6 \
jq \
lcms2 \
libjpeg-turbo \
libltdl \
libpng \
libwebp \
libxml2 \
libxslt \
tiff \
zlib && \
echo "**** install calibre-web ****" && \ echo "**** install calibre-web ****" && \
if [ -z ${CALIBRE_COMMIT+x} ]; then \ if [ -z ${CALIBRE_RELEASE+x} ]; then \
CALIBRE_COMMIT=$(curl -sX GET https://api.github.com/repos/janeczku/calibre-web/commits/master \ CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \
| jq -r '. | .sha'); \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \ fi && \
curl -o \
/tmp/calibre-web.tar.gz -L \
https://github.com/janeczku/calibre-web/archive/${CALIBRE_RELEASE}.tar.gz && \
mkdir -p \ mkdir -p \
/app/calibre-web && \ /app/calibre-web && \
curl -o \
/tmp/calibre-web.tar.gz -L \
https://github.com/janeczku/calibre-web/archive/${CALIBRE_COMMIT}.tar.gz && \
tar xf \ tar xf \
/tmp/calibre-web.tar.gz -C \ /tmp/calibre-web.tar.gz -C \
/app/calibre-web --strip-components=1 && \ /app/calibre-web --strip-components=1 && \
@ -64,11 +36,9 @@ RUN \
pip install --no-cache-dir -U -r \ pip install --no-cache-dir -U -r \
optional-requirements.txt && \ optional-requirements.txt && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \ rm -rf \
/tmp/* /tmp/*
# add local files # add local files
COPY root/ / COPY root/ /

66
Dockerfile.aarch64
View File

@ -1,60 +1,32 @@
FROM lsiobase/python:arm64v8-3.9 FROM lsiobase/ubuntu:arm64v8-bionic
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG CALIBRE_COMMIT ARG CALIBRE_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="chbmb" LABEL maintainer="chbmb"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apt-get update && \
file \ apt-get install -y \
fontconfig-dev \ git \
freetype-dev \ python-pip && \
g++ \
gcc \
ghostscript-dev \
lcms2-dev \
libjpeg-turbo-dev \
libpng-dev \
libtool \
libwebp-dev \
libxml2-dev \
libxslt-dev \
make \
perl-dev \
python2-dev \
tiff-dev \
xz \
zlib-dev && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apt-get install -y \
fontconfig \ imagemagick \
freetype \ python-minimal && \
ghostscript \
imagemagick6 \
jq \
lcms2 \
libjpeg-turbo \
libltdl \
libpng \
libwebp \
libxml2 \
libxslt \
tiff \
zlib && \
echo "**** install calibre-web ****" && \ echo "**** install calibre-web ****" && \
if [ -z ${CALIBRE_COMMIT+x} ]; then \ if [ -z ${CALIBRE_RELEASE+x} ]; then \
CALIBRE_COMMIT=$(curl -sX GET https://api.github.com/repos/janeczku/calibre-web/commits/master \ CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \
| jq -r '. | .sha'); \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \ fi && \
curl -o \
/tmp/calibre-web.tar.gz -L \
https://github.com/janeczku/calibre-web/archive/${CALIBRE_RELEASE}.tar.gz && \
mkdir -p \ mkdir -p \
/app/calibre-web && \ /app/calibre-web && \
curl -o \
/tmp/calibre-web.tar.gz -L \
https://github.com/janeczku/calibre-web/archive/${CALIBRE_COMMIT}.tar.gz && \
tar xf \ tar xf \
/tmp/calibre-web.tar.gz -C \ /tmp/calibre-web.tar.gz -C \
/app/calibre-web --strip-components=1 && \ /app/calibre-web --strip-components=1 && \
@ -64,8 +36,10 @@ RUN \
pip install --no-cache-dir -U -r \ pip install --no-cache-dir -U -r \
optional-requirements.txt && \ optional-requirements.txt && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
apk del --purge \ apt-get -y remove \
build-dependencies && \ git \
python-pip && \
apt-get -y autoremove && \
rm -rf \ rm -rf \
/tmp/* /tmp/*

68
Dockerfile.armhf
View File

@ -1,60 +1,32 @@
FROM lsiobase/python:arm32v7-3.9 FROM lsiobase/ubuntu:arm32v7-bionic
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
ARG VERSION ARG VERSION
ARG CALIBRE_COMMIT ARG CALIBRE_RELEASE
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="chbmb" LABEL maintainer="chbmb"
RUN \ RUN \
echo "**** install build packages ****" && \ echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \ apt-get update && \
file \ apt-get install -y \
fontconfig-dev \ git \
freetype-dev \ python-pip && \
g++ \
gcc \
ghostscript-dev \
lcms2-dev \
libjpeg-turbo-dev \
libpng-dev \
libtool \
libwebp-dev \
libxml2-dev \
libxslt-dev \
make \
perl-dev \
python2-dev \
tiff-dev \
xz \
zlib-dev && \
echo "**** install runtime packages ****" && \ echo "**** install runtime packages ****" && \
apk add --no-cache \ apt-get install -y \
fontconfig \ imagemagick \
freetype \ python-minimal && \
ghostscript \
imagemagick6 \
jq \
lcms2 \
libjpeg-turbo \
libltdl \
libpng \
libwebp \
libxml2 \
libxslt \
tiff \
zlib && \
echo "**** install calibre-web ****" && \ echo "**** install calibre-web ****" && \
if [ -z ${CALIBRE_COMMIT+x} ]; then \ if [ -z ${CALIBRE_RELEASE+x} ]; then \
CALIBRE_COMMIT=$(curl -sX GET https://api.github.com/repos/janeczku/calibre-web/commits/master \ CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/janeczku/calibre-web/releases/latest" \
| jq -r '. | .sha'); \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \ fi && \
curl -o \
/tmp/calibre-web.tar.gz -L \
https://github.com/janeczku/calibre-web/archive/${CALIBRE_RELEASE}.tar.gz && \
mkdir -p \ mkdir -p \
/app/calibre-web && \ /app/calibre-web && \
curl -o \
/tmp/calibre-web.tar.gz -L \
https://github.com/janeczku/calibre-web/archive/${CALIBRE_COMMIT}.tar.gz && \
tar xf \ tar xf \
/tmp/calibre-web.tar.gz -C \ /tmp/calibre-web.tar.gz -C \
/app/calibre-web --strip-components=1 && \ /app/calibre-web --strip-components=1 && \
@ -64,8 +36,10 @@ RUN \
pip install --no-cache-dir -U -r \ pip install --no-cache-dir -U -r \
optional-requirements.txt && \ optional-requirements.txt && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
apk del --purge \ apt-get -y remove \
build-dependencies && \ git \
python-pip && \
apt-get -y autoremove && \
rm -rf \ rm -rf \
/tmp/* /tmp/*
@ -74,4 +48,4 @@ COPY root/ /
# ports and volumes # ports and volumes
EXPOSE 8083 EXPOSE 8083
VOLUME /books /config VOLUME /books /config

8
root/etc/cont-init.d/30-config
View File

@ -8,6 +8,7 @@
[[ ! -L /app/calibre-web/app.db ]] && \ [[ ! -L /app/calibre-web/app.db ]] && \
ln -s /config/app.db /app/calibre-web/app.db ln -s /config/app.db /app/calibre-web/app.db
# create symlinks for log
[[ ! -f /config/calibre-web.log ]] && \ [[ ! -f /config/calibre-web.log ]] && \
touch /config/calibre-web.log touch /config/calibre-web.log
[[ -f /app/calibre-web/calibre-web.log ]] && \ [[ -f /app/calibre-web/calibre-web.log ]] && \
@ -15,6 +16,13 @@
[[ ! -L /app/calibre-web/calibre-web.log ]] && \ [[ ! -L /app/calibre-web/calibre-web.log ]] && \
ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log ln -s /config/calibre-web.log /app/calibre-web/calibre-web.log
# Google Drive Integration
[[ ! -f /config/client_secrets.json ]] && \
echo "{}" > /config/client_secrets.json
[[ -f /app/calibre-web/client_secrets.json ]] &&
rm /app/calibre-web/client_secrets.json
[[ ! -L /app/calibre-web/client_secrets.json ]] &&
ln -s /config/client_secrets.json /app/calibre-web/client_secrets.json
# permissions # permissions
chown -R abc:abc \ chown -R abc:abc \