diff options
| -rw-r--r-- | capsule/Dockerfile | 9 | ||||
| -rwxr-xr-x | capsule/build_loglog.bash (renamed from capsule/build_loglog.sh) | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/capsule/Dockerfile b/capsule/Dockerfile index 26f5034..1284689 100644 --- a/capsule/Dockerfile +++ b/capsule/Dockerfile @@ -22,9 +22,10 @@ RUN crontab -l > crontab.tmp \ && crontab crontab.tmp \ && rm crontab.tmp -# gcc is a dependency for agate +# bash is needed to run build_loglog.bash # busybox-openrc provides rc-service, which runs crond -RUN apk --no-cache add gcc busybox-openrc +# gcc is a dependency for agate +RUN apk --no-cache add bash busybox-openrc gcc RUN rc-service crond start && rc-update add crond COPY --from=agate /root/.cargo/bin/agate /usr/local/bin/agate COPY --from=comitium /usr/local/bin/comitium /usr/local/bin/comitium @@ -34,9 +35,9 @@ COPY feeds.txt feeds.txt RUN while read feed; do \ comitium add --data comitium-data/ "$feed"; \ done <feeds.txt -COPY build_loglog.sh build_loglog.sh +COPY build_loglog.bash build_loglog.bash COPY content content -RUN /bin/bash ./build_loglog.sh +RUN ./build_loglog.bash CMD \ ( sleep 5; comitium refresh --data comitium-data/ ) & \ diff --git a/capsule/build_loglog.sh b/capsule/build_loglog.bash index 12c8af8..9358842 100755 --- a/capsule/build_loglog.sh +++ b/capsule/build_loglog.bash @@ -126,6 +126,6 @@ for ((i=${#dates[@]}-1; i>=0; i--)); do done echo "Cleaning up temporary files..." -rm -rd "$TMP" +rm -rf "$TMP" echo "Done." |