From 08a2884e3ce91a659a91ebf9e979cf63545c4319 Mon Sep 17 00:00:00 2001
From: Dmitry Gruzd <dgruzd@gitlab.com>
Date: Wed, 29 Nov 2023 17:13:00 +0000
Subject: [PATCH] Fix Zoekt CI image. Bump to v1.5

---
 .gitlab/ci/custom.images.yml                  |  5 +---
 Dockerfile.zoekt-ci-image-1.3                 | 24 -------------------
 ...image-1.4 => Dockerfile.zoekt-ci-image-1.5 |  4 +++-
 assets/zoekt-ci-image/run-zoekt-servers       |  5 ----
 assets/zoekt-ci-image/run-zoekt-servers-v1.5  | 13 ++++++++++
 5 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 Dockerfile.zoekt-ci-image-1.3
 rename Dockerfile.zoekt-ci-image-1.4 => Dockerfile.zoekt-ci-image-1.5 (86%)
 delete mode 100755 assets/zoekt-ci-image/run-zoekt-servers
 create mode 100755 assets/zoekt-ci-image/run-zoekt-servers-v1.5

diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml
index d3a41f5..5fb2969 100644
--- a/.gitlab/ci/custom.images.yml
+++ b/.gitlab/ci/custom.images.yml
@@ -62,10 +62,7 @@ apollo:
 zoekt-ci-image-1.2:
   extends: .build_static_image
 
-zoekt-ci-image-1.3:
-  extends: .build_static_image
-
-zoekt-ci-image-1.4:
+zoekt-ci-image-1.5:
   extends: .build_static_image
 
 postgres-12-pgvector-0.4.1:
diff --git a/Dockerfile.zoekt-ci-image-1.3 b/Dockerfile.zoekt-ci-image-1.3
deleted file mode 100644
index 3623460..0000000
--- a/Dockerfile.zoekt-ci-image-1.3
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM golang:1.20.0-alpine3.17 as build
-
-WORKDIR /usr/src/app
-
-RUN apk add git
-
-ENV ZOEKT_VERSION=fcb279ae404c0aa102121b28257143ad16e77482
-ENV GITLAB_ZOEKT_INDEXER_VERSION=266c8da32eeb80a1cd94db16fdd355ccf3fa5827
-
-RUN apk add go && \
-    go install github.com/sourcegraph/zoekt/cmd/zoekt-webserver@$ZOEKT_VERSION && \
-    go install gitlab.com/gitlab-org/gitlab-zoekt-indexer/cmd/gitlab-zoekt-indexer@$GITLAB_ZOEKT_INDEXER_VERSION && \
-    rm -rf /go/pkg /go/src /usr/local/go
-
-FROM alpine:3.17 as main
-
-COPY --from=build /go/bin/* /usr/bin/
-
-COPY assets/zoekt-ci-image/run-zoekt-servers-with-new-indexer run-zoekt-servers
-
-EXPOSE 6060
-EXPOSE 6070
-
-CMD ["sh", "run-zoekt-servers"]
diff --git a/Dockerfile.zoekt-ci-image-1.4 b/Dockerfile.zoekt-ci-image-1.5
similarity index 86%
rename from Dockerfile.zoekt-ci-image-1.4
rename to Dockerfile.zoekt-ci-image-1.5
index f5cd34c..977d50d 100644
--- a/Dockerfile.zoekt-ci-image-1.4
+++ b/Dockerfile.zoekt-ci-image-1.5
@@ -16,7 +16,9 @@ FROM alpine:3.17 as main
 
 COPY --from=build /go/bin/* /usr/bin/
 
-COPY assets/zoekt-ci-image/run-zoekt-servers-with-new-indexer run-zoekt-servers
+COPY assets/zoekt-ci-image/run-zoekt-servers-v1.5 run-zoekt-servers
+
+VOLUME /zoekt/test/index
 
 EXPOSE 6060
 EXPOSE 6070
diff --git a/assets/zoekt-ci-image/run-zoekt-servers b/assets/zoekt-ci-image/run-zoekt-servers
deleted file mode 100755
index 8436361..0000000
--- a/assets/zoekt-ci-image/run-zoekt-servers
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-zoekt-dynamic-indexserver -data_dir zoekt/test/data -index_dir zoekt/test/index -listen :6060 &
-
-zoekt-webserver -index zoekt/test/index -rpc -listen :6070
diff --git a/assets/zoekt-ci-image/run-zoekt-servers-v1.5 b/assets/zoekt-ci-image/run-zoekt-servers-v1.5
new file mode 100755
index 0000000..0c50684
--- /dev/null
+++ b/assets/zoekt-ci-image/run-zoekt-servers-v1.5
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+INDEX_DIR=/zoekt/test/index
+
+gitlab-zoekt-indexer -index_dir $INDEX_DIR -listen :6060 &
+INDEXER_PID=$!
+
+zoekt-webserver -index $INDEX_DIR -rpc -listen :6070 &
+WEBSERVER_PID=$!
+
+# Exit if one of the processes fail
+wait $INDEXER_PID || exit 1
+wait $WEBSERVER_PID || exit 1