From b62c9bc80c075af6309951929dcdeab2b963ef89 Mon Sep 17 00:00:00 2001 From: Rebecca Graber Date: Wed, 13 Sep 2023 08:37:24 -0400 Subject: [PATCH 1/2] feat: upgrade neo4j image used for coursegraph to support apple silicon --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5fe5c4d61f..0cad99ef28 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,7 +35,7 @@ services: hostname: coursegraph.devstack.edx # Try to keep this in sync with the NEO4J_VERSION declared within # https://github.com/openedx/configuration/blob/master/playbooks/roles/neo4j - image: neo4j:3.5.28 + image: neo4j:5.11.0 networks: default: aliases: From c8d98e8e89e81fe61f35ccc7f3c88af0158d8f68 Mon Sep 17 00:00:00 2001 From: Rebecca Graber Date: Wed, 13 Sep 2023 09:01:10 -0400 Subject: [PATCH 2/2] fixup!: pw needs to be 8 chars --- docker-compose.yml | 2 +- provision-coursegraph.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0cad99ef28..3ad38544f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,7 +48,7 @@ services: stdin_open: true tty: true environment: - NEO4J_AUTH: "neo4j/edx" # Initial username/password for Neo4j Web interface. + NEO4J_AUTH: "neo4j/edxedxedx" # Initial username/password for Neo4j Web interface. devpi: container_name: "edx.${COMPOSE_PROJECT_NAME:-devstack}.devpi" diff --git a/provision-coursegraph.sh b/provision-coursegraph.sh index 4bbc5d0602..b037109ffd 100755 --- a/provision-coursegraph.sh +++ b/provision-coursegraph.sh @@ -17,6 +17,6 @@ docker-compose up -d coursegraph cms sleep 10 # Give Neo4j some time to boot up. echo -e "${GREEN} Updating CMS courses in Coursegraph...${NC}" -docker-compose exec cms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && ./manage.py cms dump_to_neo4j --host coursegraph.devstack.edx --user neo4j --password edx' +docker-compose exec cms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && ./manage.py cms dump_to_neo4j --host coursegraph.devstack.edx --user neo4j --password edxedxedx' echo -e "${GREEN} Coursegraph is now up-to-date with CMS!${NC}"