Updated to latest xregexp

Author: fileformat

Dockerfile

@@ -1,25 +1,46 @@
-FROM node:14 as base
-RUN groupadd -r appuser && \
-	useradd --create-home --gid appuser --home-dir /app --no-log-init --system appuser
+# syntax=docker/dockerfile:1.7-labs
+FROM node:22-bookworm AS base
 
-FROM base AS build
 WORKDIR /app
-USER appuser
-COPY --chown=appuser:appuser . .
-RUN yarn install && \
-	yarn run build
 
-FROM base AS run
+USER root
+
+RUN apt-get update && \
+	apt-get install -y dumb-init
+
+COPY package.json package-lock.json /app/
+RUN npm install --audit=false --fund=false --omit dev
+
+
+#
+# build the app
+#
+FROM base AS builder
+
+COPY . /app/
+
+RUN npm install --audit=false --fund=false
+RUN npm run build
+
+#
+# runner
+#
+FROM gcr.io/distroless/nodejs22-debian12:latest AS runner
+
 ARG COMMIT="(not set)"
 ARG LASTMOD="(not set)"
 ENV COMMIT=$COMMIT
 ENV LASTMOD=$LASTMOD
-WORKDIR /app
-USER appuser
-COPY --chown=appuser:appuser . .
-#COPY --chown=appuser:appuser --from=build /app/dist /app/dist
-RUN yarn install --production
-EXPOSE 4000
-ENV PORT 4000
-CMD ["yarn", "run", "start"]
+ENV NODE_ENV=production
 
+USER nonroot
+COPY --chown=nonroot:nonroot --from=base /usr/bin/dumb-init /usr/bin/dumb-init
+COPY --chown=nonroot:nonroot --from=base /app/node_modules /app/node_modules
+COPY --chown=nonroot:nonroot --from=builder /app/dist /app/dist
+COPY --chown=nonroot:nonroot --exclude=src . /app
+
+WORKDIR /app
+ENV PORT 5000
+ENV HOSTNAME 0.0.0.0
+ENTRYPOINT ["/usr/bin/dumb-init", "--"]
+CMD ["/nodejs/bin/node", "dist/server.js"]

app.yaml

@@ -4,7 +4,14 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-docker build -t regexplanet-xregexp .
+docker build \
+	--build-arg COMMIT=$(git rev-parse --short HEAD) \
+	--build-arg LASTMOD=$(date -u +%Y-%m-%dT%H:%M:%SZ) \
+	--no-cache \
+	--progress plain \
+	--tag regexplanet-xregexp \
+	.
+
 docker run \
 	-it \
 	--publish 4000:4000 \

docker-run.sh

@@ -3,12 +3,11 @@
   "version": "0.0.1",
   "main": "server.js",
   "scripts": {
-    "build": "true",
+    "build": "cp -pr src dist",
     "start": "node server.js"
   },
-  "dependencies": {},
-  "engines": {
-    "node": "14"
+  "dependencies": {
+    "xregexp": "^5.1.1"
   },
   "repository": {
     "url": "https://www.github.com/fileformat/regexplanet-xregexp"

favicon.ico

@@ -2,4 +2,18 @@
 #
 # run the RegexPlanet XRegExp backend locally
 #
-node server.js
+set -o errexit
+set -o pipefail
+set -o nounset
+
+ENVFILE="./.env"
+
+if [ -f "${ENVFILE}" ]
+then
+    echo "INFO: load env file ${ENVFILE}"
+    export $(grep "^[^#]" "${ENVFILE}")
+fi
+
+npm install
+
+node src/server.js

package-lock.json

@@ -4,7 +4,7 @@ var os = require("os");
 var querystring = require('querystring');
 var util = require("util");
 var url = require("url");
-var XRegExp = require('./xregexp-all.js');
+var XRegExp = require('xregexp');
 
 function h(unsafe)
 {
@@ -435,7 +435,7 @@ function serveTest(query, response)
 	response.end();
 }
 
-var port = Number(process.env.PORT || process.env.VCAP_APP_PORT || 8888);
+var port = Number(process.env.PORT || process.env.VCAP_APP_PORT || 4000);
 
 http.createServer(function (request, response)
 	{
@@ -470,7 +470,9 @@ http.createServer(function (request, response)
         }
 		else if (parsedUrl.pathname == '/' || parsedUrl.pathname.lastIndexOf('/index.', 0) === 0 || parsedUrl.pathname.lastIndexOf('/default.', 0) === 0)
 		{
-			redirect(response, "http://www.regexplanet.com/advanced/xregexp/index.html");
+			response.writeHead(404, { "Content-Type": "text/plain" });
+			response.write(`Running XRegExp ${XRegExp.version}`);
+			response.end();
 		}
 		else
 		{