fix: converting takeoff scripts to docker entry points

wangxukun · May 22, 2024 · 1c37716 · 1c37716
1 parent e6d626f
commit 1c37716
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 260 deletions.
diff --git a/apiserver/bin/takeoff.local → apiserver/bin/docker-entry-api-local.sh b/apiserver/bin/takeoff.local → apiserver/bin/docker-entry-api-local.sh
diff --git a/apiserver/bin/takeoff → apiserver/bin/docker-entry-api.sh b/apiserver/bin/takeoff → apiserver/bin/docker-entry-api.sh
diff --git a/apiserver/bin/beat → apiserver/bin/docker-entry-beat.sh b/apiserver/bin/beat → apiserver/bin/docker-entry-beat.sh
diff --git a/apiserver/bin/docker-entry-migrator.sh b/apiserver/bin/docker-entry-migrator.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+python manage.py wait_for_db $1
+
+python manage.py migrate $1
diff --git a/apiserver/bin/worker → apiserver/bin/docker-entry-worker.sh b/apiserver/bin/worker → apiserver/bin/docker-entry-worker.sh
diff --git a/deploy/coolify/README.md b/deploy/coolify/README.md
diff --git a/deploy/coolify/coolify-docker-compose.yml b/deploy/coolify/coolify-docker-compose.yml
diff --git a/deploy/selfhost/docker-compose.yml b/deploy/selfhost/docker-compose.yml
@@ -86,7 +86,7 @@ services:
     platform: ${DOCKER_PLATFORM:-}
     pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
-    command: ./bin/takeoff
+    command: ./bin/docker-entry-api.sh
     deploy:
       replicas: ${API_REPLICAS:-1}
     volumes:
@@ -101,7 +101,7 @@ services:
     platform: ${DOCKER_PLATFORM:-}
     pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
-    command: ./bin/worker
+    command: ./bin/docker-entry-worker.sh
     volumes:
       - logs_worker:/code/plane/logs
     depends_on:
@@ -115,7 +115,7 @@ services:
     platform: ${DOCKER_PLATFORM:-}
     pull_policy: ${PULL_POLICY:-always}
     restart: unless-stopped
-    command: ./bin/beat
+    command: ./bin/docker-entry-beat.sh
     volumes:
       - logs_beat-worker:/code/plane/logs
     depends_on:
@@ -129,9 +129,7 @@ services:
     platform: ${DOCKER_PLATFORM:-}
     pull_policy: ${PULL_POLICY:-always}
     restart: no
-    command: >
-      sh -c "python manage.py wait_for_db &&
-           python manage.py migrate"
+    command: ./bin/docker-entry-migrator.sh
     volumes:
       - logs_migrator:/code/plane/logs
     depends_on:

diff --git a/docker-compose-local.yml b/docker-compose-local.yml
@@ -6,7 +6,6 @@ volumes:
   redisdata:
   uploads:
   pgdata:
-
 
 services:
   plane-redis:
@@ -16,7 +15,7 @@ services:
       - dev_env
     volumes:
       - redisdata:/data
- 
+
   plane-minio:
     image: minio/minio
     restart: unless-stopped
@@ -30,7 +29,7 @@ services:
     environment:
       MINIO_ROOT_USER: ${AWS_ACCESS_KEY_ID}
       MINIO_ROOT_PASSWORD: ${AWS_SECRET_ACCESS_KEY}
- 
+
   plane-db:
     image: postgres:15.2-alpine
     restart: unless-stopped
@@ -98,13 +97,13 @@ services:
       - dev_env
     volumes:
       - ./apiserver:/code
-    command: ./bin/takeoff.local
+    command: ./bin/docker-entry-api.sh
     env_file:
       - ./apiserver/.env
     depends_on:
       - plane-db
       - plane-redis
-  
+
   worker:
     build:
       context: ./apiserver
@@ -116,7 +115,7 @@ services:
       - dev_env
     volumes:
       - ./apiserver:/code
-    command: ./bin/worker
+    command: ./bin/docker-entry-worker.sh
     env_file:
       - ./apiserver/.env
     depends_on:
@@ -135,7 +134,7 @@ services:
       - dev_env
     volumes:
       - ./apiserver:/code
-    command: ./bin/beat
+    command: ./bin/docker-entry-beat.sh
     env_file:
       - ./apiserver/.env
     depends_on:
@@ -154,9 +153,7 @@ services:
       - dev_env
     volumes:
       - ./apiserver:/code
-    command: >
-        sh -c "python manage.py wait_for_db --settings=plane.settings.local &&
-             python manage.py migrate --settings=plane.settings.local"
+    command: ./bin/docker-entry-migrator.sh --settings=plane.settings.local
     env_file:
       - ./apiserver/.env
     depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -45,7 +45,7 @@ services:
       args:
         DOCKER_BUILDKIT: 1
     restart: always
-    command: ./bin/takeoff
+    command: ./bin/docker-entry-api.sh
     env_file:
       - ./apiserver/.env
     depends_on:
@@ -60,7 +60,7 @@ services:
       args:
         DOCKER_BUILDKIT: 1
     restart: always
-    command: ./bin/worker
+    command: ./bin/docker-entry-worker.sh
     env_file:
       - ./apiserver/.env
     depends_on:
@@ -76,7 +76,7 @@ services:
       args:
         DOCKER_BUILDKIT: 1
     restart: always
-    command: ./bin/beat
+    command: ./bin/docker-entry-beat.sh
     env_file:
       - ./apiserver/.env
     depends_on:
@@ -92,9 +92,7 @@ services:
       args:
         DOCKER_BUILDKIT: 1
     restart: no
-    command: >
-      sh -c "python manage.py wait_for_db &&
-           python manage.py migrate"
+    command: ./bin/docker-entry-migrator.sh
     env_file:
       - ./apiserver/.env
     depends_on: