Add ollama scenario for local AI testing (#488)

mgruner · web-flow · commit 0cf6c274cae4 · 2025-05-19T10:55:32.000+02:00
diff --git a/.env.dist b/.env.dist
@@ -81,3 +81,9 @@
 
 # Defaults to 9200, set this if you need another value.
 # ELASTICSEARCH_EXPOSE_HTTP_PORT=9200
+
+#############################################
+# scenarios/add-ollama.yml
+#############################################
+
+# OLLAMA_PULL_MODEL=llama3.2
diff --git a/.github/tests/add-ollama.sh b/.github/tests/add-ollama.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# shellcheck source=/dev/null
+. "$(dirname "$0")/include/functions.sh"
+
+check_stack_start
+
+print_heading "check if ollama service is reachable from Zammad"
+railsserver_run_command curl http://ollama:11434/api/version
+print_heading "Success - ollama service is reachable from Zammad"
diff --git a/.github/tests/setup/add-cloudflare-tunnel.sh b/.github/tests/setup/add-cloudflare-tunnel.sh
@@ -6,4 +6,4 @@ docker network create zammad-ci-external-network
 
 echo "CLOUDFLARE_TUNNEL_TOKEN=invalid-token" > .env
 
-docker compose -f docker-compose.yml -f scenarios/add-cloudflare-tunnel.yml up --quiet-pull --detach
+docker compose -f docker-compose.yml -f scenarios/add-cloudflare-tunnel.yml up --pull always --quiet-pull --detach
diff --git a/.github/tests/setup/add-external-network-to-elasticsearch.sh b/.github/tests/setup/add-external-network-to-elasticsearch.sh
@@ -6,4 +6,4 @@ docker network create zammad-ci-external-network
 
 echo "ZAMMAD_ELASTICSEARCH_EXTERNAL_NETWORK=zammad-ci-external-network" > .env
 
-docker compose -f docker-compose.yml -f scenarios/add-external-network-to-elasticsearch.yml up --quiet-pull --detach
+docker compose -f docker-compose.yml -f scenarios/add-external-network-to-elasticsearch.yml up --pull always --quiet-pull --detach
diff --git a/.github/tests/setup/add-external-network-to-nginx.sh b/.github/tests/setup/add-external-network-to-nginx.sh
@@ -6,4 +6,4 @@ docker network create zammad-ci-external-network
 
 echo "ZAMMAD_NGINX_EXTERNAL_NETWORK=zammad-ci-external-network" > .env
 
-docker compose -f docker-compose.yml -f scenarios/add-external-network-to-nginx.yml up --quiet-pull --detach
+docker compose -f docker-compose.yml -f scenarios/add-external-network-to-nginx.yml up --pull always --quiet-pull --detach
diff --git a/.github/tests/setup/add-hostport-to-elasticsearch.sh b/.github/tests/setup/add-hostport-to-elasticsearch.sh
@@ -5,4 +5,4 @@ set -o errexit
 # Use a custom port to verify it is configurable.
 echo "ELASTICSEARCH_EXPOSE_HTTP_PORT=9201" > .env
 
-docker compose -f docker-compose.yml -f scenarios/add-hostport-to-elasticsearch.yml up --quiet-pull --detach
+docker compose -f docker-compose.yml -f scenarios/add-hostport-to-elasticsearch.yml up --pull always --quiet-pull --detach
diff --git a/.github/tests/setup/add-nginx-proxy-manager.sh b/.github/tests/setup/add-nginx-proxy-manager.sh
@@ -2,4 +2,4 @@
 
 set -o errexit
 
-docker compose -f docker-compose.yml -f scenarios/add-nginx-proxy-manager.yml up --quiet-pull --detach
+docker compose -f docker-compose.yml -f scenarios/add-nginx-proxy-manager.yml up --pull always --quiet-pull --detach
diff --git a/.github/tests/setup/add-ollama.sh b/.github/tests/setup/add-ollama.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -o errexit
+
+docker compose -f docker-compose.yml -f scenarios/add-ollama.yml up --pull always --quiet-pull --detach
diff --git a/.github/tests/setup/default.sh b/.github/tests/setup/default.sh
@@ -2,6 +2,6 @@
 
 set -o errexit
 
-docker compose up --quiet-pull --detach
+docker compose up --pull always --quiet-pull --detach
 
 docker compose cp .github/auto_wizard.json zammad-railsserver:/opt/zammad/tmp
diff --git a/.github/tests/setup/disable-backup-service.sh b/.github/tests/setup/disable-backup-service.sh
@@ -2,4 +2,4 @@
 
 set -o errexit
 
-docker compose -f docker-compose.yml -f scenarios/disable-backup-service.yml up --quiet-pull --detach
+docker compose -f docker-compose.yml -f scenarios/disable-backup-service.yml up --pull always --quiet-pull --detach
diff --git a/.github/tests/setup/disable-elasticsearch-service.sh b/.github/tests/setup/disable-elasticsearch-service.sh
@@ -5,4 +5,4 @@ set -o errexit
 # Disable ES initialization in the test because we don't have an external ES service.
 echo "ELASTICSEARCH_ENABLED=false" > .env
 
-docker compose -f docker-compose.yml -f scenarios/disable-elasticsearch-service.yml up --quiet-pull --detach
+docker compose -f docker-compose.yml -f scenarios/disable-elasticsearch-service.yml up --pull always --quiet-pull --detach
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -52,15 +52,13 @@ jobs:
           - add-external-network-to-nginx
           - add-hostport-to-elasticsearch
           - add-nginx-proxy-manager
+          - add-ollama
           - disable-backup-service
           - disable-elasticsearch-service
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Pull docker compose images
-        run: docker compose pull
-
       - name: Set up test environment
         run: .github/tests/setup/${{ matrix.module }}.sh
 
diff --git a/scenarios/add-ollama.yml b/scenarios/add-ollama.yml
@@ -0,0 +1,29 @@
+---
+version: "3.8"
+
+#
+# Adds an ollama service to the stack, for example for local AI tests.
+#
+
+services:
+  ollama-init:
+    image: alpine/curl
+    entrypoint: ["/bin/sh", "-c"]
+    command:
+      - |
+        echo "Pulling model ${OLLAMA_PULL_MODEL:-llama3.2}…"
+        curl --location 'http://ollama:11434/api/pull' --data '{"name": "${OLLAMA_PULL_MODEL:-llama3.2}"}'
+    restart: "no"
+    depends_on:
+      - ollama
+
+  ollama:
+    image: docker.io/ollama/ollama:latest
+    # Do not expose ports, in-stack connectivity from Zammad via 'http://ollama:11434' is sufficient.
+    volumes:
+      - ollama-data:/root/.ollama
+    restart: ${RESTART:-always}
+
+volumes:
+  ollama-data:
+    driver: local

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ docker network create zammad-ci-external-network`
`6`	`6`
`7`	`7`	`echo "CLOUDFLARE_TUNNEL_TOKEN=invalid-token" > .env`
`8`	`8`
`9`		`-docker compose -f docker-compose.yml -f scenarios/add-cloudflare-tunnel.yml up --quiet-pull --detach`
	`9`	`+docker compose -f docker-compose.yml -f scenarios/add-cloudflare-tunnel.yml up --pull always --quiet-pull --detach`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ docker network create zammad-ci-external-network`
`6`	`6`
`7`	`7`	`echo "ZAMMAD_ELASTICSEARCH_EXTERNAL_NETWORK=zammad-ci-external-network" > .env`
`8`	`8`
`9`		`-docker compose -f docker-compose.yml -f scenarios/add-external-network-to-elasticsearch.yml up --quiet-pull --detach`
	`9`	`+docker compose -f docker-compose.yml -f scenarios/add-external-network-to-elasticsearch.yml up --pull always --quiet-pull --detach`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,4 @@ docker network create zammad-ci-external-network`
`6`	`6`
`7`	`7`	`echo "ZAMMAD_NGINX_EXTERNAL_NETWORK=zammad-ci-external-network" > .env`
`8`	`8`
`9`		`-docker compose -f docker-compose.yml -f scenarios/add-external-network-to-nginx.yml up --quiet-pull --detach`
	`9`	`+docker compose -f docker-compose.yml -f scenarios/add-external-network-to-nginx.yml up --pull always --quiet-pull --detach`
Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`set -o errexit`
`4`	`4`
`5`		`-docker compose -f docker-compose.yml -f scenarios/add-nginx-proxy-manager.yml up --quiet-pull --detach`
	`5`	`+docker compose -f docker-compose.yml -f scenarios/add-nginx-proxy-manager.yml up --pull always --quiet-pull --detach`