Skip to content

Commit

Permalink
chore: prep for swarm
Browse files Browse the repository at this point in the history
  • Loading branch information
Justintime50 committed Nov 5, 2024
1 parent a3e9bed commit 60446fa
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ jobs:
webhook_type: 'json-extended'
webhook_url: ${{ secrets.WEBHOOK_URL }}
webhook_secret: ${{ secrets.WEBHOOK_SECRET }}
data: '{ "deployment_type": "deploy", "prod_compose": true, "healthcheck": ["glass-glass-1", "glass-glass-2", "glass-glass-db-1"] }'
data: '{ "deployment_type": "deploy", "prod_compose": true, "healthcheck": ["glass-glass-1", "glass-glass-db-1"] }'
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM justintime50/nginx-php:8.3-19
FROM justintime50/nginx-php:8.3-20

ARG PROD

Expand Down
5 changes: 2 additions & 3 deletions docker-compose-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ services:
build:
args:
PROD: true
deploy:
replicas: 2
ports:
- 8140:80
mem_limit: '512m'
healthcheck:
test: ['CMD', 'curl', '--silent', '--output', '/dev/null', '--show-error', '--fail', 'http://localhost/up']
Expand All @@ -17,7 +17,6 @@ services:
glass-db:
condition: service_healthy
volumes:
- ./src/storage/logs:/var/www/html/storage/logs
- ./src/storage/app/public:/var/www/html/public/storage
glass-db:
mem_limit: '768m'
Expand Down
7 changes: 7 additions & 0 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@ services:
labels:
- 'traefik.enable=true'
- 'traefik.http.routers.glass.rule=Host(`glass.localhost`)'
networks:
- traefik
depends_on:
glass-db:
condition: service_started
volumes:
- ./src:/var/www/html

networks:
traefik:
name: traefik
external: true
4 changes: 0 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ services:
# image: justintime50/glass
restart: always
networks:
- traefik
- glass
env_file:
- src/.env
Expand All @@ -23,8 +22,5 @@ volumes:
driver: local

networks:
traefik:
name: traefik
external: true
glass:
name: glass
6 changes: 3 additions & 3 deletions src/.env-example
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ APP_MAINTENANCE_STORE=database

BCRYPT_ROUNDS=12

LOG_CHANNEL=daily
LOG_CHANNEL=stderr
LOG_STACK=single
LOG_DEPRECATIONS_CHANNEL=null
LOG_LEVEL=debug
Expand All @@ -26,15 +26,15 @@ DB_DATABASE=glass
DB_USERNAME=glass
DB_PASSWORD=password

SESSION_DRIVER=database
SESSION_DRIVER=array
SESSION_LIFETIME=120
SESSION_ENCRYPT=false
SESSION_PATH=/
SESSION_DOMAIN=null

BROADCAST_CONNECTION=log
FILESYSTEM_DISK=local
QUEUE_CONNECTION=database
QUEUE_CONNECTION=null

CACHE_STORE=null
CACHE_PREFIX=
Expand Down

0 comments on commit 60446fa

Please sign in to comment.