diff --git a/solidtime/docker-compose.yml b/solidtime/docker-compose.yml index 151b0df..bee107f 100644 --- a/solidtime/docker-compose.yml +++ b/solidtime/docker-compose.yml @@ -5,41 +5,41 @@ services: restart: always labels: - "traefik.enable=true" - - "traefik.docker.network=traefik" - "traefik.http.routers.solidtime.entrypoints=http" - - "traefik.http.routers.solidtime.rule=Host(`${SOLIDTIME_DOMAIN:?error}`)" + - "traefik.http.routers.solidtime.rule=Host(`${SOLIDTIME_DOMAIN}`)" - "traefik.http.middlewares.solidtime-https-redirect.redirectscheme.scheme=https" - "traefik.http.routers.solidtime.middlewares=solidtime-https-redirect" - "traefik.http.routers.solidtime-secure.entrypoints=https" - - "traefik.http.routers.solidtime-secure.rule=Host(`${SOLIDTIME_DOMAIN:?error}`)" + - "traefik.http.routers.solidtime-secure.rule=Host(`${SOLIDTIME_DOMAIN}`)" - "traefik.http.routers.solidtime-secure.tls=true" - - "traefik.http.routers.solidtime-secure.service=solidtime" - "traefik.http.services.solidtime.loadbalancer.server.port=8000" + - "traefik.docker.network=internal" networks: - - traefik + - internal - solidtime volumes: - "app-storage:/var/www/html/storage" - - "./data/logs:/var/www/html/storage/logs" - - "./data/app-storage:/var/www/html/storage/app" + - "logs:/var/www/html/storage/logs" environment: CONTAINER_MODE: http + AUTO_DB_MIGRATE: true healthcheck: test: [ "CMD-SHELL", "curl --fail http://localhost:8000/health-check/up || exit 1" ] env_file: - laravel.env + - .env depends_on: - database scheduler: image: "solidtime/solidtime:${SOLIDTIME_VERSION:-latest}" + container_name: solidtime-scheduler restart: always networks: - solidtime volumes: - "app-storage:/var/www/html/storage" - - "./data/logs:/var/www/html/storage/logs" - - "./data/app-storage:/var/www/html/storage/app" + - "logs:/var/www/html/storage/logs" environment: CONTAINER_MODE: scheduler healthcheck: @@ -52,12 +52,12 @@ services: queue: restart: always image: "solidtime/solidtime:${SOLIDTIME_VERSION:-latest}" + container_name: solidtime-queue networks: - solidtime volumes: - "app-storage:/var/www/html/storage" - - "./data/logs:/var/www/html/storage/logs" - - "./data/app-storage:/var/www/html/storage/app" + - "logs:/var/www/html/storage/logs" environment: CONTAINER_MODE: worker WORKER_COMMAND: "php /var/www/html/artisan queue:work" @@ -71,6 +71,7 @@ services: database: restart: always image: 'postgres:${SOLIDTIME_POSTGRES_VERSION:-16}' + container_name: solidtime-db environment: PGPASSWORD: '${SOLIDTIME_POSTGRES_PASSWORD:?error}' POSTGRES_DB: '${SOLIDTIME_POSTGRES_DATABASE:?error}' @@ -94,16 +95,19 @@ services: gotenberg: image: gotenberg/gotenberg:8 + container_name: solidtime-gotenberg networks: - solidtime healthcheck: test: [ "CMD", "curl", "--silent", "--fail", "http://localhost:3000/health" ] networks: - traefik: + internal: external: true solidtime: + driver: bridge volumes: database-storage: - app-storage: \ No newline at end of file + app-storage: + logs: \ No newline at end of file