Merge remote-tracking branch 'upstream/main' into feat/authentik-idp

.env

@@ -0,0 +1,3 @@
+NEXT_PUBLIC_DOCSEARCH_APP_ID=APP_NEXT_PUBLIC_DOCSEARCH_APP_ID
+NEXT_PUBLIC_DOCSEARCH_API_KEY=APP_NEXT_PUBLIC_DOCSEARCH_API_KEY
+NEXT_PUBLIC_DOCSEARCH_INDEX_NAME=APP_NEXT_PUBLIC_DOCSEARCH_INDEX_NAME

docker/Dockerfile

@@ -16,15 +16,17 @@ RUN npm install --production
 # Copy all files
 COPY ./ ./
 
+COPY /docker/entrypoint.sh ./entrypoint.sh
+
 # Build app
 RUN npm run build
 
+RUN chmod u+x /usr/app/entrypoint.sh
+
 # Expose the listening port
 EXPOSE 3000
 
-# Run container as non-root (unprivileged) user
+# apply env variables to the Nextjs .env file
-# The node user is provided in the Node.js Alpine base image
+ENTRYPOINT ["/usr/app/entrypoint.sh"]
-USER node
 
-# Run npm start script with PM2 when container starts
+CMD npm run start
-CMD [ "pm2-runtime", "npm", "--", "start" ]

docker/entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# this script will check for the following NEXT_* environment variables passed via Docker environment (-e) and apply them
+# to the Nextjs.
+# The properties that will be replaced and have to start with APP_ prefix in the .env file
+
+set -ex
+NEXT_PUBLIC_DOCSEARCH_APP_ID=${NEXT_PUBLIC_DOCSEARCH_APP_ID:-"none"}
+NEXT_PUBLIC_DOCSEARCH_API_KEY=${NEXT_PUBLIC_DOCSEARCH_API_KEY:-"none"}
+NEXT_PUBLIC_DOCSEARCH_INDEX_NAME=${NEXT_PUBLIC_DOCSEARCH_INDEX_NAME:"none"}
+
+find /usr/app/.next \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#APP_NEXT_PUBLIC_DOCSEARCH_APP_ID#${NEXT_PUBLIC_DOCSEARCH_APP_ID}#g"
+find /usr/app/.next \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#APP_NEXT_PUBLIC_DOCSEARCH_API_KEY#${NEXT_PUBLIC_DOCSEARCH_API_KEY}#g"
+find /usr/app/.next \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i "s#APP_NEXT_PUBLIC_DOCSEARCH_INDEX_NAME#${NEXT_PUBLIC_DOCSEARCH_INDEX_NAME}#g"
+
+echo "starting Nextjs"
+exec "$@"

next.config.mjs

@@ -1,45 +1,57 @@
 import nextMDX from '@next/mdx'
-import { remarkPlugins } from './mdx/remark.mjs'
+import {remarkPlugins} from './mdx/remark.mjs'
-import { rehypePlugins } from './mdx/rehype.mjs'
+import {rehypePlugins} from './mdx/rehype.mjs'
-import { recmaPlugins } from './mdx/recma.mjs'
+import {recmaPlugins} from './mdx/recma.mjs'
-import rehypeSlug from "rehype-slug";
 
 const withMDX = nextMDX({
-  options: {
+    options: {
-    remarkPlugins,
+        remarkPlugins,
-    // rehypeSlug,
+        // rehypeSlug,
-    rehypePlugins,
+        rehypePlugins,
-    recmaPlugins,
+        recmaPlugins,
-    providerImportSource: '@mdx-js/react',
+        providerImportSource: '@mdx-js/react',
-  },
+    },
 })
 
+
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  reactStrictMode: true,
+    assetPrefix: '/docs-static',
-  pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'mdx'],
+    reactStrictMode: true,
-  experimental: {
+    pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'mdx'],
-    scrollRestoration: true,
+    experimental: {
-  },
+        scrollRestoration: true,
-  redirects: async () => {
+    },
-    return [
+    redirects: async () => {
-      {
+        return [
-        source: '/',
+            {
-        destination: '/docs/introduction',
+                source: '/docs',
-        permanent: true,
+                destination: '/',
-      },
+                permanent: true,
-      {
+            },
-        source: '/docs',
+            {
-        destination: '/docs/introduction',
+                source: '/docs/:path*',
-        permanent: true,
+                destination: '/:path*',
-      },
+                permanent: true,
-      {
+            }
-        source: '/ipa',
+        ]
-        destination: '/ipa/introduction',
+    },
-        permanent: true,
+    rewrites: async () => {
-      },
+        return [
-    ]
+            {
-  }
+                source: '/',
+                destination: '/introduction',
+            },
+            {
+                source: '/api',
+                destination: '/ipa/introduction',
+            },
+            {
+                source: '/api/:path*',
+                destination: '/ipa/:path*',
+            }
+        ]
+    }
 }
 
 export default withMDX(nextConfig)