Update fork to align with upstream (#20)

* fix: package.json & package-lock.json to reduce vulnerabilities (#82)

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-NEXT-9508709

Co-authored-by: snyk-bot <snyk-bot@snyk.io>

* update next dependencies to 15.2.4

* Update README.md (#84)

* update to @gen3/ff 0.10.85 (#85)

* Update README.md (#86)

add unrelated-histories information

* Fix docker start (#88)

* fix Docker not starting

* fix Docker not starting

* update env files (#89)

* Release 0.10.89 (#91)

* update to 0.10.89

* update to 0.10.89

* remove old config files/images

* update ContentDatabase

* update ContentDatabase paths (#93)

* update dockerfile

---------

Co-authored-by: cmlsn <100160785+cmlsn@users.noreply.github.com>
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Shawn O'Connor <shawnoconnor@uchicago.edu>
Co-authored-by: Craig Barnes <craig.barnes@intelligentlight.com>

Author: 5 people

.env.development

@@ -1,2 +1,2 @@
-GEN3_COMMONS_NAME=gen3
+NEXT_PUBLIC_GEN3_COMMONS_NAME=gen3
 NEXT_PUBLIC_GEN3_API=https://qa-vpodc.planx-pla.net

.env.production

@@ -1 +1 @@
-GEN3_COMMONS_NAME=gen3
+NEXT_PUBLIC_GEN3_COMMONS_NAME=gen3

Dockerfile

@@ -1,52 +1,37 @@
-# docker build -t gen3ff .
-# docker run -p 3000:3000 -it gen3ff
-# for Macbook silicon M1/m2 uncomment the following lines and comment quay.io/cdis/ubuntu:20.04:
-#FROM arm64v8/ubuntu:20.04 as build
-
-FROM quay.io/cdis/ubuntu:20.04 AS build
-
-ARG NODE_VERSION=20
-
-ARG BASE_PATH
-ARG NEXT_PUBLIC_PORTAL_BASENAME
-ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
-ENV PATH=$PATH:/home/node/.npm-global/bin
+# docker build -t ff .
+# docker run -p 3000:3000 -it ff
+# Build stage
+FROM node:20-slim AS builder
 
 WORKDIR /gen3
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    libssl1.1 \
-    libgnutls30 \
-    ca-certificates \
-    curl \
-    git \
-    gnupg \
-    && mkdir -p /etc/apt/keyrings \
-    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
-    && apt-get update \
-    && apt-get install -y nodejs \
-    && apt-get clean \
-    && npm install -g npm@10.5.2
-
-RUN  addgroup --system --gid 1001 nextjs && adduser --system --uid 1001 nextjs
-COPY ./package.json ./package-lock.json ./
-COPY ./package-lock.json ./
+COPY ./package.json ./package-lock.json ./next.config.js ./tsconfig.json ./.env.development  ./tailwind.config.js ./postcss.config.js ./start.sh ./.env.production ./
+RUN npm ci
 COPY ./src ./src
 COPY ./public ./public
 COPY ./config ./config
-COPY ./next.config.js ./
-COPY ./tsconfig.json ./
-COPY ./.env.development ./
-COPY ./.env.production ./
-COPY ./tailwind.config.js ./
-COPY ./postcss.config.js ./
 COPY ./start.sh ./
-RUN npm ci
-RUN npm install \
-    "@swc/core" \
-    "@napi-rs/magic-string"
-RUN npm run build
+RUN npm install @swc/core @napi-rs/magic-string && \
+    npm run build
+
+# Production stage
+FROM node:20-slim AS runner
+
+WORKDIR /gen3
+
+RUN addgroup --system --gid 1001 nextjs && \
+    adduser --system --uid 1001 nextjs
+
+COPY --from=builder /gen3/package.json ./
+COPY --from=builder /gen3/node_modules ./node_modules
+COPY --from=builder /gen3/config ./config
+COPY --from=builder /gen3/.next ./.next
+COPY --from=builder /gen3/public ./public
+COPY --from=builder /gen3/start.sh ./start.sh
+RUN mkdir -p /gen3/.next/cache/images
+RUN chmod -R 777 /gen3/.next/cache
+RUN chown nextjs:nextjs /gen3/.next
+
+USER nextjs:nextjs
 ENV PORT=3000
 CMD bash ./start.sh

README.md

@@ -65,7 +65,7 @@ docker build .
 ```
 ## Updating a forked commons
 
-To update a forked commons, the following steps usually apply.
+The following steps usually apply to update a forked commons.
 
 Get the changes from the parent fork:
 ```bash
@@ -76,6 +76,14 @@ Create a branch and merge changes from upstream:
 ```bash
 git merge upstream/main
 ```
-You will see merge conflicts. In general: **take the remote's version for everything except the config files**, as those are customized to the commons config. Resolve the remaining config issues and open a PR.
+If the above has the error message:  "fatal: refusing to merge unrelated histories" error.
+This often happens when the repo was created as a template, not a fork.
+To resolve this, the ```--allow-unrelated-histories``` flag can be used during the merge operation. This flag forces Git to merge the branches despite lacking a common history.
+```bash
+git merge upstream/main --allow-unrelated-histories
+```
+If you use this flag, it is recommended that you carefully review the changes and resolve any conflicts before finalizing the merge.
+
+You will see merge conflicts. In general: **take the remote's version for everything except the config files**, as those are customized to the commons config. Resolve any remaining config issues and open a PR.
 Test the new common by running it locally or in a staging environment.
 

next.config.js

@@ -19,7 +19,6 @@ const withMDX = require('@next/mdx')({
 
 // Next configuration with support for rewrting API to existing common services
 const nextConfig = {
-  output: 'standalone',
   reactStrictMode: true,
   pageExtensions: ['mdx', 'md', 'jsx', 'js', 'tsx', 'ts'],
   basePath: process.env.BASE_PATH || '',