test13
Some checks failed
Build Docker / deploy (push) Successful in 51s
Build Docker / build (push) Failing after 28s

This commit is contained in:
2026-03-06 21:30:37 +03:00
parent 289ec8b067
commit 28fe9c29df
3 changed files with 14 additions and 6 deletions

View File

@@ -46,6 +46,9 @@ jobs:
- name: Start docker-compose of project - name: Start docker-compose of project
run: docker compose --env-file .env -f docker/docker-compose.yaml up -d run: docker compose --env-file .env -f docker/docker-compose.yaml up -d
- name: Build image caddy
run: docker build -t caddy:wedding -f docker/caddy/dockerfile .
- name: Start docker-compose caddy - name: Start docker-compose caddy
run: docker compose -f docker/caddy/caddy.yaml up -d run: docker compose -f docker/caddy/caddy.yaml up -d

View File

@@ -1,6 +1,6 @@
services: services:
caddy: caddy:
image: caddy:latest image: caddy:wedding
restart: unless-stopped restart: unless-stopped
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
@@ -8,17 +8,19 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
- "443:443/udp" - "443:443/udp"
# volumes: volumes:
# - ./conf:/etc/caddy - caddy_data/conf:/etc/caddy
# - ./../../server/frontend:/srv - caddy_site/../../server/frontend:/srv
# - caddy_data:/data - caddy_data:/data
# - caddy_config:/config - caddy_config:/config
networks: networks:
- docker_wedding-site-network - docker_wedding-site-network
volumes: volumes:
caddy_data: caddy_data:
caddy_config: caddy_config:
caddy_site:
caddy_caddyfile:
networks: networks:
docker_wedding-site-network : docker_wedding-site-network :
external: true external: true

3
docker/caddy/dockerfile Normal file
View File

@@ -0,0 +1,3 @@
FROM caddy:latest
COPY conf/Caddyfile /etc/caddy/Caddyfile
COPY ./../../server/frontend /srv