diff --git a/plane/code/.env.example b/plane/code/.env.example index fd92cb4..15eb375 100644 --- a/plane/code/.env.example +++ b/plane/code/.env.example @@ -1,6 +1,5 @@ APP_DOMAIN=$(PRIMARY_DOMAIN) -APP_RELEASE=v0.28.0 -SSL=false +APP_RELEASE=v1.2.1 WEB_REPLICAS=1 SPACE_REPLICAS=1 @@ -77,6 +76,10 @@ MINIO_ENDPOINT_SSL=0 # API key rate limit API_KEY_RATE_LIMIT=60/minute + +# Live server environment variables +# WARNING: You must set a secure value for LIVE_SERVER_SECRET_KEY in production environments. +LIVE_SERVER_SECRET_KEY= DOCKERHUB_USER=artifacts.plane.so/makeplane PULL_POLICY=if_not_present CUSTOM_BUILD=false diff --git a/plane/code/docker-compose.yml b/plane/code/docker-compose.yml index 284b80e..3619a1b 100644 --- a/plane/code/docker-compose.yml +++ b/plane/code/docker-compose.yml @@ -24,7 +24,6 @@ x-aws-s3-env: &aws-s3-env AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads} x-proxy-env: &proxy-env - SSL: ${SSL:-false} APP_DOMAIN: ${APP_DOMAIN:-localhost} FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880} CERT_EMAIL: ${CERT_EMAIL} @@ -47,6 +46,7 @@ x-mq-env: x-live-env: &live-env API_BASE_URL: ${API_BASE_URL:-http://api:8000} + LIVE_SERVER_SECRET_KEY: ${LIVE_SERVER_SECRET_KEY:-2FiJk1U2aiVPEQtzLehYGlTSnTnrs7LW} x-app-env: &app-env WEB_URL: ${WEB_URL:-http://localhost} @@ -59,58 +59,59 @@ x-app-env: &app-env AMQP_URL: ${AMQP_URL:-amqp://plane:plane@plane-mq:5672/plane} API_KEY_RATE_LIMIT: ${API_KEY_RATE_LIMIT:-60/minute} MINIO_ENDPOINT_SSL: ${MINIO_ENDPOINT_SSL:-0} + LIVE_SERVER_SECRET_KEY: ${LIVE_SERVER_SECRET_KEY:-2FiJk1U2aiVPEQtzLehYGlTSnTnrs7LW} services: web: - image: artifacts.plane.so/makeplane/plane-frontend:${APP_RELEASE:-v0.28.0} + image: artifacts.plane.so/makeplane/plane-frontend:${APP_RELEASE:-v1.2.1} deploy: replicas: ${WEB_REPLICAS:-1} restart_policy: - condition: on-failure + condition: any depends_on: - api - worker space: - image: artifacts.plane.so/makeplane/plane-space:${APP_RELEASE:-v0.28.0} + image: artifacts.plane.so/makeplane/plane-space:${APP_RELEASE:-v1.2.1} deploy: replicas: ${SPACE_REPLICAS:-1} restart_policy: - condition: on-failure + condition: any depends_on: - api - worker - web admin: - image: artifacts.plane.so/makeplane/plane-admin:${APP_RELEASE:-v0.28.0} + image: artifacts.plane.so/makeplane/plane-admin:${APP_RELEASE:-v1.2.1} deploy: replicas: ${ADMIN_REPLICAS:-1} restart_policy: - condition: on-failure + condition: any depends_on: - api - web live: - image: artifacts.plane.so/makeplane/plane-live:${APP_RELEASE:-v0.28.0} + image: artifacts.plane.so/makeplane/plane-live:${APP_RELEASE:-v1.2.1} environment: - <<: [ *live-env ] + <<: [ *live-env, *redis-env ] deploy: replicas: ${LIVE_REPLICAS:-1} restart_policy: - condition: on-failure + condition: any depends_on: - api - web api: - image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0} + image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v1.2.1} command: ./bin/docker-entrypoint-api.sh deploy: replicas: ${API_REPLICAS:-1} restart_policy: - condition: on-failure + condition: any volumes: - logs_api:/code/plane/logs environment: @@ -121,12 +122,12 @@ services: - plane-mq worker: - image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0} + image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v1.2.1} command: ./bin/docker-entrypoint-worker.sh deploy: replicas: ${WORKER_REPLICAS:-1} restart_policy: - condition: on-failure + condition: any volumes: - logs_worker:/code/plane/logs environment: @@ -138,12 +139,12 @@ services: - plane-mq beat-worker: - image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0} + image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v1.2.1} command: ./bin/docker-entrypoint-beat.sh deploy: replicas: ${BEAT_WORKER_REPLICAS:-1} restart_policy: - condition: on-failure + condition: any volumes: - logs_beat-worker:/code/plane/logs environment: @@ -155,7 +156,7 @@ services: - plane-mq migrator: - image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0} + image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v1.2.1} command: ./bin/docker-entrypoint-migrator.sh deploy: replicas: 1 @@ -176,18 +177,18 @@ services: deploy: replicas: 1 restart_policy: - condition: on-failure + condition: any environment: <<: *db-env volumes: - pgdata:/var/lib/postgresql/data plane-redis: - image: valkey/valkey:7.2.5-alpine + image: valkey/valkey:7.2.11-alpine deploy: replicas: 1 restart_policy: - condition: on-failure + condition: any volumes: - redisdata:/data @@ -196,7 +197,7 @@ services: deploy: replicas: 1 restart_policy: - condition: on-failure + condition: any environment: <<: *mq-env volumes: @@ -209,7 +210,7 @@ services: deploy: replicas: 1 restart_policy: - condition: on-failure + condition: any environment: <<: *minio-env volumes: @@ -217,20 +218,11 @@ services: # Comment this if you already have a reverse proxy running proxy: - image: artifacts.plane.so/makeplane/plane-proxy:${APP_RELEASE:-v0.28.0} - command: - [ - "caddy", - "run", - "--config", - "/etc/caddy/Caddyfile", - "--adapter", - "caddyfile" - ] + image: artifacts.plane.so/makeplane/plane-proxy:${APP_RELEASE:-v1.2.1} deploy: replicas: 1 restart_policy: - condition: on-failure + condition: any environment: <<: *proxy-env volumes: