diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..2688cab --- /dev/null +++ b/.dockerignore @@ -0,0 +1,12 @@ +# Exclude data directory to prevent local database from being copied into production images +backend/data/ + +# Exclude logs +backend/logs/ + +# Exclude development files +node_modules/ +.git/ +.gitignore +README.md +*.log diff --git a/deployment/caddy/Dockerfile b/deployment/caddy/Dockerfile index d28722a..a21acd3 100644 --- a/deployment/caddy/Dockerfile +++ b/deployment/caddy/Dockerfile @@ -6,7 +6,6 @@ FROM caddy:2-builder AS builder RUN xcaddy build \ --with github.com/mholt/caddy-ratelimit -RUN curl -o /etc/ssl/cloudflare-origin.crt https://developers.cloudflare.com/ssl/static/origin_ca_rsa_root.pem FROM caddy:2 diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml index 9c145aa..948e241 100644 --- a/deployment/docker-compose.yml +++ b/deployment/docker-compose.yml @@ -1,6 +1,6 @@ services: backend: - build: + build: dockerfile: deployment/Dockerfile.backend context: .. environment: @@ -22,7 +22,7 @@ services: path: ../backend/requirements.txt frontend: - build: + build: dockerfile: deployment/frontend/Dockerfile context: .. environment: @@ -47,7 +47,6 @@ services: context: ./caddy dockerfile: Dockerfile restart: unless-stopped - profiles: ["prod"] ports: - "80:80" - "443:443" @@ -63,4 +62,6 @@ volumes: data: name: fromchat-data logs: - name: fromchat-logs \ No newline at end of file + name: fromchat-logs + certs: + name: fromchat-certs \ No newline at end of file diff --git a/deployment/fromchat.service b/deployment/fromchat.service index 77fd4d3..7524770 100644 --- a/deployment/fromchat.service +++ b/deployment/fromchat.service @@ -10,7 +10,7 @@ StartLimitBurst=3 Type=simple User=root Group=root -ExecStart=/bin/docker compose up --profile prod +ExecStart=/bin/docker compose up ExecStop=/bin/docker compose down WorkingDirectory=/home/denis0001-dev/actions-runner/_work/FromChat/FromChat/deployment Restart=always