diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 1526cbe..f418e40 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -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: \ No newline at end of file + data: \ No newline at end of file