Skip to content

Commit

Permalink
chore: shuffle database around compose files
Browse files Browse the repository at this point in the history
  • Loading branch information
Justintime50 committed Nov 20, 2024
1 parent 8b980b5 commit 86c09d0
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 34 deletions.
6 changes: 0 additions & 6 deletions .env-example

This file was deleted.

16 changes: 1 addition & 15 deletions docker-compose-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,13 @@ services:
PROD: true
ports:
- 8140:80
mem_limit: '512m'
mem_limit: '1024m'
healthcheck:
test: ['CMD', 'curl', '--silent', '--output', '/dev/null', '--show-error', '--fail', 'http://localhost/up']
start_period: 10s
start_interval: 1s
interval: 30s
timeout: 10s
retries: 3
depends_on:
glass-db:
condition: service_healthy
volumes:
- ./src/storage/app/public:/var/www/html/public/storage
glass-db:
mem_limit: '768m'
healthcheck:
test:
['CMD', 'mariadb', '-u${MARIADB_USER}', '-p${MARIADB_PASSWORD}', '-D${MARIADB_DATABASE}', '-e', 'show tables;']
# Need to account for upgrade times at startup
start_period: 30s
start_interval: 1s
interval: 30s
timeout: 10s
retries: 3
17 changes: 17 additions & 0 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,23 @@ services:
condition: service_started
volumes:
- ./src:/var/www/html
glass-db:
image: 'mariadb:11.4.3'
restart: always
volumes:
- glass-db:/var/lib/mysql
environment:
MARIADB_DATABASE: glass
MARIADB_ROOT_PASSWORD: password
MARIADB_USER: glass
MARIADB_PASSWORD: password
MARIADB_AUTO_UPGRADE: 1
networks:
- glass

volumes:
glass-db:
name: glass-db

networks:
traefik:
Expand Down
13 changes: 0 additions & 13 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,6 @@ services:
- glass
env_file:
- src/.env
glass-db:
image: 'mariadb:11.4.3'
restart: always
volumes:
- database-data:/var/lib/mysql
env_file:
- .env
networks:
- glass

volumes:
database-data:
driver: local

networks:
glass:
Expand Down

0 comments on commit 86c09d0

Please sign in to comment.