From f45026b1db57d4dee5b92cb439d2b924ee8a4e09 Mon Sep 17 00:00:00 2001 From: Akshat Jain Date: Tue, 22 Jul 2025 13:28:29 +0530 Subject: [PATCH] [INFRA-210] Fix aio dockerfile with new file structure (#3677) * chore: update Dockerfile to use 'preview' version and adjust app directory structure for COPY commands * fix: update Dockerfile to correct app directory structure for silo image COPY command * fix: update Dockerfile to correct app directory structure for live image COPY command * fix: update Dockerfile to set PLANE_VERSION to v1.12.1 * fix: update supervisor configuration to change live command path * fix: update Dockerfile and supervisor configuration to correct app directory paths * fix: update Dockerfile and supervisor configuration to correct application paths for web, space, and admin services * fix: update Dockerfile to set PLANE_VERSION to stable * fix: update Dockerfile to set PLANE_VERSION to v1.12.1 --- deployments/aio/commercial/Dockerfile | 7 ++++--- deployments/aio/commercial/supervisor.conf | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/deployments/aio/commercial/Dockerfile b/deployments/aio/commercial/Dockerfile index b71a430ff7..95381de952 100644 --- a/deployments/aio/commercial/Dockerfile +++ b/deployments/aio/commercial/Dockerfile @@ -1,4 +1,4 @@ -ARG PLANE_VERSION=v1.11.1 +ARG PLANE_VERSION=v1.12.1 FROM --platform=$BUILDPLATFORM tonistiigi/binfmt AS binfmt # ************************************************** @@ -44,8 +44,9 @@ COPY --from=monitor-img /usr/local/bin/prime-monitor /usr/local/bin/prime-monito RUN mkdir -p /app/monitor && \ chmod +x /usr/local/bin/prime-monitor -RUN rm -rf /app/web/web/.next/cache && \ - rm -rf /app/space/space/.next/cache +RUN rm -rf /app/web/apps/web/.next/cache && \ + rm -rf /app/space/apps/space/.next/cache && \ + rm -rf /app/admin/apps/admin/.next/cache COPY --from=proxy-img /usr/bin/caddy /usr/bin/caddy COPY dist/Caddyfile /app/proxy/Caddyfile diff --git a/deployments/aio/commercial/supervisor.conf b/deployments/aio/commercial/supervisor.conf index e10d22e0f7..6deb5ddd80 100644 --- a/deployments/aio/commercial/supervisor.conf +++ b/deployments/aio/commercial/supervisor.conf @@ -30,7 +30,7 @@ priority=10 [program:web] -command=sh -c "node /app/web/web/server.js" +command=sh -c "node /app/web/apps/web/server.js" autostart=true autorestart=true stdout_logfile=/app/logs/access/web.log @@ -41,7 +41,7 @@ environment=PORT=3001,HOSTNAME=0.0.0.0 priority=15 [program:space] -command=sh -c "node /app/space/space/server.js" +command=sh -c "node /app/space/apps/space/server.js" autostart=true autorestart=true stdout_logfile=/app/logs/access/space.log @@ -52,7 +52,7 @@ environment=PORT=3002,HOSTNAME=0.0.0.0 priority=15 [program:admin] -command=sh -c "node /app/admin/admin/server.js" +command=sh -c "node /app/admin/apps/admin/server.js" autostart=true autorestart=true stdout_logfile=/app/logs/access/admin.log @@ -103,7 +103,7 @@ priority=20 [program:live] directory=/app/live -command=sh -c "node live/dist/start.js live" +command=sh -c "node live/start.js" autostart=true autorestart=true stdout_logfile=/app/logs/access/live.log