aboutsummaryrefslogtreecommitdiff
path: root/services/docker
diff options
context:
space:
mode:
Diffstat (limited to 'services/docker')
-rw-r--r--services/docker/gateway/Dockerfile16
-rw-r--r--services/docker/gateway/mail-robots.txt (renamed from services/docker/nginx/mail-robots.txt)0
-rw-r--r--services/docker/nginx/Dockerfile10
-rwxr-xr-xservices/docker/nginx/certbot.bash12
-rwxr-xr-xservices/docker/nginx/nginx-wrapper.bash12
5 files changed, 16 insertions, 34 deletions
diff --git a/services/docker/gateway/Dockerfile b/services/docker/gateway/Dockerfile
new file mode 100644
index 0000000..68ec5ca
--- /dev/null
+++ b/services/docker/gateway/Dockerfile
@@ -0,0 +1,16 @@
+FROM ghcr.io/gohugoio/hugo AS build-www
+COPY --from=www . /project/
+RUN ls && hugo
+
+FROM denoland/deno AS deno-build
+COPY --from=deno . /workdir/
+WORKDIR /workdir
+RUN deno install
+RUN deno task compile:gateway
+
+FROM debian
+RUN apt update && apt-get install -y tini certbot && rm -rf /var/lib/apt/lists/*
+ADD mail-robots.txt /srv/mail/robots.txt
+COPY --from=build-www /project/public /srv/www
+COPY --from=deno-build /workdir/gateway/out/crupest-gateway /app/
+CMD ["/usr/bin/tini", "--", "/app/crupest-gateway"]
diff --git a/services/docker/nginx/mail-robots.txt b/services/docker/gateway/mail-robots.txt
index 1f53798..1f53798 100644
--- a/services/docker/nginx/mail-robots.txt
+++ b/services/docker/gateway/mail-robots.txt
diff --git a/services/docker/nginx/Dockerfile b/services/docker/nginx/Dockerfile
deleted file mode 100644
index 3169e00..0000000
--- a/services/docker/nginx/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM ghcr.io/gohugoio/hugo AS build-www
-COPY --from=www . /project/
-RUN ls && hugo
-
-FROM nginx:mainline
-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/
-COPY --from=build-www /project/public /srv/www
-CMD ["/usr/bin/tini", "--", "/app/nginx-wrapper.bash"]
diff --git a/services/docker/nginx/certbot.bash b/services/docker/nginx/certbot.bash
deleted file mode 100755
index cb5c636..0000000
--- a/services/docker/nginx/certbot.bash
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/bash
-
-set -e
-
-echo "Sleep 5 seconds waiting for nginx to start."
-sleep 5s
-
-while true; do
- certbot renew --webroot -w /var/www/certbot --deploy-hook "nginx -s reload"
- echo "Sleep one day before next certbot renew."
- sleep 1d
-done
diff --git a/services/docker/nginx/nginx-wrapper.bash b/services/docker/nginx/nginx-wrapper.bash
deleted file mode 100755
index a4a19ec..0000000
--- a/services/docker/nginx/nginx-wrapper.bash
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/bash
-
-set -e -o pipefail
-
-die() {
- echo "$@" >&2
- exit 1
-}
-
-/app/certbot.bash &
-
-/docker-entrypoint.sh nginx "-g" "daemon off;"