diff --git a/docker-compose.yaml b/docker-compose.yaml index 51fb8f6..3c135df 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,12 +5,12 @@ services: restart: always environment: # === Required Settings - MAIN_URL: 'http://localhost:4007' - FRONTEND_URL: 'http://localhost:4007' - NEXT_PUBLIC_BACKEND_URL: 'http://localhost:4007/api' - JWT_SECRET: 'random string that is unique to every install - just type random characters here!' - DATABASE_URL: 'postgresql://postiz-user:postiz-password@postiz-postgres:5432/postiz-db-local' - REDIS_URL: 'redis://postiz-redis:6379' + MAIN_URL: 'https://postiz.internal.vyntehome.com' + FRONTEND_URL: 'https://postiz.internal.vyntehome.com' + NEXT_PUBLIC_BACKEND_URL: 'https://postiz.internal.vyntehome.com/api' + JWT_SECRET: ${JWT_SECRET} + DATABASE_URL: ${DATABASE_URL} + REDIS_URL: ${REDIS_URL} BACKEND_INTERNAL_URL: 'http://localhost:3000' TEMPORAL_ADDRESS: "temporal:7233" IS_GENERAL: 'true' @@ -65,15 +65,15 @@ services: MASTODON_CLIENT_SECRET: '' # === OAuth & Authentik Settings - # NEXT_PUBLIC_POSTIZ_OAUTH_DISPLAY_NAME: 'Authentik' - # NEXT_PUBLIC_POSTIZ_OAUTH_LOGO_URL: 'https://raw.githubusercontent.com/walkxcode/dashboard-icons/master/png/authentik.png' - # POSTIZ_GENERIC_OAUTH: 'false' - # POSTIZ_OAUTH_URL: 'https://auth.example.com' - # POSTIZ_OAUTH_AUTH_URL: 'https://auth.example.com/application/o/authorize' - # POSTIZ_OAUTH_TOKEN_URL: 'https://auth.example.com/application/o/token' - # POSTIZ_OAUTH_USERINFO_URL: 'https://authentik.example.com/application/o/userinfo' - # POSTIZ_OAUTH_CLIENT_ID: '' - # POSTIZ_OAUTH_CLIENT_SECRET: '' + NEXT_PUBLIC_POSTIZ_OAUTH_DISPLAY_NAME: 'Authentik' + NEXT_PUBLIC_POSTIZ_OAUTH_LOGO_URL: 'https://raw.githubusercontent.com/walkxcode/dashboard-icons/master/png/authentik.png' + POSTIZ_GENERIC_OAUTH: 'true' + POSTIZ_OAUTH_URL: 'https://authentik.vyntehome.com' + POSTIZ_OAUTH_AUTH_URL: 'https://authentik.vyntehome.com/application/o/postiz' + POSTIZ_OAUTH_TOKEN_URL: 'https://authentik.vyntehome.com/application/o/token' + POSTIZ_OAUTH_USERINFO_URL: 'https://authentik.vyntehome.com/application/o/userinfo' + POSTIZ_OAUTH_CLIENT_ID: ${POSTIZ_OAUTH_CLIENT_ID} + POSTIZ_OAUTH_CLIENT_SECRET: ${POSTIZ_OAUTH_CLIENT_SECRET} # POSTIZ_OAUTH_SCOPE: "openid profile email" # Optional: uncomment to override default scope # === Sentry @@ -113,7 +113,7 @@ services: - postiz-config:/config/ - postiz-uploads:/uploads/ ports: - - "4007:5000" + - "3020:5000" networks: - postiz-network - temporal-network @@ -124,54 +124,15 @@ services: retries: 5 start_period: 120s depends_on: - postiz-postgres: - condition: service_healthy - postiz-redis: - condition: service_healthy temporal: condition: service_healthy - postiz-postgres: - image: postgres:17-alpine - container_name: postiz-postgres - restart: always - environment: - POSTGRES_PASSWORD: postiz-password - POSTGRES_USER: postiz-user - POSTGRES_DB: postiz-db-local - volumes: - - postgres-volume:/var/lib/postgresql/data - networks: - - postiz-network - healthcheck: - test: ["CMD-SHELL", "pg_isready -U postiz-user -d postiz-db-local"] - interval: 10s - timeout: 5s - retries: 5 - start_period: 10s - postiz-redis: - image: redis:7.2 - container_name: postiz-redis - restart: always - healthcheck: - test: ["CMD-SHELL", "redis-cli ping | grep -q PONG"] - interval: 10s - timeout: 5s - retries: 5 - start_period: 5s - volumes: - - postiz-redis-data:/data - networks: - - postiz-network - # For Application Monitoring / Debugging spotlight: profiles: [debug] pull_policy: always container_name: spotlight restart: unless-stopped - ports: - - 8969:8969/tcp image: ghcr.io/getsentry/spotlight:latest networks: - postiz-network @@ -227,8 +188,6 @@ services: temporal: container_name: temporal restart: always - ports: - - '7233:7233' image: temporalio/auto-setup:1.28.1 depends_on: temporal-postgresql: @@ -255,7 +214,7 @@ services: retries: 10 start_period: 30s volumes: - - ./dynamicconfig:/etc/temporal/config/dynamicconfig + - /opt/postiz/dynamicconfig:/etc/temporal/config/dynamicconfig labels: kompose.volume.type: configMap @@ -283,8 +242,6 @@ services: - TEMPORAL_CORS_ORIGINS=http://127.0.0.1:3000 networks: - temporal-network - ports: - - '8080:8080' healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080/healthz"] interval: 30s @@ -296,12 +253,6 @@ services: condition: service_healthy volumes: - postgres-volume: - external: false - - postiz-redis-data: - external: false - postiz-config: external: false