From fb0e6f5abd2155583486031b889cc90bf88e4fa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 27 May 2019 15:15:13 +0200 Subject: [PATCH 1/2] Use our own fork to workaround #600 for now --- backend/package.json | 2 +- backend/yarn.lock | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/backend/package.json b/backend/package.json index bb3638265f..cce97242ae 100644 --- a/backend/package.json +++ b/backend/package.json @@ -71,7 +71,7 @@ "lodash": "~4.17.11", "ms": "~2.1.1", "neo4j-driver": "~1.7.4", - "neo4j-graphql-js": "~2.6.1", + "neo4j-graphql-js": "git+https://github.com/Human-Connection/neo4j-graphql-js.git#temporary_fixes", "node-fetch": "~2.6.0", "npm-run-all": "~4.1.5", "request": "~2.88.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 9dc17a46d8..e9e03503b2 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5599,10 +5599,9 @@ neo4j-driver@^1.7.3, neo4j-driver@~1.7.4: text-encoding "^0.6.4" uri-js "^4.2.1" -neo4j-graphql-js@~2.6.1: +"neo4j-graphql-js@git+https://github.com/Human-Connection/neo4j-graphql-js.git#temporary_fixes": version "2.6.1" - resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.6.1.tgz#fc25d44d875a73114b6df08259985b555704b9bb" - integrity sha512-bPqzKumlCoHtS2qfPoTcZXrTkdXky210Kdu6Ubh5GhT+84wf+mo4Dzj4nxgDP2UgB77uA/caesIUImrSTLM8yQ== + resolved "git+https://github.com/Human-Connection/neo4j-graphql-js.git#84d529b9ecbc5c284cce4f86238c6d19b192cf0f" dependencies: graphql "^14.2.1" graphql-auth-directives "^2.1.0" From 0e9fce0a07fa9f04019df6b4e6812cbcb3a5d240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Mon, 27 May 2019 15:37:08 +0200 Subject: [PATCH 2/2] Add missing dependency `git` in Dockerfile --- backend/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/Dockerfile b/backend/Dockerfile index 750d284dc8..3b1581b1ea 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -7,6 +7,9 @@ ENV BUILD_COMMIT=$BUILD_COMMIT ARG WORKDIR=/nitro-backend RUN mkdir -p $WORKDIR WORKDIR $WORKDIR + +RUN apk --no-cache add git + COPY package.json yarn.lock ./ COPY .env.template .env CMD ["yarn", "run", "start"]