From 6f8ffabfdcc740810e529706bb8a81974bb47509 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 9 Jan 2022 14:09:13 -0500 Subject: [PATCH] ensured webapp builds --- .dockerignore | 4 ++++ Dockerfile | 3 +-- webapp/package.json | 9 +++++---- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..a9b8cf0 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +webapp/node_modules +webapp/build +webapp/.storybook +webapp/.vscode diff --git a/Dockerfile b/Dockerfile index ddb0a90..9609186 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,9 +22,8 @@ RUN pip install . /data # <--- Webapp Build --> COPY webapp/ /data/web-builder RUN cd /data/web-builder && \ - npm i -g yarn react-scripts \ npm install && \ - yarn build && \ + npm run build && \ cp -r /data/web-builder/build /data/web && \ rm -rf /data/web-builder diff --git a/webapp/package.json b/webapp/package.json index 5ab8c02..329173c 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -4,9 +4,6 @@ "private": true, "homepage": "/web", "dependencies": { - "@testing-library/jest-dom": "^5.11.4", - "@testing-library/react": "^11.1.0", - "@testing-library/user-event": "^12.1.10", "@types/jest": "^26.0.15", "@types/node": "^12.0.0", "@types/react": "^17.0.0", @@ -20,7 +17,8 @@ "react-scripts": "4.0.3", "theming": "^3.3.0", "typescript": "^4.1.2", - "web-vitals": "^1.0.1" + "web-vitals": "^1.0.1", + "yarn": "^1.22.17" }, "scripts": { "start": "react-scripts start", @@ -59,6 +57,9 @@ ] }, "devDependencies": { + "@testing-library/jest-dom": "^5.11.4", + "@testing-library/react": "^11.1.0", + "@testing-library/user-event": "^12.1.10", "@storybook/addon-actions": "^6.3.12", "@storybook/addon-essentials": "^6.3.12", "@storybook/addon-links": "^6.3.12",