Merge pull request #62 from visulate/pgoldtho/security-updates

Pgoldtho/security updates
visulate · Mar 19, 2022 · 23bbfcc · 23bbfcc
2 parents a728b7e + c090935
commit 23bbfcc
Show file tree

Hide file tree

Showing 5 changed files with 18,856 additions and 34,826 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,21 +1,16 @@
 # Build the Vue UI
-FROM node:current-alpine as vue-ui
-ENV  NODE_OPTIONS=--openssl-legacy-provider
 
-COPY /ui /ui
+FROM node:16-alpine as vue-ui
+COPY /ui ./ui
 WORKDIR /ui
-RUN apk add --no-cache --virtual .gyp \
-        python3 \
-        make \
-        g++ \
-    && npm install \
-    && npm run build \
-    && apk del .gyp
+RUN npm install
+RUN npm run build
 
-FROM georgmoser/ora2pg:23.0
+# Setup express server
+FROM georgmoser/ora2pg:23.1
 
 # Install Node JS
-RUN curl -sL https://deb.nodesource.com/setup_current.x | bash -
+RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
 RUN apt-get install -y nodejs
 
 # Create the project volume

diff --git a/ui/jest.config.js b/ui/jest.config.js
@@ -2,7 +2,7 @@ module.exports = {
   preset: '@vue/cli-plugin-unit-jest',
   globals: {},
   transform: {
-    '^.+\\.vue$': 'vue-jest',
+    '^.+\\.vue$': '@vue/vue3-jest',
     '^.+\\js$': 'babel-jest'
   },
   moduleFileExtensions: ['vue', 'js', 'json', 'jsx', 'ts', 'tsx', 'node']