diff --git a/.env b/.env index 6cd42d1..83b8652 100644 --- a/.env +++ b/.env @@ -42,10 +42,6 @@ MEALIE_EXTERNAL_PORT=9925 MEALIE_INTERNAL_PORT=80 TRILIUM_EXTERNAL_PORT=8080 TRILIUM_INTERNAL_PORT=8080 -SNIBOX_POSTGRES_DB_NAME=snibox -SNIBOX_EXTERNAL_PORT=3003 -SNIBOX_INTERNAL_PORT=80 -SNIBOX_CADDY_INTERNAL_PORT=3003 NETBOOTXYZ_INTERNAL_PORT=3001 GITEA_INTERNAL_PORT=3002 UPTIME_KUMA_EXTERNAL_PORT=3004 diff --git a/docker-compose.yml b/docker-compose.yml index a7f09f6..148cb97 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,13 +34,11 @@ services: ports: - "${TIMETRACKER_EXTERNAL_PORT}:${TIMETRACKER_INTERNAL_PORT}" - "${DENDRON_NOTES_EXTERNAL_PORT}:${DENDRON_NOTES_INTERNAL_PORT}" - - "${SNIBOX_EXTERNAL_PORT}:${SNIBOX_CADDY_INTERNAL_PORT}" user: ${PUID} volumes: - "${DOCKER_STORAGE_PATH}/caddy/config:/etc/caddy/" - "/www/notes:/srv/notes" - "timetracker-static:/srv/timetracker" - - "snibox-static:/srv/snibox" networks: - public - caddy @@ -343,51 +341,6 @@ services: - disabled restart: unless-stopped - snibox_frontend: - image: snibox/nginx-puma:1.15.9 - container_name: snibox_frontend - ports: - - "${SNIBOX_EXTERNAL_PORT}:${SNIBOX_INTERNAL_PORT}" - volumes: - - snibox-static:/var/www/html - networks: - - public - # served by caddy - # - snibox - profiles: - # static files are served by caddy - - disabled - # depends_on: - # - snibox_backend - - snibox_backend: - image: snibox/snibox:latest - container_name: snibox_backend - command: sh -c "rm -rf tmp/pids && ./bin/rails s -p 3000 -b '0.0.0.0'" - env_file: - - snibox.env - environment: - DB_NAME: "${SNIBOX_POSTGRES_DB_NAME}" - DB_USER: "${POSTGRES_USER}" - DB_PASS: "${POSTGRES_PASSWORD}" - DB_HOST: "${POSTGRES_HOST}" - DB_PORT: "${POSTGRES_PORT}" - # MAILGUN_SMTP_PORT: "${MAILGUN_SMTP_PORT}" - # MAILGUN_SMTP_SERVER: "${MAILGUN_SMTP_SERVER}" - # MAILGUN_SMTP_LOGIN: "${MAILGUN_SMTP_LOGIN}" - # MAILGUN_SMTP_PASSWORD: "${MAILGUN_SMTP_PASSWORD}" - # MAILGUN_API_KEY: "${MAILGUN_API_KEY}" - # MAILGUN_DOMAIN: "${MAILGUN_DOMAIN}" - # MAILGUN_PUBLIC_KEY: "${MAILGUN_PUBLIC_KEY}" - volumes: - - snibox-static:/app/public - networks: - - caddy - - postgres - # served by caddy - # - snibox - restart: unless-stopped - loki: image: grafana/loki:2.6.1 container_name: loki @@ -795,5 +748,4 @@ networks: attachable: true volumes: - timetracker-static: - snibox-static: + timetracker-static: \ No newline at end of file