diff options
| author | crupest <crupest@outlook.com> | 2022-12-02 14:40:44 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2022-12-02 14:40:44 +0800 |
| commit | e38575ab77ba2fd6ccc31cff894c785b7baa1e07 (patch) | |
| tree | 9d2c858d08ed73c52b05146d3d7a1109904fd24b | |
| parent | 156ac991935926a250b0af7a251152d87cd485a7 (diff) | |
| download | crupest-e38575ab77ba2fd6ccc31cff894c785b7baa1e07.tar.gz crupest-e38575ab77ba2fd6ccc31cff894c785b7baa1e07.tar.bz2 crupest-e38575ab77ba2fd6ccc31cff894c785b7baa1e07.zip | |
Fix.
| -rw-r--r-- | docker/code-server/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/crupest-blog/Dockerfile | 9 | ||||
| -rwxr-xr-x | docker/crupest-blog/daemon.bash | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/docker/code-server/Dockerfile b/docker/code-server/Dockerfile index 6deb4c9..2b2c99f 100644 --- a/docker/code-server/Dockerfile +++ b/docker/code-server/Dockerfile @@ -2,7 +2,7 @@ FROM debian:latest WORKDIR /root COPY install-code-server.bash /install-code-server.bash -RUN /install-code-server.bash +RUN /install-code-server.bash && rm /install-code-server.bash ENV LANG en_US.utf8 ENV CODE_SERVER_CONFIG="/data/code-server-config.yaml" diff --git a/docker/crupest-blog/Dockerfile b/docker/crupest-blog/Dockerfile index 43bd5b4..30c4547 100644 --- a/docker/crupest-blog/Dockerfile +++ b/docker/crupest-blog/Dockerfile @@ -1,13 +1,8 @@ -FROM golang:alpine AS builder -RUN go install -tags extended github.com/gohugoio/hugo@latest && /root/go/hugo version - FROM alpine:latest ARG CRUPEST_BLOG_UPDATE_INTERVAL=1d ENV CRUPEST_BLOG_UPDATE_INTERVAL=${CRUPEST_BLOG_UPDATE_INTERVAL} -COPY --from=builder /root/go/hugo /usr/bin -RUN hugo version COPY daemon.bash update.bash /scripts/ -RUN apk add --no-cache coreutils tini bash git +RUN apk add --no-cache coreutils tini bash git hugo VOLUME [ "/public" ] ENTRYPOINT ["/sbin/tini", "--"] -CMD [ "/daemon.bash" ] +CMD [ "/scripts/daemon.bash" ] diff --git a/docker/crupest-blog/daemon.bash b/docker/crupest-blog/daemon.bash index 13966aa..f6655dc 100755 --- a/docker/crupest-blog/daemon.bash +++ b/docker/crupest-blog/daemon.bash @@ -8,8 +8,10 @@ if [[ $EUID -ne 0 ]]; then exit 1 fi +hugo --version + while true; do - /update.bash + /scripts/update.bash # sleep for CRUPEST_AUTO_BACKUP_INTERVAL echo "Sleep for $CRUPEST_BLOG_UPDATE_INTERVAL for next build..." |