From 36502a6447815ca2e78b8b58436bfef27c5b2f6e Mon Sep 17 00:00:00 2001 From: Nevo David <100117126+nevo-david@users.noreply.github.com> Date: Sun, 15 Sep 2024 19:49:39 +0700 Subject: [PATCH 1/5] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 52d15c8e..39131188 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ Facebook Pinterest Threads + Threads

From 097906e2ee1273878e1c8f3f8e1f8ca1e3e2a636 Mon Sep 17 00:00:00 2001 From: Nevo David <100117126+nevo-david@users.noreply.github.com> Date: Sun, 15 Sep 2024 19:49:48 +0700 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 39131188..88678384 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Facebook Pinterest Threads - Threads + X

From bcc9932ac77bf954639b18f34954540ffd53abe8 Mon Sep 17 00:00:00 2001 From: jamesread Date: Sun, 15 Sep 2024 22:22:04 +0100 Subject: [PATCH 3/5] ci: Docker, include libraries --- Dockerfile.dev | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile.dev b/Dockerfile.dev index d43b45af..95e34a5c 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -61,6 +61,9 @@ FROM base AS dist COPY --from=devcontainer /app/node_modules/ /app/node_modules/ COPY --from=devcontainer /app/dist/ /app/dist/ +# Required for prisma +COPY --from=devcontainer /app/libraries/ /app/libraries/ + COPY package.json nx.json /app/ VOLUME /config From b84c86c723bc6d8e5ed6375f240c8726d75aa5a3 Mon Sep 17 00:00:00 2001 From: jamesread Date: Sun, 15 Sep 2024 23:41:30 +0100 Subject: [PATCH 4/5] ci: Docker, supress supervisord warnings, start backend on 4200 --- var/docker/entrypoint.sh | 2 +- var/docker/supervisord.conf | 1 + var/docker/supervisord/frontend.conf | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/var/docker/entrypoint.sh b/var/docker/entrypoint.sh index 526ca6f3..df3b13fd 100755 --- a/var/docker/entrypoint.sh +++ b/var/docker/entrypoint.sh @@ -38,4 +38,4 @@ if [[ $POSTIZ_APPS == *"backend"* ]]; then ln -sf /app/supervisord_available_configs/backend.conf /etc/supervisor.d/ fi -/usr/bin/supervisord +/usr/bin/supervisord -c /etc/supervisord.conf diff --git a/var/docker/supervisord.conf b/var/docker/supervisord.conf index a957fc23..f99f80df 100644 --- a/var/docker/supervisord.conf +++ b/var/docker/supervisord.conf @@ -2,6 +2,7 @@ nodaemon=true logfile=/dev/null logfile_maxbytes=0 +user=root [unix_http_server] file=/run/supervisord.sock diff --git a/var/docker/supervisord/frontend.conf b/var/docker/supervisord/frontend.conf index 53c03a6f..9199b52e 100644 --- a/var/docker/supervisord/frontend.conf +++ b/var/docker/supervisord/frontend.conf @@ -6,3 +6,4 @@ autorestart=false redirect_stderr=true stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 +environment=PORT=4200 From 94ad61a35ebe584a7e709416d29eaaf055ec762d Mon Sep 17 00:00:00 2001 From: jamesread Date: Mon, 16 Sep 2024 07:28:35 +0100 Subject: [PATCH 5/5] feat: Better startup and failure message for backend --- apps/backend/src/main.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/backend/src/main.ts b/apps/backend/src/main.ts index 6b0bd131..7cc0a962 100644 --- a/apps/backend/src/main.ts +++ b/apps/backend/src/main.ts @@ -35,8 +35,14 @@ async function bootstrap() { loadSwagger(app); const port = process.env.PORT || 3000; - await app.listen(port); - Logger.log(`🚀 Application is running on: http://localhost:${port}`); + + try { + await app.listen(port); + + Logger.log(`🚀 Backend is running on: http://localhost:${port}`); + } catch (e) { + Logger.error(`Backend failed to start on port ${port}`, e); + } } bootstrap();