Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-13 03:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #12702 from ToolJet/fix/preview-dockerfile

Browse source 
Fix entrypoint issue in Preview dockerfie
This commit is contained in:
Adish M 2025-04-25 16:06:40 +05:30 committed by GitHub
commit 2fa5c5a82d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker/ce-preview.Dockerfile
View file

@ -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

3
docker/ee/ee-preview.Dockerfile
View file

@ -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

2
frontend/ee

@ -1 +1 @@
Subproject commit 518f3334b12a83785fd37dd53b0245d72848211a
Subproject commit dcd948d284b5f14a868480830e09b90496db8572

2
server/ee

@ -1 +1 @@
Subproject commit 1d493b090aa95eb37de8004a36baf8c976afbd45
Subproject commit 12599a28b17d84e30b0ea4897a239ed89c011425