From 988e874934dcf0caa060600e843138664fb367c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 2 Oct 2023 13:06:52 +0200 Subject: [PATCH 1/3] Degrade Node version from v20.7.0 to v20.2.0 --- .nvmrc | 2 +- backend/.nvmrc | 2 +- backend/Dockerfile | 2 +- webapp/.nvmrc | 2 +- webapp/Dockerfile | 2 +- webapp/Dockerfile.maintenance | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.nvmrc b/.nvmrc index e2d5feb19..58b8c2a00 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20.7.0 \ No newline at end of file +v20.2.0 \ No newline at end of file diff --git a/backend/.nvmrc b/backend/.nvmrc index e2d5feb19..58b8c2a00 100644 --- a/backend/.nvmrc +++ b/backend/.nvmrc @@ -1 +1 @@ -v20.7.0 \ No newline at end of file +v20.2.0 \ No newline at end of file diff --git a/backend/Dockerfile b/backend/Dockerfile index f3c3a556d..fc6c1f4b3 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BASE (Is pushed to DockerHub for rebranding) ################################### ################################################################################## -FROM node:20.7.0-alpine3.17 as base +FROM node:20.2.0-alpine3.17 as base # ENVs ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame diff --git a/webapp/.nvmrc b/webapp/.nvmrc index e2d5feb19..58b8c2a00 100644 --- a/webapp/.nvmrc +++ b/webapp/.nvmrc @@ -1 +1 @@ -v20.7.0 \ No newline at end of file +v20.2.0 \ No newline at end of file diff --git a/webapp/Dockerfile b/webapp/Dockerfile index 599b0771a..b0ecbdd37 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BASE (Is pushed to DockerHub for rebranding) ################################### ################################################################################## -FROM node:20.7.0-alpine3.17 as base +FROM node:20.2.0-alpine3.17 as base # ENVs ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index 7159b3e04..a6db9e612 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -1,7 +1,7 @@ ################################################################################## # BASE ########################################################################### ################################################################################## -FROM node:20.7.0-alpine3.17 as base +FROM node:20.2.0-alpine3.17 as base # ENVs ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame From 5d2c41d12ec9c892a38d8f8e2325194618fc35e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 2 Oct 2023 13:14:55 +0200 Subject: [PATCH 2/3] Fix Dockerfile labels --- neo4j/Dockerfile | 4 ++-- webapp/Dockerfile | 4 ++-- webapp/Dockerfile.maintenance | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile index a88c16c09..89c45ff66 100644 --- a/neo4j/Dockerfile +++ b/neo4j/Dockerfile @@ -16,11 +16,11 @@ ENV BUILD_COMMIT=$BBUILD_COMMIT # Labels LABEL org.label-schema.build-date="${BUILD_DATE}" -LABEL org.label-schema.name="ocelot.social:backend" +LABEL org.label-schema.name="ocelot.social:neo4j" LABEL org.label-schema.description="Neo4J database of the Social Network Software ocelot.social with preinstalled database constraints and indices" LABEL org.label-schema.usage="https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/README.md" LABEL org.label-schema.url="https://ocelot.social" -LABEL org.label-schema.vcs-url="https://github.com/Ocelot-Social-Community/Ocelot-Social/tree/master/backend" +LABEL org.label-schema.vcs-url="https://github.com/Ocelot-Social-Community/Ocelot-Social/tree/master/neo4j" LABEL org.label-schema.vcs-ref="${BUILD_COMMIT}" LABEL org.label-schema.vendor="ocelot.social Community" LABEL org.label-schema.version="${BUILD_VERSION}" diff --git a/webapp/Dockerfile b/webapp/Dockerfile index b0ecbdd37..c58fec40c 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -22,11 +22,11 @@ ENV PORT="3000" # Labels LABEL org.label-schema.build-date="${BUILD_DATE}" -LABEL org.label-schema.name="ocelot.social:backend" +LABEL org.label-schema.name="ocelot.social:webapp" LABEL org.label-schema.description="Web Frontend of the Social Network Software ocelot.social" LABEL org.label-schema.usage="https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/README.md" LABEL org.label-schema.url="https://ocelot.social" -LABEL org.label-schema.vcs-url="https://github.com/Ocelot-Social-Community/Ocelot-Social/tree/master/backend" +LABEL org.label-schema.vcs-url="https://github.com/Ocelot-Social-Community/Ocelot-Social/tree/master/webapp" LABEL org.label-schema.vcs-ref="${BUILD_COMMIT}" LABEL org.label-schema.vendor="ocelot.social Community" LABEL org.label-schema.version="${BUILD_VERSION}" diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index a6db9e612..7074bd05a 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -22,11 +22,11 @@ ENV PORT="3000" # Labels LABEL org.label-schema.build-date="${BUILD_DATE}" -LABEL org.label-schema.name="ocelot.social:backend" +LABEL org.label-schema.name="ocelot.social:maintenance" LABEL org.label-schema.description="Maintenance page of the Social Network Software ocelot.social" LABEL org.label-schema.usage="https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/README.md" LABEL org.label-schema.url="https://ocelot.social" -LABEL org.label-schema.vcs-url="https://github.com/Ocelot-Social-Community/Ocelot-Social/tree/master/backend" +LABEL org.label-schema.vcs-url="https://github.com/Ocelot-Social-Community/Ocelot-Social/tree/master/webapp" LABEL org.label-schema.vcs-ref="${BUILD_COMMIT}" LABEL org.label-schema.vendor="ocelot.social Community" LABEL org.label-schema.version="${BUILD_VERSION}" From eedc93f7c589a8ff2de65c1252f29aa7ae96c1c2 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 2 Oct 2023 17:01:42 +0200 Subject: [PATCH 3/3] fix cypher statement in unit test --- backend/src/schema/resolvers/users/location.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/schema/resolvers/users/location.spec.ts b/backend/src/schema/resolvers/users/location.spec.ts index 7097002da..de132c2c7 100644 --- a/backend/src/schema/resolvers/users/location.spec.ts +++ b/backend/src/schema/resolvers/users/location.spec.ts @@ -208,7 +208,7 @@ describe('userMiddleware', () => { } await mutate({ mutation: updateUserMutation, variables }) const locations = await neode.cypher( - `MATCH (city:Location)-[:IS_IN]->(state:Location)-[:IS_IN]->(country:Location) return city {.*}, state {.*}, country {.*}`, + `MATCH (city:Location)-[:IS_IN]->(district:Location)-[:IS_IN]->(state:Location)-[:IS_IN]->(country:Location) return city {.*}, state {.*}, country {.*}`, ) expect( locations.records.map((record) => {