Updated Docker Build & Vulnerability Patching

.dockerignore

@@ -3,6 +3,8 @@
 !yarn.lock
 !docker-entrypoint.sh
 !build.sh
+!start.sh
+!default.conf
 !server/*
 !client/*
 **/node_modules/*

Dockerfile

@@ -1,35 +1,33 @@
-FROM node:18-bullseye-slim
-
-USER node:node
+# Stage 1: Build Stage
+FROM node:alpine3.19 AS builder
 
 WORKDIR /home/node
+COPY --chown=node:node . .
 
-# Server environmental variables will be put into server/.env
-ENV MAILGUN_API_KEY=api-key \
-    MAILGUN_DOMAIN=darkwire.io \
-    ABUSE_TO_EMAIL_ADDRESS=abuse@darkwire.io \
-    ABUSE_FROM_EMAIL_ADDRESS="Darkwire <no-reply@darkwire.io>" \
-    CLIENT_DIST_DIRECTORY='client/dist/'\
-    ROOM_HASH_SECRET='some-uuid'\
-    SITE_URL=https://darkwire.io \
-    STORE_BACKEND=memory
-
-# Client configuration will be put into client/.env
-ENV TZ=UTC \
-    VITE_API_HOST=localhost \
-    VITE_API_PROTOCOL=http \
-    VITE_API_PORT=3001 \
-    VITE_COMMIT_SHA=some_sha \
-    VITE_MAX_FILE_SIZE=4
+RUN apk update \
+        && apk add --no-cache bash \
+        && chmod +x /home/node/start.sh \
+        && npm install -g yarn@latest --force \
+        && yarn install --flat --production --no-cache \
+        && yarn build --no-cache \
+        && rm -rf /home/node/node_modules \
+        && yarn cache clean \
+        && yarn autoclean --force
 
-COPY --chown=node:node . .
+# Stage 2: Production Stage
+FROM node:alpine3.19
 
-RUN yarn && yarn build
+WORKDIR /home/node
+COPY --from=builder /home/node .
+
+RUN apk add --no-cache curl nginx openssl && \
+    rm /etc/nginx/http.d/default.conf && \
+    mv /home/node/default.conf /etc/nginx/http.d/ && \
+    chmod +x /home/node/start.sh
 
 STOPSIGNAL SIGINT
-EXPOSE 3001
+
 HEALTHCHECK --interval=30s --timeout=30s --start-period=10s --retries=3 \ 
-    CMD [ "curl", "-f", "${VITE_API_PROTOCOL}://localhost:${VITE_API_PORT}", "||", "exit", "1" ]
+    CMD [ "curl", "-f", "http://localhost:3001", "||", "exit", "1" ]
 
-ENTRYPOINT [ "docker-entrypoint.sh" ]
-CMD ["yarn", "start"]
+CMD ["/home/node/start.sh"]

client/package.json

@@ -13,13 +13,13 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@react-hookz/web": "^20.0.2",
+    "@react-hookz/web": "^20.1.0",
     "@reduxjs/toolkit": "^1.9.1",
     "bootstrap": "^4.6.2",
     "classnames": "^2.3.2",
-    "jquery": "3",
+    "jquery": "^3.7.1",
     "moment": "^2.29.4",
-    "nanoid": "^4.0.0",
+    "nanoid": "^4.0.2",
     "randomcolor": "^0.6.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -32,7 +32,7 @@
     "react-tooltip": "^5.2.0",
     "redux": "^4.2.0",
     "redux-thunk": "^2.4.2",
-    "sanitize-html": "^2.7.3",
+    "sanitize-html": "^2.11.0",
     "socket.io-client": "^4.5.4",
     "tinycon": "^0.6.8"
   },
@@ -45,24 +45,22 @@
     "coverage": "TZ=UTC vitest --coverage --watch=false"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.16.5",
-    "@testing-library/react": "^13.4.0",
+    "@testing-library/jest-dom": "^6.1.6",
+    "@testing-library/react": "^14.1.2",
     "@testing-library/user-event": "^14.4.3",
-    "@typescript-eslint/eslint-plugin": "^5.46.0",
-    "@typescript-eslint/parser": "^5.46.0",
-    "@vitejs/plugin-react": "^3.0.0",
-    "@vitest/coverage-istanbul": "^0.25.7",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
+    "@typescript-eslint/parser": "^6.16.0",
+    "@vitejs/plugin-react": "^4.2.1",
     "eslint": "^8.29.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.2",
     "eslint-plugin-react": "^7.31.11",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jest-environment-jsdom-sixteen": "^1.0.3",
     "jest-fetch-mock": "^3.0.3",
-    "prettier": "^2.0.5",
+    "prettier": "^3.1.1",
     "sass": "^1.56.2",
-    "typescript": "^4.9.4",
-    "vitest": "^0.25.7",
+    "typescript": "^5.3.3",
+    "vitest": "^1.1.0",
     "vitest-fetch-mock": "^0.2.1"
   },
   "browserslist": {

client/public/manifest.json

@@ -14,4 +14,4 @@
   "background_color": "#ffffff",
   "scope": "/",
   "description": "Secure and encrypted web chat with Darkwire.io"
-}
+}

client/src/stylesheets/app.sass

@@ -25,6 +25,7 @@ button
 button.btn-link.btn-plain
   padding: 0px
   color: white
+  background-color: black
   text-decoration: none
   color: white
   &:hover, &:focus