From 383ce50b95e9347c69998ce2eb5747abc3d657fb Mon Sep 17 00:00:00 2001 From: Fletcher Haynes Date: Thu, 8 Sep 2022 11:05:43 -0700 Subject: [PATCH 1/2] Updated Dockerfiles for lattice to use a publicly available container in the GitHub container registry --- Dockerfile | 2 +- lattice/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 25ea9c3f7..992336ee0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG GO_VERSION=latest ### Lattice builder ### ####################### -FROM moleculacorp/nodejs:latest as lattice-builder +FROM ghcr.io/featurebasedb/nodejs:0.0.1 as lattice-builder WORKDIR /lattice COPY lattice/package.json ./ diff --git a/lattice/Dockerfile b/lattice/Dockerfile index 6aa669e54..e0c57c68a 100644 --- a/lattice/Dockerfile +++ b/lattice/Dockerfile @@ -1,4 +1,4 @@ -FROM moleculacorp/nodejs:latest as build +FROM ghcr.io/featurebasedb/nodejs:0.0.1 as build # make sure that your docker settings allow for at least like 4gb of ram, it # takes a lot to build this WORKDIR /lattice From 40d9f9a834f239b78973c8732ef08220d187f473 Mon Sep 17 00:00:00 2001 From: Hoang Pham Date: Thu, 8 Sep 2022 16:20:10 -0500 Subject: [PATCH 2/2] Updated package.json to use @types/react": "^17.0.0 in devDependencies and resolutions --- lattice/package.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lattice/package.json b/lattice/package.json index 48785d4c7..d5a6a0c59 100644 --- a/lattice/package.json +++ b/lattice/package.json @@ -39,9 +39,9 @@ "devDependencies": { "@types/d3-array": "^2.0.0", "@types/jest": "^26.0.4", - "@types/react": "^16.9.41", + "@types/react": "^17.0.0", "@types/react-beautiful-dnd": "^13.0.0", - "@types/react-dom": "^16.9.8", + "@types/react-dom": "^17.0.0", "@types/react-router": "^5.1.8", "@types/react-router-dom": "^5.1.5", "jest-sonar-reporter": "^2.0.0", @@ -50,6 +50,9 @@ "tslint": "^6.1.2", "typescript": "^4.2.2" }, + "resolutions": { + "@types/react": "^17.0.0" + }, "scripts": { "start": "react-scripts start", "build": "react-scripts build",