Merge hamburg

.dockerignore

@@ -1 +1,3 @@
 nedrex_files
+neo4j
+tests

.github/workflows/docker-publish.yml

@@ -6,8 +6,8 @@ name: Docker
 # documentation.
 
 on:
-  schedule:
-    - cron: '37 8 * * *'
+#  schedule:
+#    - cron: '37 8 * * *'
   push:
     branches: [ "repo4eu_main", "repo4eu_dev" ]
     # Publish semver tags as releases.
@@ -20,11 +20,11 @@ env:
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
+  NEO4J_IMAGE_NAME: ${{ github.repository }}-neo4j
 
 
 jobs:
-  build:
-
+  build-main:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -80,3 +80,52 @@ jobs:
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha
           cache-to: type=gha, mode=max
+
+  build-neo4j:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v2.1.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.0.0
+        with:
+          install: true
+          use: true
+
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3.0.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract Docker metadata for Neo4j
+        id: meta-neo4j
+        uses: docker/metadata-action@v5.0.0
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.NEO4J_IMAGE_NAME }}
+
+      - name: Build and push Neo4j Docker image
+        id: build-and-push-neo4j
+        uses: docker/build-push-action@v5.0.0
+        with:
+          context: ./neo4j
+          file: ./neo4j/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta-neo4j.outputs.tags }}
+          labels: ${{ steps.meta-neo4j.outputs.labels }}
+          #Temporary disabled linux/arm64 because of system library issues
+          # platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

Dockerfile

@@ -56,7 +56,8 @@ RUN touch /var/log/nedrexdb.log
 COPY . ./
 RUN rm -rf cron
 RUN pip install .[dependencies]
-RUN mamba install -c conda-forge urllib3=2.3.0 -y
+
+#RUN mamba install -c conda-forge urllib3=2.3.0 -y
 RUN mamba install -c conda-forge openjdk=17 -y
 
 CMD cron && bash build.sh >> /var/log/nedrexdb.log 2>&1 & tail -f /var/log/nedrexdb.log