Removed Twenty, Updated Plane

plane/code/docker-compose.yml

@@ -24,9 +24,16 @@ x-aws-s3-env: &aws-s3-env
   AWS_S3_BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
 
 x-proxy-env: &proxy-env
-  NGINX_PORT: ${NGINX_PORT:-80}
-  BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+  SSL: ${SSL:-false}
+  APP_DOMAIN: ${APP_DOMAIN:-localhost}
   FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
+  CERT_EMAIL: ${CERT_EMAIL}
+  CERT_ACME_CA: ${CERT_ACME_CA}
+  CERT_ACME_DNS: ${CERT_ACME_DNS}
+  LISTEN_HTTP_PORT: ${LISTEN_HTTP_PORT:-80}
+  LISTEN_HTTPS_PORT: ${LISTEN_HTTPS_PORT:-443}
+  BUCKET_NAME: ${AWS_S3_BUCKET_NAME:-uploads}
+  SITE_ADDRESS: ${SITE_ADDRESS:-:80}
 
 x-mq-env:
   # RabbitMQ Settings
@@ -55,8 +62,7 @@ x-app-env: &app-env
 
 services:
   web:
-    image: artifacts.plane.so/makeplane/plane-frontend:${APP_RELEASE:-stable}
-    command: node web/server.js web
+    image: artifacts.plane.so/makeplane/plane-frontend:${APP_RELEASE:-v0.28.0}
     deploy:
       replicas: ${WEB_REPLICAS:-1}
       restart_policy:
@@ -66,8 +72,7 @@ services:
       - worker
 
   space:
-    image: artifacts.plane.so/makeplane/plane-space:${APP_RELEASE:-stable}
-    command: node space/server.js space
+    image: artifacts.plane.so/makeplane/plane-space:${APP_RELEASE:-v0.28.0}
     deploy:
       replicas: ${SPACE_REPLICAS:-1}
       restart_policy:
@@ -78,8 +83,7 @@ services:
       - web
 
   admin:
-    image: artifacts.plane.so/makeplane/plane-admin:${APP_RELEASE:-stable}
-    command: node admin/server.js admin
+    image: artifacts.plane.so/makeplane/plane-admin:${APP_RELEASE:-v0.28.0}
     deploy:
       replicas: ${ADMIN_REPLICAS:-1}
       restart_policy:
@@ -89,8 +93,7 @@ services:
       - web
 
   live:
-    image: artifacts.plane.so/makeplane/plane-live:${APP_RELEASE:-stable}
-    command: node live/dist/server.js live
+    image: artifacts.plane.so/makeplane/plane-live:${APP_RELEASE:-v0.28.0}
     environment:
       <<: [ *live-env ]
     deploy:
@@ -102,7 +105,7 @@ services:
       - web
 
   api:
-    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0}
     command: ./bin/docker-entrypoint-api.sh
     deploy:
       replicas: ${API_REPLICAS:-1}
@@ -118,7 +121,7 @@ services:
       - plane-mq
 
   worker:
-    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0}
     command: ./bin/docker-entrypoint-worker.sh
     deploy:
       replicas: ${WORKER_REPLICAS:-1}
@@ -135,7 +138,7 @@ services:
       - plane-mq
 
   beat-worker:
-    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0}
     command: ./bin/docker-entrypoint-beat.sh
     deploy:
       replicas: ${BEAT_WORKER_REPLICAS:-1}
@@ -152,7 +155,7 @@ services:
       - plane-mq
 
   migrator:
-    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-stable}
+    image: artifacts.plane.so/makeplane/plane-backend:${APP_RELEASE:-v0.28.0}
     command: ./bin/docker-entrypoint-migrator.sh
     deploy:
       replicas: 1
@@ -214,17 +217,31 @@ services:
 
   # Comment this if you already have a reverse proxy running
   proxy:
-    image: artifacts.plane.so/makeplane/plane-proxy:${APP_RELEASE:-stable}
-    environment:
-      <<: *proxy-env
+    image: artifacts.plane.so/makeplane/plane-proxy:${APP_RELEASE:-v0.28.0}
+    command:
+      [
+        "caddy",
+        "run",
+        "--config",
+        "/etc/caddy/Caddyfile",
+        "--adapter",
+        "caddyfile"
+      ]
     deploy:
       replicas: 1
       restart_policy:
         condition: on-failure
+    environment:
+      <<: *proxy-env
+    volumes:
+      - proxy_config:/config
+      - proxy_data:/data
     depends_on:
       - web
       - api
       - space
+      - admin
+      - live
 
 volumes:
   pgdata:
@@ -235,3 +252,5 @@ volumes:
   logs_beat-worker:
   logs_migrator:
   rabbitmq_data:
+  proxy_config:
+  proxy_data: