From 189cbcecd7c475aadc83bc39447f80609d2e29a6 Mon Sep 17 00:00:00 2001 From: Matti Nannt Date: Mon, 11 Mar 2024 12:01:12 +0100 Subject: [PATCH] chore: dockerfile needs no internet access to run (#2215) --- apps/formbricks-com/package.json | 2 +- apps/web/Dockerfile | 15 ++++++--------- pnpm-lock.yaml | 24 ++++++------------------ 3 files changed, 13 insertions(+), 28 deletions(-) diff --git a/apps/formbricks-com/package.json b/apps/formbricks-com/package.json index d0d159680a..e8762bba5f 100644 --- a/apps/formbricks-com/package.json +++ b/apps/formbricks-com/package.json @@ -13,7 +13,7 @@ "browserslist": "defaults, not ie <= 11", "dependencies": { "@algolia/autocomplete-core": "^1.13.0", - "@calcom/embed-react": "^1.3.0", + "@calcom/embed-react": "^1.3.2", "@docsearch/react": "^3.5.2", "@formbricks/lib": "workspace:*", "@formbricks/types": "workspace:*", diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index d9de404d14..b54820182f 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -83,6 +83,9 @@ COPY --from=installer --chown=nextjs:nextjs /app/packages/database/migrations ./ COPY --from=installer --chown=nextjs:nextjs /prisma_version.txt . COPY /docker/cronjobs /app/docker/cronjobs +# Install Prisma globally +RUN PRISMA_VERSION=$(cat prisma_version.txt) && npm install -g prisma@$PRISMA_VERSION + EXPOSE 3000 ENV HOSTNAME "0.0.0.0" USER nextjs @@ -91,12 +94,6 @@ USER nextjs RUN mkdir -p /home/nextjs/apps/web/uploads/ VOLUME /home/nextjs/apps/web/uploads/ -CMD PRISMA_VERSION=$(cat prisma_version.txt) && \ - supercronic -quiet /app/docker/cronjobs & \ - if [ "$NEXTAUTH_SECRET" != "RANDOM_STRING" ]; then \ - pnpm dlx prisma@$PRISMA_VERSION migrate deploy && \ - exec node apps/web/server.js; \ - else \ - echo "ERROR: Please set a value for NEXTAUTH_SECRET in your docker compose variables!" >&2; \ - exit 1; \ - fi \ No newline at end of file +CMD supercronic -quiet /app/docker/cronjobs & \ + prisma migrate deploy && \ + exec node apps/web/server.js diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fafbf5de8f..d60f91e43b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,8 +65,8 @@ importers: specifier: ^1.13.0 version: 1.13.0(@algolia/client-search@4.22.0)(algoliasearch@4.22.0)(search-insights@2.13.0) '@calcom/embed-react': - specifier: ^1.3.0 - version: 1.3.0(react-dom@18.2.0)(react@18.2.0) + specifier: ^1.3.2 + version: 1.3.2(react-dom@18.2.0)(react@18.2.0) '@docsearch/react': specifier: ^3.5.2 version: 3.5.2(@algolia/client-search@4.22.0)(@types/react@18.2.61)(react-dom@18.2.0)(react@18.2.0)(search-insights@2.13.0) @@ -3300,37 +3300,25 @@ packages: resolution: {integrity: sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA==} dev: true - /@calcom/embed-core@1.3.2: - resolution: {integrity: sha512-qxVfWpmPcYN5hTnwoKTP9QAlhEAHy4TFh+Xu+IoCnJma/uI2BjqsUWJ0BXsmm0m8sTFthaBkGiFomS1LeMYO+Q==} - dev: false - /@calcom/embed-core@1.3.3: resolution: {integrity: sha512-bz7S9cvz1JMVWFcJI+dvoOQd5F63YzdQ5gOp1vunob5idje7PoYfiTf6ncMSVeX6vsrJA1oVFD07JMxuYt/d+A==} - dev: true - /@calcom/embed-react@1.3.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-NbqkLd6J+VUy8jILY4GI1HEXRv3pZk1wnmL3CRrouB2y7pU5sV1qPjkgy+hwCRlYJJGiAIrspXkI/czMsfHxRQ==} + /@calcom/embed-react@1.3.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-tya/NJQJs0g70RLeeKtfhzF8vX7RzwwWTxlXCojCthuqKdMbx/8WEwZsdDzuJ8OjbPEiLiV3ImO2rgRRftZxNw==} peerDependencies: react: ^18.2.0 react-dom: ^18.2.0 dependencies: - '@calcom/embed-core': 1.3.2 - '@calcom/embed-snippet': 1.1.2 + '@calcom/embed-core': 1.3.3 + '@calcom/embed-snippet': 1.1.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false - /@calcom/embed-snippet@1.1.2: - resolution: {integrity: sha512-UKz4BRyxWLPfCIr7FfZP2Aa8w3ZMXcfwc3frCjNfWphJvJjaCLi0nAUBXFx6ooIPhVkbzvelnkllbqigZRZPiA==} - dependencies: - '@calcom/embed-core': 1.3.2 - dev: false - /@calcom/embed-snippet@1.1.3: resolution: {integrity: sha512-whtpkc54btyIIDfCXsCP7BN8wE3GGgh8cTX5JiprvbcHaej+OEUcuMuhMcLlBersMADwGENpFrlB6AhSJfEA/Q==} dependencies: '@calcom/embed-core': 1.3.3 - dev: true /@changesets/apply-release-plan@7.0.0: resolution: {integrity: sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==}