From febe62b4f8dfceec6528f7280997a06381c53e4b Mon Sep 17 00:00:00 2001
From: Jacob Pleiness <jacob.pleiness@sourcegraph.com>
Date: Tue, 18 Feb 2025 14:13:21 -0500
Subject: [PATCH 1/4] feat(rel): add syntactic code intel worker service

---
 docker-compose/docker-compose.yaml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 4ba83ab26..2be06236a 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -388,6 +388,32 @@ services:
       - sourcegraph
     restart: always
 
+  # Description: High level syntax analysis
+  #
+  # Disk: none
+  # Ports exposed to other Sourcegraph services: 3188/TCP
+  # Ports exposed to the public internet: none
+  #
+  syntactic-code-intel-worker:
+    container_name: syntactic-code-intel-worker
+    image: 'index.docker.io/sourcegraph/syntactic-code-intel-worker:6.1.1295@sha256:c6e2b097b8f16394e339588e208c43587f1fa6a35cb44e9759622c448ddc1445'
+    cpus: 2
+    mem_limit: '4g'
+    environment:
+      - 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
+      - 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore'
+      - 'PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000'
+      - 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317'
+    healthcheck:
+      test: "wget -q 'http://127.0.0.1:3188/healthz' -O /dev/null || exit 1"
+      interval: 5s
+      timeout: 15s
+      retries: 3
+      start_period: 60s
+    networks:
+      - sourcegraph
+    restart: always
+
   # Description: Backend for syntax highlighting operations.
   #
   # Disk: none

From d49d846788daa50e7f9facc51168b104724057f8 Mon Sep 17 00:00:00 2001
From: Anton Sviridov <anton.sviridov@sourcegraph.com>
Date: Thu, 6 Mar 2025 10:01:41 +0000
Subject: [PATCH 2/4] Explicitly set syntactic worker listen address

---
 docker-compose/docker-compose.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 2be06236a..49cf7192a 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -404,6 +404,7 @@ services:
       - 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore'
       - 'PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000'
       - 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317'
+      - 'SYNTACTIC_CODE_INTEL_WORKER_ADDR=127.0.0.1:3288'
     healthcheck:
       test: "wget -q 'http://127.0.0.1:3188/healthz' -O /dev/null || exit 1"
       interval: 5s

From 5c1ad7a1d0062820ac3e70086d72f8b5e1662ee8 Mon Sep 17 00:00:00 2001
From: Anton Sviridov <anton.sviridov@sourcegraph.com>
Date: Thu, 6 Mar 2025 10:01:53 +0000
Subject: [PATCH 3/4] Fix syntactic worker healthcheck

---
 docker-compose/docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 49cf7192a..c2a3533a2 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -406,7 +406,7 @@ services:
       - 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317'
       - 'SYNTACTIC_CODE_INTEL_WORKER_ADDR=127.0.0.1:3288'
     healthcheck:
-      test: "wget -q 'http://127.0.0.1:3188/healthz' -O /dev/null || exit 1"
+      test: "wget -q 'http://127.0.0.1:3288/healthz' -O /dev/null || exit 1"
       interval: 5s
       timeout: 15s
       retries: 3

From cf3195592a8692995b89dd552fe39e3fa265d77b Mon Sep 17 00:00:00 2001
From: Anton Sviridov <anton.sviridov@sourcegraph.com>
Date: Mon, 10 Mar 2025 09:41:52 +0000
Subject: [PATCH 4/4] Fix tests

---
 docker-compose/docker-compose.yaml | 2 +-
 test/smoke-test.sh                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index c2a3533a2..31816dcb9 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -404,7 +404,7 @@ services:
       - 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore'
       - 'PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000'
       - 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317'
-      - 'SYNTACTIC_CODE_INTEL_WORKER_ADDR=127.0.0.1:3288'
+      - 'SYNTACTIC_CODE_INTEL_WORKER_ADDR=:3288'
     healthcheck:
       test: "wget -q 'http://127.0.0.1:3288/healthz' -O /dev/null || exit 1"
       interval: 5s
diff --git a/test/smoke-test.sh b/test/smoke-test.sh
index 5b9f111f7..feb13bec6 100755
--- a/test/smoke-test.sh
+++ b/test/smoke-test.sh
@@ -15,7 +15,7 @@ deploy_sourcegraph() {
 		expect_containers="25"
 	elif [[ "$TEST_TYPE" == "docker-compose-test" ]]; then
 		docker-compose --file docker-compose/docker-compose.yaml up -d -t 600
-		expect_containers="26"
+		expect_containers="27"
 	fi
 
 	echo "Giving containers 90s to start..."