diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index f9ca4d3..e53efa1 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -24,10 +24,7 @@ jobs: ref: main path: tmp-repo sparse-checkout: | - ansible/deploy.yml - ansible/inventory.ini - ansible/secrets.yml - + ansible/ - name: Run Ansible playbook run: ansible-playbook -i inventory.ini tmp-repo/ansible/deploy.yml -e @secrets.yml -e env_file="$(pwd)/.env" env: @@ -46,6 +43,25 @@ jobs: - name: Build image run: docker build -t back:latest -f docker/dockerfile . - - name: Start docker-compose + - name: Start docker-compose of project run: docker compose --env-file .env -f docker/docker-compose.yaml up -d + + - name: Checkout only caddy.yml + uses: actions/checkout@v4 + with: + repository: MH.Dmitrii/wedding-site + ref: main + path: caddy + sparse-checkout: | + docker/caddy/ + - name: Checkout web-site + uses: actions/checkout@v4 + with: + repository: MH.Dmitrii/wedding-site + ref: main + path: caddy/site + sparse-checkout: | + server/frontend + - name: Start docker-compose caddy + run: docker compose -f caddy/caddy.yaml up -d \ No newline at end of file diff --git a/docker/caddy/caddy.yaml b/docker/caddy/caddy.yaml index ebed74d..7dfe8df 100644 --- a/docker/caddy/caddy.yaml +++ b/docker/caddy/caddy.yaml @@ -13,7 +13,12 @@ services: - $PWD/site:/srv - caddy_data:/data - caddy_config:/config + networks: + - wedding-site-network volumes: caddy_data: caddy_config: +networks: + wedding-site-network: + external: true \ No newline at end of file diff --git a/docker/caddy/caddy.conf b/docker/caddy/conf/caddy.conf similarity index 84% rename from docker/caddy/caddy.conf rename to docker/caddy/conf/caddy.conf index 98cb047..39efbb8 100644 --- a/docker/caddy/caddy.conf +++ b/docker/caddy/conf/caddy.conf @@ -1,4 +1,4 @@ -example.com { +ru.homyk.space { encode gzip @@ -8,7 +8,7 @@ example.com { } # --- Frontend --- - root * /var/www/site + root * /srv file_server log { diff --git a/server/frontend/index.html b/server/frontend/index.html index e69de29..30d74d2 100644 --- a/server/frontend/index.html +++ b/server/frontend/index.html @@ -0,0 +1 @@ +test \ No newline at end of file