renamed NEXT_PUBLIC_URL as this var get internally renamed by nextjs

tegonal · Jan 28, 2025 · 4d9c8f2 · 4d9c8f2
1 parent 0711bf9
commit 4d9c8f2
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 37 deletions.
diff --git a/.env.example b/.env.example
@@ -6,7 +6,7 @@ PRINTER_SECRET=secret
 
 # Configure for you public deployment, defaults to http://localhost:3000
 # Doesn't work with gotenbergs demo instance if not pointing to a public visible url
-NEXT_PUBLIC_URL=http://localhost:3000
+PUBLIC_URL=http://localhost:3000
 
 # -- Optional configuration
 

diff --git a/docker-compose/README.md b/docker-compose/README.md
@@ -2,31 +2,3 @@
 This directory provide basic docker compose configurations to setup and start a cv-manager instance. Please adapt configurations to your needs.
 Next to the docker compose file, a default `.env` file is provided. Please read in the [configuration section](https://github.com/tegonal/cv-manager/blob/main/README.md#Configuration) how to adapt those properties.
 
-### Postgres
-Ready to use setup with postgres database adapter and starting the following docker images:
-* caddy as proxy server with self-signed certificates
-* postgres
-* gotenberg
-* pgadmin (optional)
-* pgbackup (optional)
-* cv-manager
-
-#### Secrets
-Adjust at least the following secrets in the `.env` file to ensure you're running the instance with your own secrets:
-* `PAYLOAD_SECRET`
-* `PRINTER_SECRET`
-* `S3_SECRET_ACCESS_KEY`
-* `S3_ACCESS_KEY_ID`
-* `MINIO_ROOT_PASSWORD`
-
-#### Accessible URL
-Adjust the `NEXT_PUBLIC_URL` to the URL under which the instance should be accessible and define the same hostname in the `Caddyfile` configuration. 
-
-### Run the application
-Start the docker image in the desired directory:
-```
-docker compose up -f
-```
-
-Access
-
diff --git a/docker-compose/mongodb/.env b/docker-compose/mongodb/.env
@@ -6,7 +6,7 @@ PRINTER_SECRET=secret
 
 # Configure for you public deployment, defaults to http://localhost:3000
 # Doesn't work with gotenbergs demo instance if not pointing to a public visible url
-NEXT_PUBLIC_URL=http://localhost:3000
+PUBLIC_URL=http://localhost:3000
 
 # -- Optional configuration
 

diff --git a/docker-compose/postgres/.env b/docker-compose/postgres/.env
@@ -6,7 +6,7 @@ PRINTER_SECRET=secret
 
 # Configure for you public deployment, defaults to http://localhost:3000
 # Doesn't work with gotenbergs demo instance if not pointing to a public visible url
-NEXT_PUBLIC_URL=https://localhost
+PUBLIC_URL=https://localhost
 
 # -- Optional configuration
 

diff --git a/docker-compose/postgres/Caddyfile b/docker-compose/postgres/Caddyfile
@@ -1,4 +1,4 @@
-# Replace with the hostname of NEXT_PUBLIC_URL
+# Replace with the hostname of PUBLIC_URL
 localhost {
   reverse_proxy app:3000
 }

diff --git a/docker-compose/postgres/README.md b/docker-compose/postgres/README.md
@@ -0,0 +1,31 @@
+### CV-Manager with Postgres backend
+Ready to use setup with postgres database adapter and starting the following docker images:
+* caddy as proxy server with self-signed certificates
+* postgres
+* gotenberg
+* pgadmin (optional)
+* pgbackup (optional)
+* cv-manager
+
+#### Secrets
+Adjust at least the following secrets in the `.env` file to ensure you're running the instance with your own secrets:
+* `PAYLOAD_SECRET`
+* `PRINTER_SECRET`
+* `S3_SECRET_ACCESS_KEY`
+* `S3_ACCESS_KEY_ID`
+* `MINIO_ROOT_PASSWORD`
+
+#### Accessible URL
+Adjust the `PUBLIC_URL` to the URL under which the instance should be accessible and define the same hostname in the `Caddyfile` configuration.
+
+### Run the application
+Start the docker image in the desired directory:
+```
+docker compose up -f
+```
+Open https://localhost or the provided `PUBLIC_URL` in your browser and log-in with the default credentials:
+
+* Username: [email protected]
+* Password: admin
+
+⚠️ Please change the use account as soon as possible.
diff --git a/docker-compose/sqlite/.env b/docker-compose/sqlite/.env
@@ -6,7 +6,7 @@ PRINTER_SECRET=secret
 
 # Configure for you public deployment, defaults to http://localhost:3000
 # Doesn't work with gotenbergs demo instance if not pointing to a public visible url
-NEXT_PUBLIC_URL=http://localhost:3000
+PUBLIC_URL=http://localhost:3000
 
 # -- Optional configuration
 

diff --git a/payload.config.ts b/payload.config.ts
@@ -61,7 +61,7 @@ const determineDatabase = (url?: string) => {
   }
 };
 
-console.error('Starting server with serverUrl '+process.env.NEXT_PUBLIC_URL)
+console.error('Starting server with serverUrl '+process.env.PUBLIC_URL)
 
 export default buildConfig({
   editor: lexicalEditor(),
@@ -143,7 +143,7 @@ export default buildConfig({
       titleSuffix: '- CV Manager',
     },
   },
-  serverURL: process.env.NEXT_PUBLIC_URL || 'http://localhost:3000',
+  serverURL: process.env.PUBLIC_URL || 'http://localhost:3000',
   email: process.env.SMTP_HOST
     ? nodemailerAdapter({
         defaultFromAddress: process.env.SMTP_FROM_ADDRESS || '',
@@ -188,7 +188,7 @@ export default buildConfig({
       strategyName: 'oauth2',
       useEmailAsIdentity: false,
       enabled: process.env.OAUTH_CLIENT_ID !== undefined,
-      serverURL: process.env.NEXT_PUBLIC_URL || 'http://localhost:3000',
+      serverURL: process.env.PUBLIC_URL || 'http://localhost:3000',
       authCollection: Users.slug,
       clientId: process.env.OAUTH_CLIENT_ID || '',
       clientSecret: process.env.OAUTH_CLIENT_SECRET || '',

diff --git a/src/payload/plugins/cv-pdf-generator/handler.ts b/src/payload/plugins/cv-pdf-generator/handler.ts
@@ -31,7 +31,7 @@ export const requestHandler = async (
   Chromiumly.configure({ endpoint: pluginConfig.gotenbergUrl });
   const urlConverter = new UrlConverter();
 
-  const host = process.env.NEXT_PUBLIC_URL || 'http://host.docker.internal:3000';
+  const host = process.env.PUBLIC_URL || 'http://host.docker.internal:3000';
 
   if (!host) {
     throw new Error('PDF Printer: Host undefined. Aborting..');