From 509d5fe5546a667f8832ae5b5002a03cfe2ec834 Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Wed, 22 May 2024 13:00:45 +0530 Subject: [PATCH] fix: docker entrypoint --- Dockerfile | 2 +- apiserver/Dockerfile.api | 3 +-- apiserver/Dockerfile.dev | 2 +- nginx/supervisor.conf | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0d5951dee..ec01b2a55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,7 +82,7 @@ COPY apiserver/templates templates/ RUN apk --no-cache add "bash~=5.2" COPY apiserver/bin ./bin/ -RUN chmod +x ./bin/takeoff ./bin/worker +RUN chmod +x ./bin/* RUN chmod -R 777 /code # Expose container port and run entry point script diff --git a/apiserver/Dockerfile.api b/apiserver/Dockerfile.api index 31124c8f5..6447e9f97 100644 --- a/apiserver/Dockerfile.api +++ b/apiserver/Dockerfile.api @@ -42,11 +42,10 @@ RUN apk --no-cache add "bash~=5.2" COPY ./bin ./bin/ RUN mkdir -p /code/plane/logs -RUN chmod +x ./bin/takeoff ./bin/worker ./bin/beat +RUN chmod +x ./bin/* RUN chmod -R 777 /code # Expose container port and run entry point script EXPOSE 8000 -# CMD [ "./bin/takeoff" ] diff --git a/apiserver/Dockerfile.dev b/apiserver/Dockerfile.dev index 6a225fec3..3de300db7 100644 --- a/apiserver/Dockerfile.dev +++ b/apiserver/Dockerfile.dev @@ -41,5 +41,5 @@ RUN chmod -R 777 /code # Expose container port and run entry point script EXPOSE 8000 -CMD [ "./bin/takeoff.local" ] +CMD [ "./bin/docker-entrypoint-api-local.sh" ] diff --git a/nginx/supervisor.conf b/nginx/supervisor.conf index 54b4ca04d..7e1ed70e9 100644 --- a/nginx/supervisor.conf +++ b/nginx/supervisor.conf @@ -1,4 +1,4 @@ -[supervisord] ## This is the main process for the Supervisor +[supervisord] ## This is the main process for the Supervisor nodaemon=true [program:node] @@ -10,7 +10,7 @@ stdout_logfile=/var/log/node.out.log [program:python] directory=/code -command=sh bin/takeoff +command=sh bin/docker-entrypoint-api.sh autostart=true autorestart=true stderr_logfile=/var/log/python.err.log