Merge pull request #1371 from softrams/modernization

Modernization for Bulwark will include updated packages and ORM corrections.

Author: skewled

.gitignore

@@ -1,5 +1,8 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
+#angular
+/frontend/.angular
+
 # compiled output
 /dist
 /tmp

bulwark_base/Dockerfile

@@ -2,40 +2,40 @@
 # Maintained by Bill Jones
 
 # Start from Alpine Linux for smaller footprint
-FROM alpine:3.12.0
+FROM alpine:latest
 
 # Environmental Items
-ENV NODE_VERSION=14.17.0 \
-    TYPESCRIPT_VERSION=4.0.2 \
-    PUPPETEER_VERSION=5.2.1 \
+ENV NODE_VERSION=20.14.0 \
+    TYPESCRIPT_VERSION=10.9.2 \
+    PUPPETEER_VERSION=23.2.0 \
     PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
     PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
 
 # View template at https://github.com/nodejs/docker-node/blob/master/Dockerfile-alpine.template
 # Setup Bulwark Container User
-RUN addgroup -S bulwark && adduser -S bulwark -G bulwark
+RUN addgroup -S bulwark && adduser -S bulwark -G bulwark -s /bin/sh -D bulwark
 
 # Update Image
 RUN apk upgrade --no-cache -U
 
 # Install Required Packages to Build NodeJS and Puppeter Items
-RUN apk add --no-cache curl make gcc g++ python3 linux-headers binutils-gold gnupg libstdc++ chromium \
+RUN apk add --no-cache --virtual .build-deps-full curl make gcc g++ python3 linux-headers binutils-gold gnupg libstdc++ chromium \
  fontconfig udev ttf-freefont fontconfig pango-dev libxcursor libxdamage cups-libs dbus-libs libxrandr \
- libxscrnsaver libc6-compat nss freetype freetype-dev harfbuzz ca-certificates
+ libxscrnsaver libc6-compat nss freetype freetype-dev harfbuzz ca-certificates libgcc py-setuptools
 
 # Ingest the GPG Keys from https://github.com/nodejs/node#release-keys
-RUN for server in pool.sks-keyservers.net keyserver.pgp.com ha.pool.sks-keyservers.net; do \
+RUN for server in keys.openpgp.org pool.sks-keyservers.net keyserver.pgp.com ha.pool.sks-keyservers.net; do \
     gpg --keyserver $server --recv-keys \
       4ED778F539E3634C779C87C6D7062848A1AB005C \
-      94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-      71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+      141F07595B7B3FFE74309A937405533BE57C7D57 \
+      74F12602B6F1C4E913FAA37AD3A89613643B6201 \
+      DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \
+      CC68F5A3106FF448322E48ED27F5E38D5B0A215F \
       8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+      890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
       C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
-      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-      A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
       108F52B48DB57BB0CC439B2997B01419BD92F80A \
-      B9E2F5981AA6E0CD28160D9FF13993A75599653C && break; \
+      A363A499291CBBC940DD62E41F10027AF002F8B0 && break; \
   done
 
 # Perform nodejs installation
@@ -50,16 +50,15 @@ RUN curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE
  && ./configure \
  && make -j$(getconf _NPROCESSORS_ONLN) V= \
  && make install \
+ && apk del .build-deps-full \
  && cd .. \
  && rm -Rf "node-v$NODE_VERSION" \
- && rm "node-v$NODE_VERSION.tar.gz" SHASUMS256.txt.sig SHASUMS256.txt 
-
+ && rm "node-v$NODE_VERSION.tar.gz" SHASUMS256.txt.sig SHASUMS256.txt \
 # Cleanup
 RUN rm -f "node-v$NODE_VERSION" \
   # smoke tests
   && node --version \
-  && npm --version
-
+  && npm --version \
 # Setup for launch control of Bulwark
 WORKDIR /
 COPY bulwark-entrypoint /usr/local/bin/

docker-compose.yml

@@ -46,7 +46,7 @@ services:
       && npm run start"
 
   bulwark-db:
-    image: mysql:5.7.31
+    image: mysql:9.0.1  # 7.7.31
     container_name: bulwark_db
     environment:
       MYSQL_DATABASE: '${DB_NAME}'

frontend/e2e/tsconfig.e2e.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../out-tsc/app",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es6",
     "types": [
       "jasmine",
       "jasminewd2",