From 1f203540954f77efb12c4f16daeb9e82087d9631 Mon Sep 17 00:00:00 2001 From: Adish M Date: Fri, 25 Apr 2025 16:04:59 +0530 Subject: [PATCH] Fix entrypoint issue in Preview dockerfie --- docker/ce-preview.Dockerfile | 3 ++- docker/ee/ee-preview.Dockerfile | 3 ++- frontend/ee | 2 +- server/ee | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/ce-preview.Dockerfile b/docker/ce-preview.Dockerfile index 1d463b6fd2..4e9f8dd796 100644 --- a/docker/ce-preview.Dockerfile +++ b/docker/ce-preview.Dockerfile @@ -70,12 +70,13 @@ COPY --from=builder /app/frontend/build ./app/frontend/build # copy server build COPY --from=builder /app/server/package.json ./app/server/package.json COPY --from=builder /app/server/.version ./app/server/.version -COPY --from=builder /app/server/entrypoint.sh ./app/server/entrypoint.sh COPY --from=builder /app/server/node_modules ./app/server/node_modules COPY --from=builder /app/server/templates ./app/server/templates COPY --from=builder /app/server/scripts ./app/server/scripts COPY --from=builder /app/server/dist ./app/server/dist +COPY ./docker/ce-entrypoint.sh ./app/server/entrypoint.sh + WORKDIR /app # ENV defaults diff --git a/docker/ee/ee-preview.Dockerfile b/docker/ee/ee-preview.Dockerfile index 57b258b648..d88efbfecf 100644 --- a/docker/ee/ee-preview.Dockerfile +++ b/docker/ee/ee-preview.Dockerfile @@ -99,12 +99,13 @@ COPY --from=builder /app/frontend/build ./app/frontend/build COPY --from=builder /app/server/package.json ./app/server/package.json COPY --from=builder /app/server/.version ./app/server/.version COPY --from=builder /app/server/ee/keys ./app/server/ee/keys -COPY --from=builder /app/server/entrypoint.sh ./app/server/entrypoint.sh COPY --from=builder /app/server/node_modules ./app/server/node_modules COPY --from=builder /app/server/templates ./app/server/templates COPY --from=builder /app/server/scripts ./app/server/scripts COPY --from=builder /app/server/dist ./app/server/dist +COPY ./docker/ee/ee-entrypoint.sh ./app/server/ee-entrypoint.sh + WORKDIR /app # ENV defaults diff --git a/frontend/ee b/frontend/ee index 518f3334b1..dcd948d284 160000 --- a/frontend/ee +++ b/frontend/ee @@ -1 +1 @@ -Subproject commit 518f3334b12a83785fd37dd53b0245d72848211a +Subproject commit dcd948d284b5f14a868480830e09b90496db8572 diff --git a/server/ee b/server/ee index 1d493b090a..12599a28b1 160000 --- a/server/ee +++ b/server/ee @@ -1 +1 @@ -Subproject commit 1d493b090aa95eb37de8004a36baf8c976afbd45 +Subproject commit 12599a28b17d84e30b0ea4897a239ed89c011425