Skip to content

Commit 1b02673

Browse files
Can now update to the latest Calibre version thank to the PR from @FennyFatal that maintains compatibility for machines using older kernals with the latest versions and also changed set-cwa.sh to be more compatable with NFS based configs
1 parent 260f7a0 commit 1b02673

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ARG BUILD_DATE
2727
ARG VERSION
2828
ARG CALIBREWEB_RELEASE=0.6.24
2929
ARG LSCW_RELEASE=0.6.24-ls304
30-
ARG UNIVERSAL_CALIBRE_RELEASE=7.16.0
30+
ARG CALIBRE_RELEASE=8.4.0
3131
ARG KEPUBIFY_RELEASE=v4.0.4
3232
LABEL build_version="Version:- ${VERSION}"
3333
LABEL build_date="${BUILD_DATE}"
@@ -169,15 +169,15 @@ RUN \
169169
# STEP 3.2 - Make the /app/calibre directory for the installed files
170170
mkdir -p \
171171
/app/calibre && \
172-
# STEP 3.3 - Download the desired version of Calibre, determined by the UNIVERSAL_CALIBRE_RELEASE variable and the architecture of the build environment
172+
# STEP 3.3 - Download the desired version of Calibre, determined by the CALIBRE_RELEASE variable and the architecture of the build environment
173173
if [ "$(uname -m)" == "x86_64" ]; then \
174174
curl -o \
175175
/calibre.txz -L \
176-
"https://download.calibre-ebook.com/${UNIVERSAL_CALIBRE_RELEASE}/calibre-${UNIVERSAL_CALIBRE_RELEASE}-x86_64.txz"; \
176+
"https://download.calibre-ebook.com/${CALIBRE_RELEASE}/calibre-${CALIBRE_RELEASE}-x86_64.txz"; \
177177
elif [ "$(uname -m)" == "aarch64" ]; then \
178178
curl -o \
179179
/calibre.txz -L \
180-
"https://download.calibre-ebook.com/${UNIVERSAL_CALIBRE_RELEASE}/calibre-${UNIVERSAL_CALIBRE_RELEASE}-arm64.txz"; \
180+
"https://download.calibre-ebook.com/${CALIBRE_RELEASE}/calibre-${CALIBRE_RELEASE}-arm64.txz"; \
181181
fi && \
182182
# STEP 3.4 - Extract the downloaded file to /app/calibre
183183
tar xf \
@@ -187,8 +187,8 @@ RUN \
187187
strip --remove-section=.note.ABI-tag /app/calibre/lib/libQt6* && \
188188
# STEP 3.5 - Delete the extracted calibre.txz to save space in final image
189189
rm /calibre.txz && \
190-
# STEP 3.6 - Store the UNIVERSAL_CALIBRE_RELEASE in the root of the image in CALIBRE_RELEASE
191-
echo $UNIVERSAL_CALIBRE_RELEASE > /CALIBRE_RELEASE
190+
# STEP 3.6 - Store the CALIBRE_RELEASE in the root of the image in CALIBRE_RELEASE
191+
echo $CALIBRE_RELEASE > /CALIBRE_RELEASE
192192

193193
# Removes packages that are no longer required, also emptying dirs used to build the image that are no longer needed
194194
RUN \

scripts/setup-cwa.sh

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@
22

33
# Make required directories and files for metadata enforcement
44
make_dirs () {
5-
mkdir /app/calibre-web-automated/metadata_change_logs
6-
chown -R abc:abc /app/calibre-web-automated/metadata_change_logs
7-
mkdir /app/calibre-web-automated/metadata_temp
8-
chown -R abc:abc /app/calibre-web-automated/metadata_temp
9-
mkdir /cwa-book-ingest
10-
chown abc:abc /cwa-book-ingest
11-
mkdir /calibre-library
12-
chown -R abc:abc /calibre-library
5+
install -d -o abc -g abc /app/calibre-web-automated/metadata_change_logs
6+
install -d -o abc -g abc /app/calibre-web-automated/metadata_temp
7+
install -d -o abc -g abc /cwa-book-ingest
8+
install -d -o abc -g abc /calibre-library
139
}
1410

1511
# Change ownership & permissions as required

0 commit comments

Comments
 (0)