From 0154cbe08de30505ac5eb4bc0a92018ef9475abc Mon Sep 17 00:00:00 2001 From: Vo Van Nghia Date: Thu, 4 Jan 2024 10:39:19 +0700 Subject: [PATCH] docker: use concurrently instead of supervisord --- Dockerfile | 6 +++--- config/supervisord.conf | 15 --------------- 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 config/supervisord.conf diff --git a/Dockerfile b/Dockerfile index 9991c86e66..3d143e14c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,11 +46,10 @@ RUN ./apps/backend/ci/build-app.sh FROM caddy:2.7.5 as reverse-proxy FROM $NODE_BASE_IMAGE -RUN apt-get update && apt-get install -y --no-install-recommends curl supervisor ca-certificates && rm -rf /var/lib/apt/lists/* +RUN npm install -g concurrently && concurrently --version RUN useradd -m -u 1001 ryot WORKDIR /home/ryot USER ryot -COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY config/Caddyfile /etc/caddy/Caddyfile COPY --from=reverse-proxy /usr/bin/caddy /usr/local/bin/caddy COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/node_modules ./node_modules @@ -60,4 +59,5 @@ COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/public ./publi COPY --from=app-builder --chown=ryot:ryot /app/ryot /usr/local/bin/ryot HEALTHCHECK --interval=5m --timeout=3s \ CMD curl -f http://localhost:5000/config || exit 1 -CMD [ "/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf" ] +ENV API_URL=http://localhost:5000 +CMD [ "concurrently", "--names", "frontend,backend,proxy", "-k", "npx remix-serve ./build/index.js", "ryot", "caddy run --config /etc/caddy/Caddyfile" ] diff --git a/config/supervisord.conf b/config/supervisord.conf deleted file mode 100644 index 2568fdccf5..0000000000 --- a/config/supervisord.conf +++ /dev/null @@ -1,15 +0,0 @@ -[supervisord] -nodaemon=true -user=ryot - -[program:backend] -command=ryot -environment= - -[program:frontend] -command=npx remix-serve ./build/index.js -environment=API_URL=http://localhost:5000 - -[program:reverse-proxy] -command=caddy run --config /etc/caddy/Caddyfile -environment=