From 49d1bd05648ce6d235b646ca43541f688e4911dd Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Fri, 26 Apr 2024 18:18:31 +0530 Subject: [PATCH] fix: update docker compose changes --- deploy/cli-install/docker-compose-caddy.yml | 24 ++++++++++----------- deploy/cli-install/docker-compose.yml | 18 ++++++++-------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/deploy/cli-install/docker-compose-caddy.yml b/deploy/cli-install/docker-compose-caddy.yml index 01c370a8e2..e96d092df7 100644 --- a/deploy/cli-install/docker-compose-caddy.yml +++ b/deploy/cli-install/docker-compose-caddy.yml @@ -1,15 +1,15 @@ -x-proxy-env : &proxy-env +x-proxy-env: &proxy-env environment: - DOMAIN_NAME=${DOMAIN_NAME:-localhost} - CERT_EMAIL=${CERT_EMAIL:-admin@localhost} - APP_PROTOCOL=${APP_PROTOCOL:-http} - - CERT_ACME_DNS=${CERT_ACME_DNS:-} + - CERT_ACME_DNS=${CERT_ACME_DNS:-} - BUCKET_NAME=${BUCKET_NAME:-uploads} - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880} - LISTEN_HTTP_PORT=${LISTEN_HTTP_PORT:-80} - LISTEN_HTTPS_PORT=${LISTEN_HTTPS_PORT:-443} -x-app-env : &app-env +x-app-env: &app-env environment: - NGINX_PORT=${NGINX_PORT:-80} - WEB_URL=${WEB_URL:-http://localhost} @@ -48,7 +48,7 @@ x-app-env : &app-env services: web: <<: *app-env - image: registry.plane.tools/plane-one/plane-frontend-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/web-enterprise:${APP_RELEASE_VERSION} restart: unless-stopped command: /usr/local/bin/start.sh web/server.js web deploy: @@ -59,7 +59,7 @@ services: space: <<: *app-env - image: registry.plane.tools/plane-one/plane-space-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/space-enterprise:${APP_RELEASE_VERSION} restart: unless-stopped command: /usr/local/bin/start.sh space/server.js space deploy: @@ -71,7 +71,7 @@ services: api: <<: *app-env - image: registry.plane.tools/plane-one/plane-backend-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/backend-enterprise:${APP_RELEASE_VERSION} restart: unless-stopped command: ./bin/takeoff deploy: @@ -84,7 +84,7 @@ services: worker: <<: *app-env - image: registry.plane.tools/plane-one/plane-backend-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/backend-enterprise:${APP_RELEASE_VERSION} restart: unless-stopped command: ./bin/worker # volumes: @@ -96,7 +96,7 @@ services: beat-worker: <<: *app-env - image: registry.plane.tools/plane-one/plane-backend-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/backend-enterprise:${APP_RELEASE_VERSION} restart: unless-stopped command: ./bin/beat # volumes: @@ -108,7 +108,7 @@ services: migrator: <<: *app-env - image: registry.plane.tools/plane-one/plane-backend-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/backend-enterprise:${APP_RELEASE_VERSION} restart: no command: > sh -c "python manage.py wait_for_db && @@ -126,7 +126,7 @@ services: command: postgres -c 'max_connections=1000' volumes: - ${INSTALL_DIR}/data/db:/var/lib/postgresql/data - + plane-redis: <<: *app-env image: redis:7.2.4-alpine @@ -149,8 +149,8 @@ services: image: makeplane/caddy:latest restart: unless-stopped ports: - - ${LISTEN_HTTP_PORT:-80}:80 - - ${LISTEN_HTTPS_PORT:-443}:443 + - ${LISTEN_HTTP_PORT:-80}:80 + - ${LISTEN_HTTPS_PORT:-443}:443 volumes: - ${INSTALL_DIR}/Caddyfile:/etc/caddy/Caddyfile - ${INSTALL_DIR}/caddy/config:/config diff --git a/deploy/cli-install/docker-compose.yml b/deploy/cli-install/docker-compose.yml index 602eda169e..b0ea017f3a 100644 --- a/deploy/cli-install/docker-compose.yml +++ b/deploy/cli-install/docker-compose.yml @@ -1,6 +1,6 @@ # version: "3.8" -x-app-env : &app-env +x-app-env: &app-env environment: - NGINX_PORT=${NGINX_PORT:-80} - WEB_URL=${WEB_URL:-http://localhost} @@ -39,7 +39,7 @@ x-app-env : &app-env services: web: <<: *app-env - image: registry.plane.tools/plane-one/plane-frontend-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/web-enterprise:${APP_RELEASE_VERSION} pull_policy: if_not_present restart: unless-stopped command: /usr/local/bin/start.sh web/server.js web @@ -51,7 +51,7 @@ services: space: <<: *app-env - image: registry.plane.tools/plane-one/plane-space-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/space-enterprise:${APP_RELEASE_VERSION} pull_policy: if_not_present restart: unless-stopped command: /usr/local/bin/start.sh space/server.js space @@ -64,7 +64,7 @@ services: api: <<: *app-env - image: registry.plane.tools/plane-one/plane-backend-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/backend-enterprise:${APP_RELEASE_VERSION} pull_policy: if_not_present restart: unless-stopped command: ./bin/takeoff @@ -78,7 +78,7 @@ services: worker: <<: *app-env - image: registry.plane.tools/plane-one/plane-backend-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/backend-enterprise:${APP_RELEASE_VERSION} pull_policy: if_not_present restart: unless-stopped command: ./bin/worker @@ -91,7 +91,7 @@ services: beat-worker: <<: *app-env - image: registry.plane.tools/plane-one/plane-backend-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/backend-enterprise:${APP_RELEASE_VERSION} pull_policy: if_not_present restart: unless-stopped command: ./bin/beat @@ -104,7 +104,7 @@ services: migrator: <<: *app-env - image: registry.plane.tools/plane-one/plane-backend-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/backend-enterprise:${APP_RELEASE_VERSION} pull_policy: if_not_present restart: no command: > @@ -145,11 +145,11 @@ services: # Comment this if you already have a reverse proxy running proxy: <<: *app-env - image: registry.plane.tools/plane-one/plane-proxy-one:${APP_RELEASE_VERSION} + image: registry.plane.tools/plane-enterprise/proxy-enterprise:${APP_RELEASE_VERSION} pull_policy: if_not_present restart: unless-stopped ports: - - ${NGINX_PORT}:80 + - ${NGINX_PORT}:80 depends_on: - web - api