Merge branch 'main' into andrea/add-design-tokens-storybook

Author: andre-code

client/Dockerfile

@@ -34,40 +34,20 @@ RUN npm ci --omit=dev
 
 FROM node:22-slim
 
-RUN apt-get update && apt-get upgrade --quiet --assume-yes
+RUN apt-get update && \
+	apt-get upgrade --quiet --assume-yes && \
+	apt-get install tini && \
+	rm -rf /var/lib/apt/lists/*
 
 USER node
 
 WORKDIR /app
 
 COPY package.json package-lock.json server.js /app/
+COPY server/constants.js /app/server/constants.js
 COPY --from=dependencies /app/node_modules /app/node_modules
 COPY --from=builder /app/build /app/build
 COPY --from=builder /app/storybook-static /app/storybook-static
-COPY docker-entrypoint.sh /app/docker-entrypoint.sh
-COPY scripts/generate_sitemap.sh /app/scripts/generate_sitemap.sh
-
-# Set up the config files written by docker-entrypoint
-USER root
-RUN touch /app/build/client/config.json
-RUN chmod a+r /app/build/client/config.json
-RUN chown node /app/build/client/config.json
-
-RUN touch /app/build/client/robots.txt
-RUN chmod a+r /app/build/client/robots.txt
-RUN chown node /app/build/client/robots.txt
-
-RUN touch /app/build/client/sitemap.xml
-RUN chmod a+r /app/build/client/sitemap.xml
-RUN chown node /app/build/client/sitemap.xml
-
-RUN touch /app/build/client/privacy-statement.md
-RUN chmod a+r /app/build/client/privacy-statement.md
-RUN chown node /app/build/client/privacy-statement.md
-
-RUN touch /app/build/client/terms-of-use.md
-RUN chmod a+r /app/build/client/terms-of-use.md
-RUN chown node /app/build/client/terms-of-use.md
 
 USER node
 
@@ -76,5 +56,6 @@ ENV PORT=8080
 ARG SHORT_SHA
 ENV RENKU_UI_SHORT_SHA=$SHORT_SHA
 
-ENTRYPOINT ["/bin/bash", "/app/docker-entrypoint.sh"]
+# NOTE: Without tini the node process does not respond to interrupt signals to stop
+ENTRYPOINT ["tini", "-g", "--"]
 CMD ["node", "/app/server.js"]

client/docker-entrypoint.sh

@@ -1,6 +1,6 @@
 {
   "name": "renku-ui",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "private": true,
   "scripts": {
     "start": "react-router dev --port 3000",

client/nginx.vh.default.conf

@@ -1,6 +1,13 @@
 import compression from "compression";
 import express from "express";
 import morgan from "morgan";
+import {
+  CONFIG_JSON,
+  ROBOTS,
+  SAMPLE_PRIVACY_CONTENT,
+  SAMPLE_TERMS_CONTENT,
+  SITEMAP,
+} from "./server/constants.js";
 
 const BUILD_PATH = "./build/server/index.js";
 const DEVELOPMENT = process.env.NODE_ENV === "development";
@@ -26,6 +33,30 @@ app.use(
   express.static("build/client/assets", { immutable: true, maxAge: "1y" })
 );
 
+//Configuration and miscellaneous files
+app.get("/config.json", (_, res) => {
+  res.json(CONFIG_JSON);
+});
+app.get("/sitemap.xml", (_, res) => {
+  res.setHeader("Content-Type", "application/xml");
+  res.send(SITEMAP);
+});
+app.get("/robots.txt", (_, res) => {
+  res.send(ROBOTS);
+});
+if (CONFIG_JSON.TERMS_PAGES_ENABLED) {
+  app.get("/terms-of-use.md", (_, res) => {
+    CONFIG_JSON.TERMS_CONTENT.length > 0
+      ? res.send(CONFIG_JSON.TERMS_CONTENT)
+      : res.send(SAMPLE_TERMS_CONTENT);
+  });
+  app.get("/privacy-statement.md", (_, res) => {
+    CONFIG_JSON.PRIVACY_CONTENT.length > 0
+      ? res.send(CONFIG_JSON.PRIVACY_CONTENT)
+      : res.send(SAMPLE_PRIVACY_CONTENT);
+  });
+}
+
 // Logging
 app.use(morgan("tiny"));