commit d06af332ac6a65a1bdc87dcc6b5989b63372eb7c
parent 533a0599bca3fa9f7d525ddc334cf5455b4077c7
Author: Damian Myrda <damian@prime8.dev>
Date: Tue, 10 Sep 2024 07:42:58 -0500
Added git
Diffstat:
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,14 @@
-FROM ghcr.io/getzola/zola:v0.19.1 AS builder
-
+FROM ghcr.io/getzola/zola:v0.19.2 AS web
COPY ./web/ /src/
WORKDIR /src/
-
RUN ["zola", "build"]
-FROM caddy:latest
+FROM caddy:builder AS caddy
+RUN xcaddy build \
+ --with github.com/caddyserver/cache-handler
+FROM caddy:latest
+COPY --from=caddy /usr/bin/caddy /usr/bin/caddy
COPY ./caddy /etc/caddy/Caddyfile
-COPY --from=builder /src/public/ /web/
-
+COPY --from=web /src/public/ /web/
EXPOSE 80 443
diff --git a/caddy b/caddy
@@ -1,7 +1,12 @@
+{
+ cache
+}
+
prime8.dev {
root * /web/
file_server
try_files {path} {path}.html
+ cache
handle_errors {
@404 {
@@ -17,3 +22,10 @@ prime8.dev {
mail.prime8.dev {
tls damian@prime8.dev
}
+
+git.prime8.dev {
+ reverse_proxy http://git:80
+ cache
+
+ tls damian@prime8.dev
+}
diff --git a/compose.yml b/compose.yml
@@ -17,7 +17,7 @@ services:
- /var/run/docker.sock:/var/run/docker.sock
command:
- "--interval"
- - "60"
+ - "120"
- "--rolling-restart"
- "--cleanup"
restart: always
@@ -61,5 +61,16 @@ services:
- NET_ADMIN
restart: always
+ git:
+ container_name: git
+ image: woahbase/alpine-cgit:latest
+ expose:
+ - "80"
+ volumes:
+ - ./git/:/srv/git
+ networks:
+ - common
+ restart: always
+
networks:
common:
