Merge pull request #3256 from opsmill/dga-20240507-neo4j-community

Upgrade neo4j and make neo4j the default in codespace
opsmill · May 7, 2024 · dfa1f98 · dfa1f98
2 parents a8ae584 + 41b8e22
commit dfa1f98
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/.devcontainer/demo-container/devcontainer.json b/.devcontainer/demo-container/devcontainer.json
@@ -27,7 +27,7 @@
   "remoteUser": "vscode",
   "remoteEnv": {
       "INFRAHUB_SDK_API_TOKEN": "06438eb2-8019-4776-878c-0941b1f1d1ec",
-      "INFRAHUB_DB_TYPE": "memgraph",
+      "INFRAHUB_DB_TYPE": "neo4j",
       "INFRAHUB_IMAGE_VER": "local"
   },
   "forwardPorts": [8000],

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -27,7 +27,7 @@
     "remoteUser": "vscode",
     "remoteEnv": {
         "INFRAHUB_SDK_API_TOKEN": "06438eb2-8019-4776-878c-0941b1f1d1ec",
-        "INFRAHUB_DB_TYPE": "memgraph",
+        "INFRAHUB_DB_TYPE": "neo4j",
         "INFRAHUB_IMAGE_VER": "local"
     },
     "forwardPorts": [8000],

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -105,7 +105,7 @@ services:
       retries: 3
 
   database:
-    image: ${NEO4J_DOCKER_IMAGE:-neo4j:5.18.1-community}
+    image: ${NEO4J_DOCKER_IMAGE:-neo4j:5.19.0-enterprise}
     restart: unless-stopped
     environment:
       - "NEO4J_AUTH=neo4j/admin"

diff --git a/docs/docs/development/backend.mdx b/docs/docs/development/backend.mdx
@@ -30,7 +30,7 @@ export INFRAHUB_SDK_USERNAME=admin
 export INFRAHUB_SDK_PASSWORD=infrahub
 export INFRAHUB_SDK_TIMEOUT=20
 export INFRAHUB_METRICS_PORT=8001
-export INFRAHUB_DB_TYPE=memgraph # Accepts neo4j or memgraph
+export INFRAHUB_DB_TYPE=neo4j # Accepts neo4j or memgraph
 export INFRAHUB_SECURITY_INITIAL_ADMIN_TOKEN="${ADMIN_TOKEN}" # Random string which can be generated using: openssl rand -hex 16
 export INFRAHUB_STORAGE_LOCAL_PATH="${HOME}/Development/infrahub-storage"
 export INFRAHUB_API_CORS_ALLOW_ORIGINS='["http://localhost:8080"]' # Allow frontend/backend communications without CORS issues
@@ -43,7 +43,7 @@ The exported environment variables are very important and must be set before mov
 
 Infrahub uses several external services to work:
 
-* A database such as neo4j or memgraph (faster for local development)
+* A neo4j database
 * A Redis in-memory store
 * A RabbitMQ message broker
 

diff --git a/docs/docs/guides/installation.mdx b/docs/docs/guides/installation.mdx
@@ -15,7 +15,7 @@ The main components are:
 - A **Frontend** written in react.
 - An **API server** written in Python with FastAPI.
 - A **Git agent** to manage the interaction with external Git repositories.
-- A **Graph database** based on `Neo4j` 5.x or `memgraph`.
+- A **Graph database** based on `Neo4j` 5.x.
 - A **Message bus** based on `RabbitMQ`.
 
 Refer to [Architecture](/topics/architecture) for a more in-depth view of the components interaction.

diff --git a/docs/docs/topics/local-demo-environment.mdx b/docs/docs/topics/local-demo-environment.mdx
@@ -24,7 +24,7 @@ It's designed to be controlled by `invoke` using a list of predefined commands.
 
 | Container Name      | Image                                                  | Description                                            |
 | ------------------- | ------------------------------------------------------ | ------------------------------------------------------ |
-| **database**        | memgraph/memgraph <br /> or <br /> neo4j:community     | Graph Database                                         |
+| **database**        | neo4j:community                                        | Graph Database                                         |
 | **message-queue**   | rabbitmq:3.12-management                               | Message bus based on RabbitMQ                          |
 | **cache**           | redis:7.2                                              | Cache based on Redis, mainly used for distributed lock |
 | **infrahub-server** | Dockerfile                                             | Instance of the API server, running GraphQL            |

diff --git a/tasks/shared.py b/tasks/shared.py
@@ -25,7 +25,7 @@ class DatabaseType(str, Enum):
 MEMGRAPH_DOCKER_IMAGE = os.getenv(
     "MEMGRAPH_DOCKER_IMAGE", "memgraph/memgraph-platform:2.14.0-memgraph2.14.0-lab2.11.1-mage1.14"
 )
-NEO4J_DOCKER_IMAGE = os.getenv("NEO4J_DOCKER_IMAGE", "neo4j:5.18.1-enterprise")
+NEO4J_DOCKER_IMAGE = os.getenv("NEO4J_DOCKER_IMAGE", "neo4j:5.19.0-enterprise")
 MESSAGE_QUEUE_DOCKER_IMAGE = os.getenv("MESSAGE_QUEUE_DOCKER_IMAGE", "rabbitmq:3.13.1-management")
 CACHE_DOCKER_IMAGE = os.getenv("CACHE_DOCKER_IMAGE", "redis:7.2.4")