diff --git a/.gitignore b/.gitignore index 9f8f2d8..44ab16d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/data/ +/git/ + # ------------------------- # SSH private keys # ------------------------- diff --git a/Caddyfile b/Caddyfile deleted file mode 100644 index 1896cc4..0000000 --- a/Caddyfile +++ /dev/null @@ -1,15 +0,0 @@ -{ - email {$ACME_EMAIL} -} - -git.tvheggland.no { - rate_limit { - zone git_zone { - key {remote_host} - events 30 - window 10s - } - } - - reverse_proxy gitea:3000 -} diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 468e0e8..0000000 --- a/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM caddy:2-builder AS builder - -RUN --mount=type=cache,target=/go/pkg/mod \ - --mount=type=cache,target=/root/.cache/go-build \ - xcaddy build \ - --with github.com/mholt/caddy-ratelimit - -FROM caddy:2 - -COPY --from=builder /usr/bin/caddy /usr/bin/caddy diff --git a/docker-compose.yaml b/docker-compose.yaml index 2579cf7..525f8bd 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -18,43 +18,17 @@ services: GITEA__repository__ENABLE_PUSH_CREATE_USER: "${GITEA_ENABLE_PUSH_CREATE_USER}" GITEA__repository__ENABLE_PUSH_CREATE_ORG: "${GITEA_ENABLE_PUSH_CREATE_ORG}" volumes: - - ../data:/data - - ../git:/git + - ./data:/data + - ./git:/git - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: - - "3000:3000" +# - "3000:3000" - "2222:22" networks: - - gitea_net - - - caddy: - build: . - container_name: caddy - restart: unless-stopped - depends_on: - - gitea - ports: - - "80:80" - - "443:443" - env_file: - - .env - volumes: - - ./Caddyfile:/etc/caddy/Caddyfile:ro - - caddy_data:/data - - caddy_config:/config - networks: - - gitea_net - - + - caddy_net networks: - gitea_net: - driver: bridge + caddy_net: + external: true - - -volumes: - caddy_data: - caddy_config: