mirror of
https://github.com/documenso/documenso.git
synced 2025-11-12 15:53:02 +10:00
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
This commit is contained in:
17
.github/workflows/ci.yml
vendored
17
.github/workflows/ci.yml
vendored
@ -14,8 +14,8 @@ env:
|
|||||||
HUSKY: 0
|
HUSKY: 0
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build_app:
|
||||||
name: Build
|
name: Build App
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
@ -37,3 +37,16 @@ jobs:
|
|||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: npm run 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
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,7 @@
|
|||||||
"copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
|
"copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@documenso/assets": "*",
|
||||||
"@documenso/lib": "*",
|
"@documenso/lib": "*",
|
||||||
"@documenso/tailwind-config": "*",
|
"@documenso/tailwind-config": "*",
|
||||||
"@documenso/trpc": "*",
|
"@documenso/trpc": "*",
|
||||||
|
|||||||
@ -13,6 +13,7 @@
|
|||||||
"copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
|
"copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@documenso/assets": "*",
|
||||||
"@documenso/ee": "*",
|
"@documenso/ee": "*",
|
||||||
"@documenso/lib": "*",
|
"@documenso/lib": "*",
|
||||||
"@documenso/prisma": "*",
|
"@documenso/prisma": "*",
|
||||||
|
|||||||
@ -16,7 +16,9 @@ export const DesktopNav = ({ className, ...props }: DesktopNavProps) => {
|
|||||||
// const pathname = usePathname();
|
// const pathname = usePathname();
|
||||||
const [open, setOpen] = useState(false);
|
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';
|
const modifierKey = isMacOS ? '⌘' : 'Ctrl';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
2
package-lock.json
generated
2
package-lock.json
generated
@ -36,6 +36,7 @@
|
|||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@documenso/assets": "*",
|
||||||
"@documenso/lib": "*",
|
"@documenso/lib": "*",
|
||||||
"@documenso/tailwind-config": "*",
|
"@documenso/tailwind-config": "*",
|
||||||
"@documenso/trpc": "*",
|
"@documenso/trpc": "*",
|
||||||
@ -79,6 +80,7 @@
|
|||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@documenso/assets": "*",
|
||||||
"@documenso/ee": "*",
|
"@documenso/ee": "*",
|
||||||
"@documenso/lib": "*",
|
"@documenso/lib": "*",
|
||||||
"@documenso/prisma": "*",
|
"@documenso/prisma": "*",
|
||||||
|
|||||||
@ -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({
|
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,
|
port: Number(process.env.NEXT_PRIVATE_SMTP_PORT) || 587,
|
||||||
secure: process.env.NEXT_PRIVATE_SMTP_SECURE === 'true',
|
secure: process.env.NEXT_PRIVATE_SMTP_SECURE === 'true',
|
||||||
auth: {
|
auth: {
|
||||||
|
|||||||
Reference in New Issue
Block a user