From 4de840f2ea0af41eee8612e1de7d7e532d8e44cc Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 7 Jul 2023 23:09:02 +0200 Subject: [PATCH 1/2] fix build paths --- backend/package.json | 2 +- deployment/scripts/cluster.reseed.sh | 2 +- deployment/src/kubernetes/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/package.json b/backend/package.json index d598ef736..48703b649 100644 --- a/backend/package.json +++ b/backend/package.json @@ -9,7 +9,7 @@ "main": "src/index.ts", "scripts": { "__migrate": "migrate --compiler 'ts:./src/db/compiler.ts' --migrations-dir ./src/db/migrations", - "prod:migrate": "migrate --migrations-dir ./build/db/migrations --store ./build/db/migrate/store.js", + "prod:migrate": "migrate --migrations-dir ./build/src/db/migrations --store ./build/src/db/migrate/store.js", "start": "node build/src/", "build": "tsc && ./scripts/build.copy.files.sh", "dev": "nodemon --exec ts-node src/ -e js,ts,gql", diff --git a/deployment/scripts/cluster.reseed.sh b/deployment/scripts/cluster.reseed.sh index 4d544bfe8..7bd44153b 100755 --- a/deployment/scripts/cluster.reseed.sh +++ b/deployment/scripts/cluster.reseed.sh @@ -15,4 +15,4 @@ echo "Using CONFIGURATION=${CONFIGURATION}" KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml} # clean & seed -kubectl --kubeconfig=${KUBECONFIG} -n default exec -it $(kubectl --kubeconfig=${KUBECONFIG} -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "node --experimental-repl-await build/db/clean.js && node --experimental-repl-await build/db/seed.js" \ No newline at end of file +kubectl --kubeconfig=${KUBECONFIG} -n default exec -it $(kubectl --kubeconfig=${KUBECONFIG} -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "node --experimental-repl-await build/src/db/clean.js && node --experimental-repl-await build/src/db/seed.js" \ No newline at end of file diff --git a/deployment/src/kubernetes/README.md b/deployment/src/kubernetes/README.md index 1c0c8e2d8..126c37e9c 100644 --- a/deployment/src/kubernetes/README.md +++ b/deployment/src/kubernetes/README.md @@ -293,7 +293,7 @@ $ kubectl -n default rollout status deployment/ocelot-neo4j --timeout=240s $ kubectl config get-contexts # reset and seed Neo4j database via backend for staging -$ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "node --experimental-repl-await build/db/clean.js && node --experimental-repl-await build/db/seed.js" +$ kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "node --experimental-repl-await build/src/db/clean.js && node --experimental-repl-await build/src/db/seed.js" ``` From 3a229672d20d5136f9a6c717f008f6de16a0e15a Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 7 Jul 2023 23:09:19 +0200 Subject: [PATCH 2/2] update stage.ocelot.social reference --- deployment/configurations/stage.ocelot.social | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/configurations/stage.ocelot.social b/deployment/configurations/stage.ocelot.social index 3056eec04..02ccccd38 160000 --- a/deployment/configurations/stage.ocelot.social +++ b/deployment/configurations/stage.ocelot.social @@ -1 +1 @@ -Subproject commit 3056eec040cf7a052a5d08ab4cac7129355ab652 +Subproject commit 02ccccd38f72d5f0135234d7e77a030a086b7e8c