aboutsummaryrefslogtreecommitdiff
path: root/services/docker
diff options
context:
space:
mode:
authorYuqian Yang <crupest@crupest.life>2025-03-03 16:58:21 +0800
committerYuqian Yang <crupest@crupest.life>2025-03-03 16:58:21 +0800
commitcfa5ea2f4a8fd79136cfe95ad1fdfe88d52eece8 (patch)
treec19d51134b8fed16ee10f8097a8e105462b75833 /services/docker
parent69c050e349956f4c982f7e73a09f9a0882f1973f (diff)
downloadcrupest-cfa5ea2f4a8fd79136cfe95ad1fdfe88d52eece8.tar.gz
crupest-cfa5ea2f4a8fd79136cfe95ad1fdfe88d52eece8.tar.bz2
crupest-cfa5ea2f4a8fd79136cfe95ad1fdfe88d52eece8.zip
feat(www): update page and use hugo image.
Diffstat (limited to 'services/docker')
-rw-r--r--services/docker/nginx/Dockerfile11
-rwxr-xr-xservices/docker/nginx/build-www.bash8
-rwxr-xr-xservices/docker/nginx/install-hugo.bash15
3 files changed, 4 insertions, 30 deletions
diff --git a/services/docker/nginx/Dockerfile b/services/docker/nginx/Dockerfile
index dfaa4a4..9f5b7fe 100644
--- a/services/docker/nginx/Dockerfile
+++ b/services/docker/nginx/Dockerfile
@@ -1,12 +1,9 @@
-FROM debian AS build-www
-ADD install-hugo.bash build-www.bash /app/
-COPY --from=www . /app/src/
-WORKDIR /app
-RUN /app/install-hugo.bash
-RUN /app/build-www.bash
+FROM ghcr.io/gohugoio/hugo AS build-www
+COPY --from=www . /project/
+RUN ls && hugo
FROM nginx:mainline
-COPY --from=build-www /app/src/public /srv/www
+COPY --from=build-www /project/public /srv/www
RUN apt update && apt-get install -y tini certbot && rm -rf /var/lib/apt/lists/*
ADD mail-robots.txt /srv/mail/robots.txt
ADD certbot.bash nginx-wrapper.bash /app/
diff --git a/services/docker/nginx/build-www.bash b/services/docker/nginx/build-www.bash
deleted file mode 100755
index 498f8b8..0000000
--- a/services/docker/nginx/build-www.bash
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /usr/bin/env bash
-
-set -e
-
-cd /app/src/
-ls -l .
-[[ ! -d public ]] || rm -rf public
-hugo
diff --git a/services/docker/nginx/install-hugo.bash b/services/docker/nginx/install-hugo.bash
deleted file mode 100755
index dcf6800..0000000
--- a/services/docker/nginx/install-hugo.bash
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /usr/bin/env bash
-
-set -e
-
-apt-get update
-apt-get install -y locales curl
-localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
-
-VERSION=$(curl -s https://api.github.com/repos/gohugoio/hugo/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
-echo "The latest version of hugo is $VERSION."
-url="https://github.com/gohugoio/hugo/releases/download/v${VERSION}/hugo_extended_${VERSION}_linux-amd64.deb"
-curl -fOL "$url"
-dpkg -i "hugo_extended_${VERSION}_linux-amd64.deb"
-rm "hugo_extended_${VERSION}_linux-amd64.deb"
-hugo version