diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 2c8976e..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "themes/after-dark"] - path = themes/after-dark - url = https://git.habd.as/comfusion/after-dark.git diff --git a/Caddyfile b/Caddyfile new file mode 100644 index 0000000..43b3438 --- /dev/null +++ b/Caddyfile @@ -0,0 +1,6 @@ +:80 + +root * /data +file_server { + precompressed gzip +} diff --git a/Dockerfile b/Dockerfile index e01b642..07f5f4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM klakegg/hugo:0.56.3-alpine as build +FROM klakegg/hugo:alpine as build +# FROM klakegg/hugo:0.56.3-alpine as build WORKDIR /usr/src/build COPY ./ ./ RUN apk --no-cache add --update make @@ -20,8 +21,10 @@ RUN hugo && \ # Stage: Run -FROM nginx:alpine -RUN rm /usr/share/nginx/html/* -COPY --from=build /usr/src/build/public /usr/share/nginx/html/ -COPY ./.well-known/ /usr/share/nginx/html/.well-known +FROM caddy +# FROM nginx:alpine +# RUN rm /usr/share/nginx/html/* +COPY Caddyfile /etc/caddy/Caddyfile +COPY ./.well-known/ /data/.well-known +COPY --from=build /usr/src/build/public /data EXPOSE 80 diff --git a/layouts/archive/single.html b/layouts/archive/single.html index 046ac2f..82171a1 100644 --- a/layouts/archive/single.html +++ b/layouts/archive/single.html @@ -14,7 +14,7 @@ {{ range .Pages }}
  • {{ .Date.Format "02 Jan" }} - {{ .Title | markdownify }} + {{ .Title | markdownify }}
  • {{ end }} diff --git a/themes/after-dark b/themes/after-dark index 93f4dea..d20464c 160000 --- a/themes/after-dark +++ b/themes/after-dark @@ -1 +1 @@ -Subproject commit 93f4deab3ab201856577ed2cc95cd6eb98e42ba2 +Subproject commit d20464c5c8ee00297f46ab729bfca4a12aaf4ba3