From 5fa1b0d8f53b57fd920310c1ae2bd9b7e6997707 Mon Sep 17 00:00:00 2001
From: Terri Chu <tchu@gitlab.com>
Date: Tue, 23 Jan 2024 19:50:05 +0000
Subject: [PATCH] Add a new zoekt image version with updated SHA

---
 .gitlab/ci/custom.images.yml  |  3 +++
 Dockerfile.zoekt-ci-image-1.6 | 26 ++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 Dockerfile.zoekt-ci-image-1.6

diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml
index 5fb2969..2709605 100644
--- a/.gitlab/ci/custom.images.yml
+++ b/.gitlab/ci/custom.images.yml
@@ -65,6 +65,9 @@ zoekt-ci-image-1.2:
 zoekt-ci-image-1.5:
   extends: .build_static_image
 
+zoekt-ci-image-1.6:
+  extends: .build_static_image
+
 postgres-12-pgvector-0.4.1:
   extends: .build_static_image
 
diff --git a/Dockerfile.zoekt-ci-image-1.6 b/Dockerfile.zoekt-ci-image-1.6
new file mode 100644
index 0000000..e48534e
--- /dev/null
+++ b/Dockerfile.zoekt-ci-image-1.6
@@ -0,0 +1,26 @@
+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=d4157552022c937f1b13e3672d6677cbab2326e3
+
+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-v1.5 run-zoekt-servers
+
+VOLUME /zoekt/test/index
+
+EXPOSE 6060
+EXPOSE 6070
+
+CMD ["sh", "run-zoekt-servers"]