fixes

aio/Dockerfile-base-full

@@ -63,6 +63,9 @@ RUN mkdir -p /app/{data,logs} && \
 
 # Create Supervisor configuration file
 COPY supervisord-full-base /app/supervisord.conf
+COPY nginx.conf /etc/nginx/nginx.conf.template
+COPY ./nginx/env.sh /app/nginx-start.sh
+RUN chmod +x /app/nginx-start.sh
 
 RUN sudo -u postgres /usr/lib/postgresql/$POSTGRES_VERSION/bin/initdb -D /var/lib/postgresql/data
 COPY postgresql.conf /etc/postgresql/postgresql.conf

aio/Dockerfile-base-slim

@@ -35,6 +35,9 @@ RUN mkdir -p /app/{data,logs} && \
 
 # Create Supervisor configuration file
 COPY supervisord-slim-base /app/supervisord.conf
+COPY nginx.conf /etc/nginx/nginx.conf.template
+COPY ./nginx/env.sh /app/nginx-start.sh
+RUN chmod +x /app/nginx-start.sh
 
 # Expose ports for Redis, PostgreSQL, and MinIO
 EXPOSE 80 443

aio/Dockerfile-full

@@ -55,7 +55,8 @@ RUN yarn turbo run build
 # STAGE 3: Copy the project and start it
 # *****************************************************************************
 # FROM makeplane/plane-aio-base AS runner
-FROM makeplane/plane-aio-base-full:develop AS runner
+ARG BASE_TAG=develop
+FROM makeplane/plane-aio-base-full:$BASE_TAG AS runner
 
 WORKDIR /app
 
@@ -70,10 +71,7 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 COPY apiserver/requirements.txt ./api/
 COPY apiserver/requirements ./api/requirements
 
-RUN python3.12 -m venv /app/venv && \
-    source /app/venv/bin/activate && \
-    /app/venv/bin/pip install --upgrade pip && \
-    /app/venv/bin/pip install -r ./api/requirements.txt --compile --no-cache-dir
+RUN pip install -r ./api/requirements.txt --compile --no-cache-dir
 
 # Add in Django deps and generate Django's static files
 COPY apiserver/manage.py ./api/manage.py
@@ -127,7 +125,10 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED 1
 ENV TURBO_TELEMETRY_DISABLED 1
 
-COPY aio/supervisord.conf /app/supervisord.conf
+COPY ./aio/nginx.conf /etc/nginx/nginx.conf.template
+COPY aio/supervisord-app /app/supervisord-app
+RUN cat /app/supervisord-app >> /app/supervisord.conf && \
+    rm /app/supervisord-app
 
 COPY aio/aio.sh /app/aio.sh
 RUN chmod +x /app/aio.sh
@@ -138,9 +139,7 @@ RUN chmod +x /app/pg-setup.sh
 COPY deploy/selfhost/variables.env /app/plane.env
 
 # NGINX Conf Copy
-COPY ./aio/nginx.conf.aio /etc/nginx/nginx.conf.template
-COPY ./nginx/env.sh /app/nginx-start.sh
-RUN chmod +x /app/nginx-start.sh
+COPY ./aio/nginx.conf /etc/nginx/nginx.conf.template
 
 RUN  ./pg-setup.sh
 

aio/Dockerfile-slim

@@ -55,7 +55,8 @@ RUN yarn turbo run build
 # STAGE 3: Copy the project and start it
 # *****************************************************************************
 # FROM makeplane/plane-aio-base AS runner
-FROM makeplane/plane-aio-base-slim:develop AS runner
+ARG BASE_TAG=develop
+FROM makeplane/plane-aio-base-slim:$BASE_TAG AS runner
 
 WORKDIR /app
 
@@ -70,10 +71,7 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK=1
 COPY apiserver/requirements.txt ./api/
 COPY apiserver/requirements ./api/requirements
 
-RUN python3.12 -m venv /app/venv && \
-    source /app/venv/bin/activate && \
-    /app/venv/bin/pip install --upgrade pip && \
-    /app/venv/bin/pip install -r ./api/requirements.txt --compile --no-cache-dir
+RUN pip install -r ./api/requirements.txt --compile --no-cache-dir
 
 # Add in Django deps and generate Django's static files
 COPY apiserver/manage.py ./api/manage.py
@@ -127,7 +125,10 @@ ENV NEXT_PUBLIC_WEB_BASE_URL=$NEXT_PUBLIC_WEB_BASE_URL
 ENV NEXT_TELEMETRY_DISABLED 1
 ENV TURBO_TELEMETRY_DISABLED 1
 
-COPY aio/supervisord.conf /app/supervisord.conf
+COPY ./aio/nginx.conf /etc/nginx/nginx.conf.template
+COPY aio/supervisord-app /app/supervisord-app
+RUN cat /app/supervisord-app >> /app/supervisord.conf && \
+    rm /app/supervisord-app
 
 COPY aio/aio.sh /app/aio.sh
 RUN chmod +x /app/aio.sh
@@ -138,12 +139,6 @@ RUN chmod +x /app/pg-setup.sh
 COPY deploy/selfhost/variables.env /app/plane.env
 
 # NGINX Conf Copy
-COPY ./aio/nginx.conf.aio /etc/nginx/nginx.conf.template
-COPY ./nginx/env.sh /app/nginx-start.sh
-RUN chmod +x /app/nginx-start.sh
-
-RUN  ./pg-setup.sh
-
-VOLUME [ "/app/data/minio/uploads", "/var/lib/postgresql/data" ]
+COPY ./aio/nginx.conf /etc/nginx/nginx.conf.template
 
 CMD ["/usr/bin/supervisord", "-c", "/app/supervisord.conf"]

aio/supervisord.conf → aio/a.txt

@@ -1,50 +1,40 @@
 [supervisord]
 user=root
 nodaemon=true
-priority=1
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
+stderr_logfile=/app/logs/error/supervisor.err.log
+stdout_logfile=/app/logs/access/supervisor.log
 
 [program:redis]
 directory=/app/data/redis
 command=redis-server
 autostart=true
 autorestart=true
-priority=1
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
+stderr_logfile=/app/logs/error/redis.err.log
+stdout_logfile=/app/logs/access/redis.log
 
 [program:postgresql]
 user=postgres
-command=/usr/lib/postgresql/15/bin/postgres -D /var/lib/postgresql/data --config-file=/etc/postgresql/postgresql.conf
+command=/usr/lib/postgresql/15/bin/postgres --config-file=/etc/postgresql/15/main/postgresql.conf
 autostart=true
 autorestart=true
-priority=1
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stdout
-stderr_logfile_maxbytes=0
+stderr_logfile=/app/logs/error/postgresql.err.log
+stdout_logfile=/app/logs/access/postgresql.log
 
 [program:minio]
 directory=/app/data/minio
 command=minio server /app/data/minio
 autostart=true
 autorestart=true
-priority=1
-stdout_logfile=/app/logs/access/minio.log
 stderr_logfile=/app/logs/error/minio.err.log
+stdout_logfile=/app/logs/access/minio.log
 
 [program:nginx]
+directory=/app/data/nginx
 command=/app/nginx-start.sh
 autostart=true
 autorestart=true
-priority=1
-stdout_logfile=/app/logs/access/nginx.log
 stderr_logfile=/app/logs/error/nginx.err.log
+stdout_logfile=/app/logs/access/nginx.log
 
 
 [program:web]

aio/nginx-full-conf → aio/nginx.conf

@@ -37,7 +37,6 @@ http {
             proxy_pass http://localhost:3002/spaces/;
         }
 
-
         location /god-mode/ {
             proxy_http_version 1.1;
             proxy_set_header Upgrade ${dollar}http_upgrade;

aio/supervisord-app

@@ -0,0 +1,67 @@
+
+[program:web]
+command=/app/aio.sh web
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+environment=PORT=3001,HOSTNAME=0.0.0.0
+
+[program:space]
+command=/app/aio.sh space
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+environment=PORT=3002,HOSTNAME=0.0.0.0
+
+[program:admin]
+command=/app/aio.sh admin
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+environment=PORT=3003,HOSTNAME=0.0.0.0
+
+[program:migrator]
+command=/app/aio.sh migrator
+autostart=true
+autorestart=false
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+
+[program:api]
+command=/app/aio.sh api
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+
+[program:worker]
+command=/app/aio.sh worker
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+
+[program:beat]
+command=/app/aio.sh beat
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stdout
+stderr_logfile_maxbytes=0
+

aio/supervisord-full-base

@@ -2,36 +2,37 @@
 user=root
 nodaemon=true
 stderr_logfile=/app/logs/error/supervisor.err.log
-stdout_logfile=/app/logs/access/supervisor.out.log
+stdout_logfile=/app/logs/access/supervisor.log
 
 [program:redis]
 directory=/app/data/redis
 command=redis-server
 autostart=true
 autorestart=true
 stderr_logfile=/app/logs/error/redis.err.log
-stdout_logfile=/app/logs/access/redis.out.log
+stdout_logfile=/app/logs/access/redis.log
 
 [program:postgresql]
 user=postgres
 command=/usr/lib/postgresql/15/bin/postgres --config-file=/etc/postgresql/15/main/postgresql.conf
 autostart=true
 autorestart=true
 stderr_logfile=/app/logs/error/postgresql.err.log
-stdout_logfile=/app/logs/access/postgresql.out.log
+stdout_logfile=/app/logs/access/postgresql.log
 
 [program:minio]
 directory=/app/data/minio
 command=minio server /app/data/minio
 autostart=true
 autorestart=true
 stderr_logfile=/app/logs/error/minio.err.log
-stdout_logfile=/app/logs/access/minio.out.log
+stdout_logfile=/app/logs/access/minio.log
 
 [program:nginx]
 directory=/app/data/nginx
-command=/usr/sbin/nginx -g 'daemon off;'
+command=/app/nginx-start.sh
 autostart=true
 autorestart=true
 stderr_logfile=/app/logs/error/nginx.err.log
-stdout_logfile=/app/logs/access/nginx.out.log
+stdout_logfile=/app/logs/access/nginx.log
+