From 98e67535ad31e2d3dd2853484149471499e3d1b3 Mon Sep 17 00:00:00 2001 From: John Lewis Date: Tue, 4 Oct 2022 19:09:28 -0500 Subject: [PATCH 1/3] update old deps (gyp from python2 to 3, dart sass) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 994f38eaf..e4fee2628 100644 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ "css-loader": "^2.1.1", "file-loader": "^3.0.1", "jquery": "^3.4.1", - "node-gyp": "^4.0.0", - "node-sass": "^4.12.0", + "node-gyp": "^8.0.0", + "sass": "^1.55.0", "popper.js": "^1.15.0", "qrcode": "^1.4.1", "sass-loader": "^7.3.1", From 12c164be0071e2a0acd750c876ba336d2d1a7828 Mon Sep 17 00:00:00 2001 From: John Lewis Date: Tue, 4 Oct 2022 19:09:54 -0500 Subject: [PATCH 2/3] rebuilt dockerfile (using modern node) --- Dockerfile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2bfb53c8..061ee6d0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,17 @@ -FROM python:3 -MAINTAINER Karl Swanson +FROM python:3.9.14-slim-buster -WORKDIR /usr/src/app - -RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - -RUN apt-get install nodejs +RUN apt-get update -y +RUN apt-get install git curl make build-essential -y +RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - +RUN apt-get install nodejs -y +RUN npm install yarn -g +WORKDIR /usr/src/app COPY . . +RUN yarn install --prod RUN pip3 install -r py/requirements.txt -RUN npm install --only=prod -RUN npm run build - -EXPOSE 8058 -CMD ["python3", "py/micboard.py"] +RUN yarn build +CMD ["python", "py/micboard.py"] \ No newline at end of file From c445eb8c4063ebc794d3f416800b6d40f7b77e06 Mon Sep 17 00:00:00 2001 From: John Lewis Date: Tue, 4 Oct 2022 19:10:52 -0500 Subject: [PATCH 3/3] added back maintainer line --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 061ee6d0e..9e981a2e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM python:3.9.14-slim-buster +MAINTAINER Karl Swanson RUN apt-get update -y RUN apt-get install git curl make build-essential -y