build args & env vars adjusted.

Signed-off-by: Michael Valdron <[email protected]>

Author: michael-valdron

.github/workflows/pushimage-next.yml

@@ -23,8 +23,6 @@ on:
 jobs:
   registryViewerBuild:
     runs-on: ubuntu-latest
-    env:
-      NEXT_PUBLIC_ANALYTICS_WRITE_KEY: ${{ secrets.NEXT_PUBLIC_ANALYTICS_WRITE_KEY }}
     steps:
       - name: Check out devfile web source code
         uses: actions/checkout@v3

Dockerfile

@@ -33,41 +33,32 @@ RUN \
 
 # Rebuild the source code only when needed
 FROM node:16-alpine AS builder
-ARG NEXT_PUBLIC_BASE_PATH=/
-ARG NEXT_PUBLIC_DEVFILE_REGISTRIES=
-ARG NEXT_PUBLIC_ANALYTICS_WRITE_KEY=
+ARG BASE_PATH=
 ARG PROJECT_NAME
 # Add bash to support local scripts
 RUN apk add --no-cache bash
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
-ENV NEXT_PUBLIC_BASE_PATH ${NEXT_PUBLIC_BASE_PATH}
-ENV NEXT_PUBLIC_DEVFILE_REGISTRIES ${NEXT_PUBLIC_DEVFILE_REGISTRIES}
-ENV NEXT_PUBLIC_ANALYTICS_WRITE_KEY ${NEXT_PUBLIC_ANALYTICS_WRITE_KEY}
-
 # Next.js collects completely anonymous telemetry data about general usage.
 # Learn more here: https://nextjs.org/telemetry
 # Uncomment the following line in case you want to disable telemetry during the build.
 ENV NEXT_TELEMETRY_DISABLED 1
 
-RUN yarn nx run ${PROJECT_NAME}:postexport --skip-nx-cache
+RUN NEXT_PUBLIC_BASE_PATH=${BASE_PATH} yarn nx run ${PROJECT_NAME}:postexport --skip-nx-cache
 
 # Production image, copy all the files and run next
 FROM node:16-alpine AS runner
-ARG NEXT_PUBLIC_BASE_PATH=/
-ARG NEXT_PUBLIC_DEVFILE_REGISTRIES=
-ARG NEXT_PUBLIC_ANALYTICS_WRITE_KEY=
+ARG BASE_PATH=
 ARG PROJECT_NAME
 WORKDIR /app
 
 ENV NODE_ENV production
-ENV NEXT_PUBLIC_BASE_PATH ${NEXT_PUBLIC_BASE_PATH}
-ENV NEXT_PUBLIC_DEVFILE_REGISTRIES ${NEXT_PUBLIC_DEVFILE_REGISTRIES}
-ENV NEXT_PUBLIC_ANALYTICS_WRITE_KEY ${NEXT_PUBLIC_ANALYTICS_WRITE_KEY}
 # Uncomment the following line in case you want to disable telemetry during runtime.
 ENV NEXT_TELEMETRY_DISABLED 1
+# Sets base path of registry viewer
+ENV NEXT_PUBLIC_BASE_PATH=${BASE_PATH}
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs

scripts/build_viewer.sh

@@ -14,8 +14,13 @@
 
 #!/usr/bin/env bash
 
-docker build -t registry-viewer . \
-    --build-arg PROJECT_NAME=registry-viewer \
-    --build-arg NEXT_PUBLIC_BASE_PATH=/viewer \
-    --build-arg NEXT_PUBLIC_DEVFILE_REGISTRIES="${NEXT_PUBLIC_DEVFILE_REGISTRIES:-""}" \
-    --build-arg NEXT_PUBLIC_ANALYTICS_WRITE_KEY=${NEXT_PUBLIC_ANALYTICS_WRITE_KEY:-""}
+# Environment Variables:
+#
+# NEXT_PUBLIC_DEVFILE_REGISTRIES - JSON array of objects which define a registry server source, 
+#   default: '[{"name": "Community", "link": "https://registry.stage.devfile.io"}]'
+#
+# NEXT_PUBLIC_ANALYTICS_WRITE_KEY - Analytics write key for telemetry, default: blank
+#
+
+docker build -t registry-viewer . --build-arg PROJECT_NAME=registry-viewer \
+    --build-arg BASE_PATH=/viewer