mirror of
https://github.com/allthingslinux/tux.git
synced 2024-10-02 16:43:12 +00:00
refactor(docker-compose.dev.yml): rename container names to follow naming convention
fix(docker-compose.dev.yml): change .env.dev to .env for environment file path to match production environment refactor(docker-compose.dev.yml): rename volume from tux_data to data for consistency feat(docker-compose.dev.yml): use environment variables for adminer default settings for better security and configurability
This commit is contained in:
parent
e628a7672f
commit
5e912bdb6f
1 changed files with 11 additions and 14 deletions
|
@ -4,10 +4,8 @@ services:
|
|||
|
||||
bot:
|
||||
build: .
|
||||
container_name: tux-bot
|
||||
container_name: tux_bot
|
||||
restart: always
|
||||
environment:
|
||||
- TUX_ENV=dev
|
||||
develop:
|
||||
watch:
|
||||
- action: sync
|
||||
|
@ -21,7 +19,7 @@ services:
|
|||
- action: rebuild
|
||||
path: poetry.lock
|
||||
env_file:
|
||||
- path: .env.dev
|
||||
- path: .env
|
||||
required: true
|
||||
depends_on:
|
||||
db:
|
||||
|
@ -30,14 +28,14 @@ services:
|
|||
|
||||
db:
|
||||
image: postgres
|
||||
container_name: tux-db
|
||||
container_name: tux_db
|
||||
restart: always
|
||||
shm_size: 128mb
|
||||
env_file:
|
||||
- path: .env.dev
|
||||
- path: .env
|
||||
required: true
|
||||
volumes:
|
||||
- tux_data:/var/lib/postgresql/data
|
||||
- data:/var/lib/postgresql/data
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U postgres"]
|
||||
interval: 5s
|
||||
|
@ -46,20 +44,19 @@ services:
|
|||
|
||||
adminer:
|
||||
image: adminer
|
||||
container_name: tux-adminer
|
||||
container_name: tux_adminer
|
||||
restart: always
|
||||
ports:
|
||||
- 8080:8080
|
||||
env_file:
|
||||
- path: .env.dev
|
||||
- path: .env
|
||||
required: true
|
||||
environment:
|
||||
ADMINER_DEFAULT_DRIVER: "pgsql"
|
||||
ADMINER_DEFAULT_SERVER: "db"
|
||||
ADMINER_DEFAULT_DB: postgres
|
||||
ADMINER_DEFAULT_USERNAME: postgres
|
||||
ADMINER_DEFAULT_PASSWORD: tux
|
||||
ADMINER_DESIGN: "hydra"
|
||||
ADMINER_DEFAULT_DB: ${POSTGRES_DB}
|
||||
ADMINER_DEFAULT_USERNAME: ${POSTGRES_USER}
|
||||
ADMINER_DEFAULT_PASSWORD: ${POSTGRES_PASSWORD}
|
||||
command: ["sh", "-c", "php -S 0.0.0.0:8080 -t /var/www/html"]
|
||||
configs:
|
||||
- source: adminer-index.php
|
||||
|
@ -87,4 +84,4 @@ configs:
|
|||
?>
|
||||
|
||||
volumes:
|
||||
tux_data:
|
||||
data:
|
Loading…
Reference in a new issue