Merge pull request #290 from makeplane/sync/ce-ee

sync: community changes

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

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" ]
 

apiserver/Dockerfile.dev

@@ -42,5 +42,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" ]
 

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