From e1d1f178947d648db45a980d479338b2bad6ca49 Mon Sep 17 00:00:00 2001 From: Jannik Kramer Date: Wed, 20 Aug 2025 10:45:49 +0200 Subject: [PATCH] renames caddy folder, fixes readme command, lints docker compose files --- README.md | 2 +- .../{reverse-proxy => caddy}/Caddyfile | 0 .../{reverse-proxy => caddy}/compose.yaml | 13 +++++++------ docker_compose_applications/metabase/compose.yaml | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) rename docker_compose_applications/{reverse-proxy => caddy}/Caddyfile (100%) rename docker_compose_applications/{reverse-proxy => caddy}/compose.yaml (62%) diff --git a/README.md b/README.md index 354bba5..20ff512 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ ``` 3. Add the VM to the desired groups and set the desired variables. Do all the work you need to do (like creating new Ansible roles etc.). -4. Run `ansible-playbook -i inventories/hetzner playbooks/deploy.yaml` +4. Run `ansible-playbook -i inventories/hetzner playbooks/docker-compose.yaml` ## Open Source Software Used diff --git a/docker_compose_applications/reverse-proxy/Caddyfile b/docker_compose_applications/caddy/Caddyfile similarity index 100% rename from docker_compose_applications/reverse-proxy/Caddyfile rename to docker_compose_applications/caddy/Caddyfile diff --git a/docker_compose_applications/reverse-proxy/compose.yaml b/docker_compose_applications/caddy/compose.yaml similarity index 62% rename from docker_compose_applications/reverse-proxy/compose.yaml rename to docker_compose_applications/caddy/compose.yaml index 8bbfcbc..c51e87f 100644 --- a/docker_compose_applications/reverse-proxy/compose.yaml +++ b/docker_compose_applications/caddy/compose.yaml @@ -3,18 +3,19 @@ # - https://caddyserver.com/docs/ services: + caddy: image: caddy container_name: caddy - restart: unless-stopped - ports: - - "80:80" - - "443:443" volumes: - - "./Caddyfile:/etc/caddy/Caddyfile:ro" - - "/ansible_docker_compose/project_data/reverse-proxy/caddy/data:/data" + - ./Caddyfile:/etc/caddy/Caddyfile:ro + - /ansible_docker_compose/project_data/reverse-proxy/caddy/data:/data + ports: + - '0.0.0.0:80:80' + - '0.0.0.0:443:443' networks: - caddy_net + restart: unless-stopped networks: caddy_net: diff --git a/docker_compose_applications/metabase/compose.yaml b/docker_compose_applications/metabase/compose.yaml index ee41df0..67a195b 100644 --- a/docker_compose_applications/metabase/compose.yaml +++ b/docker_compose_applications/metabase/compose.yaml @@ -2,6 +2,7 @@ # - https://www.metabase.com/docs/latest/operations-guide/running-metabase-on-docker.html services: + metabase: image: metabase/metabase:latest container_name: metabase