From af861c82943527a72ff04a1c68de9bfe3d2eebb0 Mon Sep 17 00:00:00 2001 From: logonoff <18614559+logonoff@users.noreply.github.com> Date: Tue, 13 Feb 2024 10:44:26 -0500 Subject: [PATCH 1/3] properly pass signals to remix --- app/Dockerfile | 2 +- app/docker-entrypoint.sh | 4 ++++ app/prod.sh | 10 ---------- 3 files changed, 5 insertions(+), 11 deletions(-) create mode 100644 app/docker-entrypoint.sh delete mode 100644 app/prod.sh diff --git a/app/Dockerfile b/app/Dockerfile index 2dbb7cc..11567c8 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -8,4 +8,4 @@ COPY ./app . RUN npm run prisma:generate RUN npm run build -CMD ["sh", "prod.sh"] +CMD ["sh", "docker-entrypoint.sh"] diff --git a/app/docker-entrypoint.sh b/app/docker-entrypoint.sh new file mode 100644 index 0000000..adebd0c --- /dev/null +++ b/app/docker-entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +npm run prisma:migrate +exec npm run start diff --git a/app/prod.sh b/app/prod.sh deleted file mode 100644 index 56ec3f9..0000000 --- a/app/prod.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -trap 'kill -SIGTERM $(jobs -p)' SIGTERM -trap 'kill -SIGINT $(jobs -p)' SIGINT - -npm run prisma:migrate -npm run start - -wait -n -exit $? From 337573f05a1a88320e83a60e6d05eaaf56de2e73 Mon Sep 17 00:00:00 2001 From: logonoff <18614559+logonoff@users.noreply.github.com> Date: Tue, 13 Feb 2024 10:46:36 -0500 Subject: [PATCH 2/3] Add error handling before starting the application --- app/docker-entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/docker-entrypoint.sh b/app/docker-entrypoint.sh index adebd0c..f7d940d 100644 --- a/app/docker-entrypoint.sh +++ b/app/docker-entrypoint.sh @@ -1,4 +1,7 @@ #!/bin/sh +set -e + npm run prisma:migrate + exec npm run start From fa4b27c43998d0a5f5a569d6bc5d3353ea70a5c5 Mon Sep 17 00:00:00 2001 From: logonoff <18614559+logonoff@users.noreply.github.com> Date: Thu, 15 Feb 2024 22:07:04 -0500 Subject: [PATCH 3/3] [hotfix] exec the correct entrypoint --- app/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/docker-entrypoint.sh b/app/docker-entrypoint.sh index f7d940d..52d52e1 100644 --- a/app/docker-entrypoint.sh +++ b/app/docker-entrypoint.sh @@ -4,4 +4,4 @@ set -e npm run prisma:migrate -exec npm run start +exec "/app/node_modules/.bin/remix-serve" "/app/build/index.js"