From 3cd48c3d5f0043a56cf9d4889d2ab6747940985d Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Mon, 17 Jul 2017 17:36:32 +0100 Subject: [PATCH] tidy up stuff --- Dockerfile | 2 +- root/etc/cont-init.d/30-config | 9 +++++---- root/etc/services.d/calibre-web/run | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9fdc910..3329ef0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN \ # install runtime packages apk add --no-cache \ - imagemagick && \ + imagemagick && \ # install calibre-web mkdir -p \ diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index 5105a76..7771b9e 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -1,13 +1,14 @@ #!/usr/bin/with-contenv bash -# put database in /config +# copy database to /config if not exists [[ ! -e /config/app.db ]] && \ cp /defaults/app.db /config/app.db \ -# link to /app/calibre-web/app.db -ln -s /config/app.db /app/calibre-web/app.db +# create symlink for database +[[ ! -L /app/calibre-web/app.db ]] && \ + ln -s /config/app.db /app/calibre-web/app.db # permissions chown -R abc:abc \ /config \ - /app/calibre-web + /app/calibre-web diff --git a/root/etc/services.d/calibre-web/run b/root/etc/services.d/calibre-web/run index 9df1c90..1dea53c 100644 --- a/root/etc/services.d/calibre-web/run +++ b/root/etc/services.d/calibre-web/run @@ -4,4 +4,3 @@ cd /app/calibre-web || exit exec \ s6-setuidgid abc python /app/calibre-web/cps.py -