fix: resolve conflict markers accidentally committed during meta migration

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-10 00:15:28 +02:00 · 2026-07-08 01:12:41 -06:00
parent 13c95c3045
commit f1709c321c
2 changed files with 0 additions and 148 deletions
--- a/blueprints/plane/docker-compose.yml
+++ b/blueprints/plane/docker-compose.yml
@@ -74,30 +74,18 @@ x-app-env: &app-env
  WEBHOOK_ALLOWED_HOSTS: ${WEBHOOK_ALLOWED_HOSTS:-}

 services:
-<<<<<<< HEAD
  plane-web:
    image: makeplane/plane-frontend:${APP_RELEASE:-v1.3.1}
    restart: unless-stopped
-=======
-  web:
-    image: makeplane/plane-frontend:${APP_RELEASE:-v1.2.3}
-    restart: always
->>>>>>> origin/canary
    depends_on:
      plane-api:
        condition: service_started
      plane-worker:
        condition: service_started

-<<<<<<< HEAD
  plane-space:
    image: makeplane/plane-space:${APP_RELEASE:-v1.3.1}
    restart: unless-stopped
-=======
-  space:
-    image: makeplane/plane-space:${APP_RELEASE:-v1.2.3}
-    restart: always
->>>>>>> origin/canary
    depends_on:
      plane-api:
        condition: service_started
@@ -106,47 +94,29 @@ services:
      plane-web:
        condition: service_started

-<<<<<<< HEAD
  plane-admin:
    image: makeplane/plane-admin:${APP_RELEASE:-v1.3.1}
    restart: unless-stopped
-=======
-  admin:
-    image: makeplane/plane-admin:${APP_RELEASE:-v1.2.3}
-    restart: always
->>>>>>> origin/canary
    depends_on:
      plane-api:
        condition: service_started
      plane-web:
        condition: service_started

-<<<<<<< HEAD
  plane-live:
    image: makeplane/plane-live:${APP_RELEASE:-v1.3.1}
    restart: unless-stopped
    environment:
      <<: [*live-env, *redis-env]
-=======
-  live:
-    image: makeplane/plane-live:${APP_RELEASE:-v1.2.3}
-    restart: always
->>>>>>> origin/canary
    depends_on:
      plane-api:
        condition: service_started
      plane-web:
        condition: service_started

-<<<<<<< HEAD
  plane-api:
    image: makeplane/plane-backend:${APP_RELEASE:-v1.3.1}
    restart: unless-stopped
-=======
-  api:
-    image: makeplane/plane-backend:${APP_RELEASE:-v1.2.3}
-    restart: always
->>>>>>> origin/canary
    command: ./bin/docker-entrypoint-api.sh
    volumes:
      - logs_api:/code/plane/logs
@@ -162,15 +132,9 @@ services:
      plane-migrator:
        condition: service_completed_successfully

-<<<<<<< HEAD
  plane-worker:
    image: makeplane/plane-backend:${APP_RELEASE:-v1.3.1}
    restart: unless-stopped
-=======
-  worker:
-    image: makeplane/plane-backend:${APP_RELEASE:-v1.2.3}
-    restart: always
->>>>>>> origin/canary
    command: ./bin/docker-entrypoint-worker.sh
    volumes:
      - logs_worker:/code/plane/logs
@@ -186,15 +150,9 @@ services:
      plane-migrator:
        condition: service_completed_successfully

-<<<<<<< HEAD
  plane-beat-worker:
    image: makeplane/plane-backend:${APP_RELEASE:-v1.3.1}
    restart: unless-stopped
-=======
-  beat-worker:
-    image: makeplane/plane-backend:${APP_RELEASE:-v1.2.3}
-    restart: always
->>>>>>> origin/canary
    command: ./bin/docker-entrypoint-beat.sh
    volumes:
      - logs_beat-worker:/code/plane/logs
@@ -210,13 +168,8 @@ services:
      plane-migrator:
        condition: service_completed_successfully

-<<<<<<< HEAD
  plane-migrator:
    image: makeplane/plane-backend:${APP_RELEASE:-v1.3.1}
-=======
-  migrator:
-    image: makeplane/plane-backend:${APP_RELEASE:-v1.2.3}
->>>>>>> origin/canary
    restart: on-failure
    command: ./bin/docker-entrypoint-migrator.sh
    volumes:
@@ -230,13 +183,8 @@ services:
        condition: service_healthy

  plane-db:
-<<<<<<< HEAD
    image: postgres:17-alpine
    restart: unless-stopped
-=======
-    image: postgres:15.7-alpine
-    restart: always
->>>>>>> origin/canary
    command: postgres -c 'max_connections=1000'
    environment:
      <<: *db-env
@@ -251,7 +199,6 @@ services:

  plane-redis:
    image: valkey/valkey:7.2.11-alpine
-<<<<<<< HEAD
    restart: unless-stopped
    volumes:
      - redisdata:/data
@@ -267,15 +214,6 @@ services:
    restart: unless-stopped
    environment:
      <<: *mq-env
-=======
-    restart: always
-    volumes:
-      - redisdata:/data
-
-  plane-mq:
-    image: rabbitmq:3.13.6-management-alpine
-    restart: always
->>>>>>> origin/canary
    volumes:
      - rabbitmq_data:/var/lib/rabbitmq
    healthcheck:
@@ -285,7 +223,6 @@ services:
      retries: 10
      start_period: 30s

-<<<<<<< HEAD
  plane-minio:
    image: minio/minio:RELEASE.2025-04-22T22-12-26Z
    restart: unless-stopped
@@ -322,30 +259,6 @@ services:
        condition: service_started
      plane-live:
        condition: service_started
-=======
-  plane-storage:
-    image: rustfs/rustfs:1.0.0-alpha.90
-    restart: always
-    volumes:
-      - uploads:/data
-    env_file:
-      - .env
-
-  proxy:
-    image: makeplane/plane-proxy:${APP_RELEASE:-v1.2.3}
-    restart: always
-    depends_on:
-      - web
-      - api
-      - space
-      - admin
-      - live
-    volumes:
-      - proxy_config:/config
-      - proxy_data:/data
-    env_file:
-      - .env
->>>>>>> origin/canary

 volumes:
  pgdata:
@@ -356,9 +269,5 @@ volumes:
  logs_worker:
  logs_beat-worker:
  logs_migrator:
-<<<<<<< HEAD
-=======
-  rabbitmq_data:
->>>>>>> origin/canary
  proxy_config:
  proxy_data:
--- a/blueprints/plane/template.toml
+++ b/blueprints/plane/template.toml
@@ -1,7 +1,6 @@
 [variables]
 app_release = "v1.3.1"
 main_domain = "${domain}"
-<<<<<<< HEAD
 postgres_password = "${password:32}"
 minio_password = "${password:32}"
 rabbitmq_password = "${password:32}"
@@ -104,62 +103,6 @@ env = [
  "WEBHOOK_ALLOWED_IPS=",
  "# Comma-separated hosts allowed as webhook targets; empty allows all.",
  "WEBHOOK_ALLOWED_HOSTS=",
-=======
-postgres_user = "${username}"
-db_password = "${password:32}"
-storage_password = "${password:32}"
-rabbitmq_user = "${username}"
-rabbitmq_pass = "${password:32}"
-secret_key = "${base64:48}"
-live_secret_key = "${base64:32}"
-
-[config]
-env = [
-"APP_DOMAIN=${main_domain}",
-"WEB_URL=http://${main_domain}",
-"PGHOST=plane-db",
-"PGDATABASE=plane",
-"POSTGRES_USER=${postgres_user}",
-"POSTGRES_PASSWORD=${db_password}",
-"POSTGRES_DB=plane",
-"POSTGRES_PORT=5432",
-"PGDATA=/var/lib/postgresql/data",
-"DATABASE_URL=postgresql://${postgres_user}:${db_password}@plane-db/plane",
-"REDIS_HOST=plane-redis",
-"REDIS_PORT=6379",
-"REDIS_URL=redis://plane-redis:6379/",
-"RUSTFS_ACCESS_KEY=access-key",
-"RUSTFS_SECRET_KEY=${storage_password}",
-"RUSTFS_VOLUMES=/data",
-"RUSTFS_ADDRESS=0.0.0.0:9000",
-"RUSTFS_CONSOLE_ENABLE=false",
-"AWS_REGION=",
-"AWS_ACCESS_KEY_ID=access-key",
-"AWS_SECRET_ACCESS_KEY=${storage_password}",
-"AWS_S3_ENDPOINT_URL=http://plane-storage:9000",
-"AWS_S3_BUCKET_NAME=uploads",
-"BUCKET_NAME=uploads",
-"FILE_SIZE_LIMIT=5242880",
-"RABBITMQ_HOST=plane-mq",
-"RABBITMQ_PORT=5672",
-"RABBITMQ_USER=${rabbitmq_user}",
-"RABBITMQ_PASSWORD=${rabbitmq_pass}",
-"RABBITMQ_VHOST=plane",
-"RABBITMQ_DEFAULT_USER=${rabbitmq_user}",
-"RABBITMQ_DEFAULT_PASS=${rabbitmq_pass}",
-"RABBITMQ_DEFAULT_VHOST=plane",
-"AMQP_URL=amqp://${rabbitmq_user}:${rabbitmq_pass}@plane-mq:5672/plane",
-"API_BASE_URL=http://api:8000",
-"DEBUG=0",
-"CORS_ALLOWED_ORIGINS=http://${main_domain}",
-"GUNICORN_WORKERS=1",
-"USE_MINIO=1",
-"SECRET_KEY=${secret_key}",
-"API_KEY_RATE_LIMIT=60/minute",
-"MINIO_ENDPOINT_SSL=0",
-"SITE_ADDRESS=:80",
-"LIVE_SERVER_SECRET_KEY=${live_secret_key}"
->>>>>>> origin/canary
 ]

 mounts = []