diff --git a/docker-compose.dokploy.yml b/docker-compose.dokploy.yml index f02931a..4df1ca3 100644 --- a/docker-compose.dokploy.yml +++ b/docker-compose.dokploy.yml @@ -65,10 +65,8 @@ services: - app-code:/var/www/html - app-storage:/var/www/html/storage - app-bootstrap-cache:/var/www/html/bootstrap/cache - - photobooth-import:/var/www/html/storage/app/photobooth networks: - default - - photobooth-network depends_on: mysql: condition: service_healthy @@ -150,18 +148,6 @@ services: condition: service_completed_successfully app: condition: service_healthy - labels: - - traefik.enable=true - - traefik.http.middlewares.fotospiel-https-redirect.redirectscheme.scheme=https - - traefik.http.routers.fotospiel-http.rule=Host(`test-y0k0.fotospiel.app`) - - traefik.http.routers.fotospiel-http.entrypoints=web - - traefik.http.routers.fotospiel-http.middlewares=fotospiel-https-redirect - - traefik.http.routers.fotospiel-https.rule=Host(`test-y0k0.fotospiel.app`) - - traefik.http.routers.fotospiel-https.entrypoints=websecure - - traefik.http.routers.fotospiel-https.tls=true - - traefik.http.routers.fotospiel-https.service=fotospiel-web - - traefik.http.services.fotospiel-web.loadbalancer.server.port=80 - - traefik.docker.network=dokploy-network volumes: - app-code:/var/www/html:ro - app-storage:/var/www/html/storage:ro @@ -174,41 +160,6 @@ services: - dokploy-network restart: unless-stopped - photobooth-ftp: - build: - context: ./docker/photobooth-control - image: ${PHOTOBOOTH_CONTROL_IMAGE_REPO:-fotospiel-photobooth-control}:${PHOTOBOOTH_CONTROL_IMAGE_TAG:-latest} - env_file: - - path: .env - environment: - CONTROL_TOKEN: ${PHOTOBOOTH_CONTROL_TOKEN} - FTP_PUBLIC_HOST: ${PHOTOBOOTH_FTP_ADDRESS:-test-y0k0.fotospiel.app} - FTP_PORT: ${PHOTOBOOTH_FTP_PORT:-2121} - FTP_PASSIVE_MIN: ${PHOTOBOOTH_FTP_PASV_MIN_PORT:-30000} - FTP_PASSIVE_MAX: ${PHOTOBOOTH_FTP_PASV_MAX_PORT:-30009} - REQUIRE_FTPS: ${PHOTOBOOTH_REQUIRE_FTPS:-0} - PHOTOBOOTH_ROOT: /photobooth - FTP_SYSTEM_USER: ${PHOTOBOOTH_FTP_USER:-ftpuser} - FTP_SYSTEM_GROUP: ${PHOTOBOOTH_FTP_GROUP:-ftpgroup} - FTP_MAX_CLIENTS: ${PHOTOBOOTH_FTP_MAX_CLIENTS:-50} - FTP_MAX_PER_IP: ${PHOTOBOOTH_FTP_MAX_PER_IP:-10} - volumes: - - photobooth-import:/photobooth - - photobooth-ftp-auth:/etc/pure-ftpd - ports: - - "${PHOTOBOOTH_FTP_PORT:-2121}:21" - - "${PHOTOBOOTH_FTP_PASV_MIN_PORT:-30000}-${PHOTOBOOTH_FTP_PASV_MAX_PORT:-30009}:${PHOTOBOOTH_FTP_PASV_MIN_PORT:-30000}-${PHOTOBOOTH_FTP_PASV_MAX_PORT:-30009}" - networks: - - dokploy-network - - photobooth-network - healthcheck: - test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:8080/health >/dev/null 2>&1 && nc -z localhost 21"] - interval: 30s - timeout: 10s - retries: 5 - start_period: 10s - restart: unless-stopped - queue: image: ${APP_IMAGE_REPO:-fotospiel-app}:${APP_IMAGE_TAG:-latest} env_file: @@ -223,7 +174,6 @@ services: - app-bootstrap-cache:/var/www/html/bootstrap/cache networks: - default - - photobooth-network depends_on: app: condition: service_healthy @@ -247,7 +197,6 @@ services: - app-bootstrap-cache:/var/www/html/bootstrap/cache networks: - default - - photobooth-network depends_on: app: condition: service_healthy @@ -271,7 +220,6 @@ services: - app-bootstrap-cache:/var/www/html/bootstrap/cache networks: - default - - photobooth-network depends_on: app: condition: service_healthy @@ -291,10 +239,8 @@ services: - app-code:/var/www/html - app-storage:/var/www/html/storage - app-bootstrap-cache:/var/www/html/bootstrap/cache - - photobooth-import:/var/www/html/storage/app/photobooth networks: - default - - photobooth-network depends_on: app: condition: service_healthy @@ -314,7 +260,6 @@ services: - app-bootstrap-cache:/var/www/html/bootstrap/cache networks: - default - - photobooth-network depends_on: app: condition: service_healthy @@ -359,13 +304,9 @@ volumes: name: fotospiel-${APP_ENV:-prod}-storage app-bootstrap-cache: nuget-cache: - photobooth-import: - photobooth-ftp-auth: mysql-data: redis-data: networks: dokploy-network: external: true - photobooth-network: - name: fotospiel-${APP_ENV:-prod}-photobooth diff --git a/public/logo_fotospiel.app.png b/public/logo_fotospiel.app.png new file mode 100644 index 0000000..df37a95 Binary files /dev/null and b/public/logo_fotospiel.app.png differ