From 1101f8b81dc978fa613e1ff5987b0c36ea24854d Mon Sep 17 00:00:00 2001
From: Dmitry Gruzd <dgruzd@gitlab.com>
Date: Thu, 1 Jun 2023 13:48:46 +0200
Subject: [PATCH] Add zoekt-ci-image v1.1

---
 .gitlab/ci/custom.images.yml                |  3 +++
 Dockerfile.zoekt-ci-image-1.1               | 24 +++++++++++++++++++++
 assets/zoekt-ci-image/run-zoekt-servers-1.1 |  5 +++++
 3 files changed, 32 insertions(+)
 create mode 100644 Dockerfile.zoekt-ci-image-1.1
 create mode 100755 assets/zoekt-ci-image/run-zoekt-servers-1.1

diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml
index 1cf2009..aa0cd5c 100644
--- a/.gitlab/ci/custom.images.yml
+++ b/.gitlab/ci/custom.images.yml
@@ -62,6 +62,9 @@ apollo:
 zoekt-ci-image-1.0:
   extends: .build_static_image
 
+zoekt-ci-image-1.1:
+  extends: .build_static_image
+
 postgres-12-pgvector-0.4.1:
   extends: .build_static_image
 
diff --git a/Dockerfile.zoekt-ci-image-1.1 b/Dockerfile.zoekt-ci-image-1.1
new file mode 100644
index 0000000..e8531e6
--- /dev/null
+++ b/Dockerfile.zoekt-ci-image-1.1
@@ -0,0 +1,24 @@
+FROM golang:1.20.0-alpine3.17 as build
+
+WORKDIR /usr/src/app
+
+RUN apk add git
+
+ENV ZOEKT_VERSION=c08faec66fc26a41007b2176fbea86c52b0efe4b
+ENV GITLAB_ZOEKT_INDEXER_VERSION=4b334179dcfc2226dd9d7e0f5e4f75ede35a6d9d
+
+RUN apk add go && \
+    go install github.com/sourcegraph/zoekt/cmd/zoekt-webserver@$ZOEKT_VERSION && \
+    go install gitlab.com/gitlab-org/search-team/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-1.1 run-zoekt-servers
+
+EXPOSE 6060
+EXPOSE 6070
+
+CMD ["sh", "run-zoekt-servers"]
diff --git a/assets/zoekt-ci-image/run-zoekt-servers-1.1 b/assets/zoekt-ci-image/run-zoekt-servers-1.1
new file mode 100755
index 0000000..8ab6f49
--- /dev/null
+++ b/assets/zoekt-ci-image/run-zoekt-servers-1.1
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+gitlab-zoekt-indexer -index_dir zoekt/test/index -listen :6060 &
+
+zoekt-webserver -index zoekt/test/index -rpc -listen :6070