From 9444e0cc67c67e3759d52cf91135aabee0c716d9 Mon Sep 17 00:00:00 2001 From: Lucas Smith Date: Wed, 22 Nov 2023 16:26:39 +1100 Subject: [PATCH] fix: docker build requires smtp host (#672) set a default for smtp host and add an action for testing docker builds on each pull request --- .github/workflows/ci.yml | 17 +++++++++++++++-- apps/marketing/package.json | 1 + apps/web/package.json | 1 + .../(dashboard)/layout/desktop-nav.tsx | 4 +++- package-lock.json | 2 ++ packages/email/mailer.ts | 6 +----- 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 725bdac93..fa29ae591 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,8 @@ env: HUSKY: 0 jobs: - build: - name: Build + build_app: + name: Build App runs-on: ubuntu-latest steps: - name: Checkout @@ -37,3 +37,16 @@ jobs: - name: Build run: npm run build + + build_docker: + name: Build Docker Image + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 2 + + - name: Build Docker Image + run: ./docker/build.sh + diff --git a/apps/marketing/package.json b/apps/marketing/package.json index cc49f85a4..ab72ce6c8 100644 --- a/apps/marketing/package.json +++ b/apps/marketing/package.json @@ -13,6 +13,7 @@ "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs" }, "dependencies": { + "@documenso/assets": "*", "@documenso/lib": "*", "@documenso/tailwind-config": "*", "@documenso/trpc": "*", diff --git a/apps/web/package.json b/apps/web/package.json index d96fc6a9c..aed5aef06 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -13,6 +13,7 @@ "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs" }, "dependencies": { + "@documenso/assets": "*", "@documenso/ee": "*", "@documenso/lib": "*", "@documenso/prisma": "*", diff --git a/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx b/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx index a78c69704..01bdec657 100644 --- a/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx +++ b/apps/web/src/components/(dashboard)/layout/desktop-nav.tsx @@ -16,7 +16,9 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => { // const pathname = usePathname(); const [open, setOpen] = useState(false); - const isMacOS = /Macintosh|Mac\s+OS\s+X/i.test(navigator?.userAgent || 'unknown'); + const userAgent = typeof navigator !== 'undefined' ? navigator.userAgent : 'unknown'; + + const isMacOS = /Macintosh|Mac\s+OS\s+X/i.test(userAgent); const modifierKey = isMacOS ? '⌘' : 'Ctrl'; return ( diff --git a/package-lock.json b/package-lock.json index 17fa736b2..f7d0e2a5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,6 +36,7 @@ "version": "0.1.0", "license": "AGPL-3.0", "dependencies": { + "@documenso/assets": "*", "@documenso/lib": "*", "@documenso/tailwind-config": "*", "@documenso/trpc": "*", @@ -79,6 +80,7 @@ "version": "0.1.0", "license": "AGPL-3.0", "dependencies": { + "@documenso/assets": "*", "@documenso/ee": "*", "@documenso/lib": "*", "@documenso/prisma": "*", diff --git a/packages/email/mailer.ts b/packages/email/mailer.ts index 92a30522c..3956e6a2b 100644 --- a/packages/email/mailer.ts +++ b/packages/email/mailer.ts @@ -42,12 +42,8 @@ const getTransport = () => { }); } - if (!process.env.NEXT_PRIVATE_SMTP_HOST) { - throw new Error('SMTP transport requires NEXT_PRIVATE_SMTP_HOST'); - } - return createTransport({ - host: process.env.NEXT_PRIVATE_SMTP_HOST, + host: process.env.NEXT_PRIVATE_SMTP_HOST ?? 'localhost:2500', port: Number(process.env.NEXT_PRIVATE_SMTP_PORT) || 587, secure: process.env.NEXT_PRIVATE_SMTP_SECURE === 'true', auth: {