build: 👷 New compose file and entrypoints

baptisteArno · May 25, 2022 · 5d786f5 · 5d786f5 · vercel · May 25, 2022
1 parent 4a5a92b
commit 5d786f5
Show file tree

Hide file tree

Showing 44 changed files with 288 additions and 113 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,6 @@ node_modules
 .next
 .env
 .env.local
-.env.production
 workspace.code-workspace
 .DS_Store
 .turbo
@@ -18,6 +17,8 @@ test-results
 build
 firebaseServiceAccount.json
 
+.env.production
+
 # Wordpress
 .svn
 tags
diff --git a/Dockerfile b/Dockerfile
@@ -17,6 +17,7 @@ RUN yarn install --frozen-lockfile
 FROM base AS builder
 COPY --from=installer /app/ .
 COPY --from=pruner /app/out/full/ .
+COPY ./apps/${SCOPE}/.env.docker ./apps/${SCOPE}/.env.production
 RUN apt-get -qy update && apt-get -qy install openssl
 RUN yarn turbo run build --scope=${SCOPE} --include-dependencies --no-deps
 RUN find . -name node_modules | xargs rm -rf
@@ -31,7 +32,14 @@ COPY --from=builder /app/apps/${SCOPE}/public ./public
 COPY --from=builder /app/apps/${SCOPE}/package.json ./package.json
 COPY --from=builder /app/apps/${SCOPE}/.next/standalone ./
 COPY --from=builder /app/apps/${SCOPE}/.next/static ./.next/static
+COPY --from=builder /app/apps/${SCOPE}/.env.docker ./.env.production
 RUN apt-get -qy update && apt-get -qy install openssl
+
+COPY entrypoint.sh ./
+COPY ${SCOPE}-entrypoint.sh ./
+RUN chmod +x ./${SCOPE}-entrypoint.sh
+RUN chmod +x ./entrypoint.sh
+ENTRYPOINT ./${SCOPE}-entrypoint.sh
+
 EXPOSE 3000
-ENV PORT 3000
-CMD ["node", "server.js"]
+ENV PORT 3000
diff --git a/apps/builder/.env.docker b/apps/builder/.env.docker
@@ -0,0 +1,13 @@
+# Don't edit this file
+NEXT_PUBLIC_VIEWER_URL=DOCKER_PUBLIC_VIEWER_URL
+NEXT_PUBLIC_SMTP_FROM=DOCKER_NEXT_PUBLIC_SMTP_FROM
+NEXT_PUBLIC_SMTP_AUTH_DISABLED=DOCKER_NEXT_PUBLIC_SMTP_AUTH_DISABLED
+NEXT_PUBLIC_GOOGLE_CLIENT_ID=DOCKER_NEXT_PUBLIC_GOOGLE_CLIENT_ID
+NEXT_PUBLIC_GOOGLE_API_KEY=DOCKER_NEXT_PUBLIC_GOOGLE_API_KEY
+NEXT_PUBLIC_GITHUB_CLIENT_ID=DOCKER_NEXT_PUBLIC_GITHUB_CLIENT_ID
+NEXT_PUBLIC_GITLAB_CLIENT_ID=DOCKER_NEXT_PUBLIC_GITLAB_CLIENT_ID
+NEXT_PUBLIC_GITLAB_NAME=DOCKER_NEXT_PUBLIC_GITLAB_NAME
+NEXT_PUBLIC_FACEBOOK_CLIENT_ID=DOCKER_NEXT_PUBLIC_FACEBOOK_CLIENT_ID
+NEXT_PUBLIC_GIPHY_API_KEY=DOCKER_NEXT_PUBLIC_GIPHY_API_KEY
+NEXT_PUBLIC_STRIPE_PUBLIC_KEY=DOCKER_NEXT_PUBLIC_STRIPE_PUBLIC_KEY
+NEXT_PUBLIC_SENTRY_DSN=DOCKER_NEXT_PUBLIC_SENTRY_DSN
diff --git a/apps/builder/components/auth/SignInForm.tsx b/apps/builder/components/auth/SignInForm.tsx
@@ -14,14 +14,15 @@ import { DividerWithText } from './DividerWithText'
 import { SocialLoginButtons } from './SocialLoginButtons'
 import { useRouter } from 'next/router'
 import { NextChakraLink } from 'components/nextChakra/NextChakraLink'
+import { isEmpty } from 'utils'
 
 const hasNoAuthProvider =
-  (!process.env.NEXT_PUBLIC_SMTP_FROM ||
+  (isEmpty(process.env.NEXT_PUBLIC_SMTP_FROM) ||
     process.env.NEXT_PUBLIC_SMTP_AUTH_DISABLED === 'true') &&
-  !process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID &&
-  !process.env.NEXT_PUBLIC_GITHUB_CLIENT_ID &&
-  !process.env.NEXT_PUBLIC_FACEBOOK_CLIENT_ID &&
-  !process.env.NEXT_PUBLIC_GITLAB_CLIENT_ID
+  isEmpty(process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID) &&
+  isEmpty(process.env.NEXT_PUBLIC_GITHUB_CLIENT_ID) &&
+  isEmpty(process.env.NEXT_PUBLIC_FACEBOOK_CLIENT_ID) &&
+  isEmpty(process.env.NEXT_PUBLIC_GITLAB_CLIENT_ID)
 
 type Props = {
   defaultEmail?: string
@@ -77,7 +78,7 @@ export const SignInForm = ({
   return (
     <Stack spacing="4" w="330px">
       <SocialLoginButtons />
-      {process.env.NEXT_PUBLIC_SMTP_FROM &&
+      {!isEmpty(process.env.NEXT_PUBLIC_SMTP_FROM) &&
         process.env.NEXT_PUBLIC_SMTP_AUTH_DISABLED !== 'true' && (
           <>
             <DividerWithText mt="6">Or with your email</DividerWithText>

diff --git a/apps/builder/components/auth/SocialLoginButtons.tsx b/apps/builder/components/auth/SocialLoginButtons.tsx
@@ -5,6 +5,7 @@ import { useRouter } from 'next/router'
 import React from 'react'
 import { stringify } from 'qs'
 import { FacebookLogo, GoogleLogo, GitlabLogo } from 'assets/logos'
+import { isEmpty } from 'utils'
 
 export const SocialLoginButtons = () => {
   const { query } = useRouter()
@@ -32,7 +33,7 @@ export const SocialLoginButtons = () => {
 
   return (
     <Stack>
-      {process.env.NEXT_PUBLIC_GITHUB_CLIENT_ID && (
+      {!isEmpty(process.env.NEXT_PUBLIC_GITHUB_CLIENT_ID) && (
         <Button
           leftIcon={<GithubIcon />}
           onClick={handleGitHubClick}
@@ -43,7 +44,7 @@ export const SocialLoginButtons = () => {
           Continue with GitHub
         </Button>
       )}
-      {process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID && (
+      {!isEmpty(process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID) && (
         <Button
           leftIcon={<GoogleLogo />}
           onClick={handleGoogleClick}
@@ -54,7 +55,7 @@ export const SocialLoginButtons = () => {
           Continue with Google
         </Button>
       )}
-      {process.env.NEXT_PUBLIC_FACEBOOK_CLIENT_ID && (
+      {!isEmpty(process.env.NEXT_PUBLIC_FACEBOOK_CLIENT_ID) && (
         <Button
           leftIcon={<FacebookLogo />}
           onClick={handleFacebookClick}
@@ -65,15 +66,18 @@ export const SocialLoginButtons = () => {
           Continue with Facebook
         </Button>
       )}
-      {process.env.NEXT_PUBLIC_GITLAB_CLIENT_ID && (
+      {!isEmpty(process.env.NEXT_PUBLIC_GITLAB_CLIENT_ID) && (
         <Button
           leftIcon={<GitlabLogo />}
           onClick={handleGitlabClick}
           data-testid="gitlab"
           isLoading={['loading', 'authenticated'].includes(status)}
           variant="outline"
         >
-          Continue with {process.env.NEXT_PUBLIC_GITLAB_NAME || 'GitLab'}
+          Continue with{' '}
+          {isEmpty(process.env.NEXT_PUBLIC_GITLAB_NAME)
+            ? 'GitLab'
+            : process.env.NEXT_PUBLIC_GITLAB_NAME}
         </Button>
       )}
     </Stack>

diff --git a/apps/builder/components/share/codeSnippets/Chat/EmbedCode.tsx b/apps/builder/components/share/codeSnippets/Chat/EmbedCode.tsx
@@ -5,6 +5,7 @@ import { BubbleParams } from 'typebot-js'
 import { parseInitBubbleCode, typebotJsHtml } from '../params'
 import { useTypebot } from 'contexts/TypebotContext'
 import { CodeEditor } from 'components/shared/CodeEditor'
+import { isEmpty } from 'utils'
 
 type ChatEmbedCodeProps = {
   withStarterVariables?: boolean
@@ -20,8 +21,9 @@ export const ChatEmbedCode = ({
   const snippet = prettier.format(
     createSnippet({
       url: `${
-        process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-        process.env.NEXT_PUBLIC_VIEWER_URL
+        isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+          ? process.env.NEXT_PUBLIC_VIEWER_URL
+          : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
       }/${typebot?.publicId}`,
       button,
       proactiveMessage,

diff --git a/apps/builder/components/share/codeSnippets/Container/EmbedCode.tsx b/apps/builder/components/share/codeSnippets/Container/EmbedCode.tsx
@@ -5,6 +5,7 @@ import { parseInitContainerCode, typebotJsHtml } from '../params'
 import { IframeParams } from 'typebot-js'
 import { useTypebot } from 'contexts/TypebotContext'
 import { CodeEditor } from 'components/shared/CodeEditor'
+import { isEmpty } from 'utils'
 
 type ContainerEmbedCodeProps = {
   widthLabel: string
@@ -22,8 +23,9 @@ export const ContainerEmbedCode = ({
   const snippet = prettier.format(
     parseSnippet({
       url: `${
-        process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-        process.env.NEXT_PUBLIC_VIEWER_URL
+        isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+          ? process.env.NEXT_PUBLIC_VIEWER_URL
+          : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
       }/${typebot?.publicId}`,
       heightLabel,
       widthLabel,

diff --git a/apps/builder/components/share/codeSnippets/Iframe/EmbedCode.tsx b/apps/builder/components/share/codeSnippets/Iframe/EmbedCode.tsx
@@ -1,6 +1,7 @@
 import { FlexProps } from '@chakra-ui/react'
 import { CodeEditor } from 'components/shared/CodeEditor'
 import { useTypebot } from 'contexts/TypebotContext'
+import { isEmpty } from 'utils'
 
 type Props = {
   widthLabel: string
@@ -13,8 +14,9 @@ export const IframeEmbedCode = ({
 }: Props & FlexProps) => {
   const { typebot } = useTypebot()
   const src = `${
-    process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-    process.env.NEXT_PUBLIC_VIEWER_URL
+    isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+      ? process.env.NEXT_PUBLIC_VIEWER_URL
+      : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
   }/${typebot?.publicId}`
   const code = `<iframe src="${src}" width="${widthLabel}" height="${heightLabel}" />`
 

diff --git a/apps/builder/components/share/codeSnippets/Popup/EmbedCode.tsx b/apps/builder/components/share/codeSnippets/Popup/EmbedCode.tsx
@@ -4,6 +4,7 @@ import { useTypebot } from 'contexts/TypebotContext'
 import parserHtml from 'prettier/parser-html'
 import prettier from 'prettier/standalone'
 import { PopupParams } from 'typebot-js'
+import { isEmpty } from 'utils'
 import { parseInitPopupCode, typebotJsHtml } from '../params'
 
 type PopupEmbedCodeProps = {
@@ -17,8 +18,9 @@ export const PopupEmbedCode = ({ delay }: PopupEmbedCodeProps & FlexProps) => {
   const snippet = prettier.format(
     createSnippet({
       url: `${
-        process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-        process.env.NEXT_PUBLIC_VIEWER_URL
+        isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+          ? process.env.NEXT_PUBLIC_VIEWER_URL
+          : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
       }/${typebot?.publicId}`,
       delay,
     }),

diff --git a/apps/builder/components/share/codeSnippets/ReactCode.tsx b/apps/builder/components/share/codeSnippets/ReactCode.tsx
@@ -10,6 +10,7 @@ import parserBabel from 'prettier/parser-babel'
 import prettier from 'prettier/standalone'
 import { CodeEditor } from 'components/shared/CodeEditor'
 import { useTypebot } from 'contexts/TypebotContext'
+import { isEmpty } from 'utils'
 
 type StandardReactDivProps = { widthLabel: string; heightLabel: string }
 export const StandardReactDiv = ({
@@ -20,8 +21,9 @@ export const StandardReactDiv = ({
   const snippet = prettier.format(
     parseContainerSnippet({
       url: `${
-        process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-        process.env.NEXT_PUBLIC_VIEWER_URL
+        isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+          ? process.env.NEXT_PUBLIC_VIEWER_URL
+          : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
       }/${typebot?.publicId}`,
       heightLabel,
       widthLabel,
@@ -71,8 +73,9 @@ export const PopupReactCode = ({ delay }: PopupEmbedCodeProps & FlexProps) => {
   const snippet = prettier.format(
     parsePopupSnippet({
       url: `${
-        process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-        process.env.NEXT_PUBLIC_VIEWER_URL
+        isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+          ? process.env.NEXT_PUBLIC_VIEWER_URL
+          : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
       }/${typebot?.publicId}`,
       delay,
     }),
@@ -121,8 +124,9 @@ export const ChatReactCode = ({
   const snippet = prettier.format(
     parseBubbleSnippet({
       url: `${
-        process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-        process.env.NEXT_PUBLIC_VIEWER_URL
+        isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+          ? process.env.NEXT_PUBLIC_VIEWER_URL
+          : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
       }/${typebot?.publicId}`,
       button,
       proactiveMessage,

diff --git a/apps/builder/components/share/customDomain/CustomDomainModal.tsx b/apps/builder/components/share/customDomain/CustomDomainModal.tsx
@@ -18,6 +18,7 @@ import {
 } from '@chakra-ui/react'
 import { useEffect, useRef, useState } from 'react'
 import { createCustomDomain } from 'services/user'
+import { isEmpty } from 'utils'
 
 const hostnameRegex =
   /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9])$/
@@ -119,8 +120,11 @@ export const CustomDomainModal = ({
                     </Stack>
                     <Stack>
                       <Text fontWeight="bold">Value</Text>
-                      <Text>{process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-                          process.env.NEXT_PUBLIC_VIEWER_URL}</Text>
+                      <Text>
+                        {isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+                          ? process.env.NEXT_PUBLIC_VIEWER_URL
+                          : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL}
+                      </Text>
                     </Stack>
                   </HStack>
                 ) : (

diff --git a/apps/builder/components/share/integrations/modals/GtmModal/GtmInstructions.tsx b/apps/builder/components/share/integrations/modals/GtmModal/GtmInstructions.tsx
@@ -11,6 +11,7 @@ import { PopupEmbedSettings } from 'components/share/codeSnippets/Popup/EmbedSet
 import { CodeEditor } from 'components/shared/CodeEditor'
 import { useState } from 'react'
 import { BubbleParams } from 'typebot-js'
+import { isEmpty } from 'utils'
 import { ModalProps } from '../../EmbedButton'
 
 type GtmInstructionsProps = {
@@ -40,8 +41,9 @@ const StandardInstructions = ({ publicId }: Pick<ModalProps, 'publicId'>) => {
 
   const jsCode = parseInitContainerCode({
     url: `${
-      process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-      process.env.NEXT_PUBLIC_VIEWER_URL
+      isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+        ? process.env.NEXT_PUBLIC_VIEWER_URL
+        : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
     }/${publicId}`,
   })
   const headCode = `${typebotJsHtml}

diff --git a/apps/builder/components/share/integrations/modals/NotionModal.tsx b/apps/builder/components/share/integrations/modals/NotionModal.tsx
@@ -16,6 +16,7 @@ import {
 } from '@chakra-ui/react'
 import { CopyButton } from 'components/shared/buttons/CopyButton'
 import { PublishFirstInfo } from 'components/shared/Info'
+import { isEmpty } from 'utils'
 import { ModalProps } from '../EmbedButton'
 
 export const NotionModal = ({
@@ -45,15 +46,17 @@ export const NotionModal = ({
                   pr="4.5rem"
                   type={'text'}
                   defaultValue={`${
-                    process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-                    process.env.NEXT_PUBLIC_VIEWER_URL
+                    isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+                      ? process.env.NEXT_PUBLIC_VIEWER_URL
+                      : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
                   }/${publicId}`}
                 />
                 <InputRightElement width="4.5rem">
                   <CopyButton
                     textToCopy={`${
-                      process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-                      process.env.NEXT_PUBLIC_VIEWER_URL
+                      isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+                        ? process.env.NEXT_PUBLIC_VIEWER_URL
+                        : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
                     }/${publicId}`}
                   />
                 </InputRightElement>

diff --git a/apps/builder/components/share/integrations/modals/ShopifyModal/ShopifyInstructions.tsx b/apps/builder/components/share/integrations/modals/ShopifyModal/ShopifyInstructions.tsx
@@ -14,6 +14,7 @@ import { BubbleParams } from 'typebot-js'
 import { ModalProps } from '../../EmbedButton'
 import parserHtml from 'prettier/parser-html'
 import prettier from 'prettier/standalone'
+import { isEmpty } from 'utils'
 
 type ShopifyInstructionsProps = {
   type: 'standard' | 'popup' | 'bubble'
@@ -45,8 +46,9 @@ const StandardInstructions = ({ publicId }: Pick<ModalProps, 'publicId'>) => {
 
   const jsCode = parseInitContainerCode({
     url: `${
-      process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-      process.env.NEXT_PUBLIC_VIEWER_URL
+      isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+        ? process.env.NEXT_PUBLIC_VIEWER_URL
+        : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
     }/${publicId}`,
   })
   const headCode = prettier.format(

diff --git a/apps/builder/components/share/integrations/modals/WordpressModal.tsx b/apps/builder/components/share/integrations/modals/WordpressModal.tsx
@@ -17,6 +17,7 @@ import {
 import { ExternalLinkIcon } from 'assets/icons'
 import { CopyButton } from 'components/shared/buttons/CopyButton'
 import { PublishFirstInfo } from 'components/shared/Info'
+import { isEmpty } from 'utils'
 import { ModalProps } from '../EmbedButton'
 
 export const WordpressModal = ({
@@ -54,15 +55,17 @@ export const WordpressModal = ({
                   pr="4.5rem"
                   type={'text'}
                   defaultValue={`${
-                    process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-                    process.env.NEXT_PUBLIC_VIEWER_URL
+                    isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+                      ? process.env.NEXT_PUBLIC_VIEWER_URL
+                      : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
                   }/${publicId}`}
                 />
                 <InputRightElement width="4.5rem">
                   <CopyButton
                     textToCopy={`${
-                      process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL ??
-                      process.env.NEXT_PUBLIC_VIEWER_URL
+                      isEmpty(process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL)
+                        ? process.env.NEXT_PUBLIC_VIEWER_URL
+                        : process.env.NEXT_PUBLIC_VIEWER_INTERNAL_URL
                     }/${publicId}`}
                   />
                 </InputRightElement>