Merge pull request #586 from sarbull/main

Docker fix
odpi · Apr 21, 2023 · 0b171e3 · 0b171e3
2 parents dc8ebe1 + 37d8e0c
commit 0b171e3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,8 @@ FROM node:16.13.0 AS builder
 
 WORKDIR /app
 COPY . /app
-RUN npm install && npm run build:docker
+
+RUN npm install && npm run build
 
 # Stage 2 - Containerize
 FROM nginx:1.19.0

diff --git a/about.js b/about.js
@@ -1,8 +1,14 @@
 const fs = require('fs');
 const packageJson = require('./package.json');
-const revision = require('child_process')
+let revision = '';
+
+try {
+  revision = require('child_process')
                   .execSync('git rev-parse HEAD')
                   .toString().trim();
+} catch(e) {
+  revision = 'Revision not found';
+}
 
 let about = {
   name: packageJson.name,

diff --git a/package.json b/package.json
@@ -2,14 +2,13 @@
   "name": "@lfai/egeria-ui",
   "version": "4.1.2",
   "scripts": {
-    "preinstall": "node preinstall.js",
-    "start": "react-scripts start",
     "build": "react-scripts build",
-    "build:docker": "react-scripts build",
+    "eject": "react-scripts eject",
     "lint": "eslint --debug 'src/**/*.{js,jsx,ts,tsx}'",
     "postbuild": "node about.js",
-    "test": "react-scripts test --watchAll=false",
-    "eject": "react-scripts eject"
+    "preinstall": "node preinstall.js",
+    "start": "react-scripts start",
+    "test": "react-scripts test --watchAll=false"
   },
   "eslintConfig": {
     "extends": [