From 2b6889b17cd57d41cadf27f500fd495372699ccc Mon Sep 17 00:00:00 2001 From: Dmitry Gruzd Date: Thu, 6 Jul 2023 19:42:40 +0000 Subject: [PATCH] Add new zoekt-ci-image --- .gitlab/ci/custom.images.yml | 4 ++-- Dockerfile.zoekt-ci-image-1.1 | 2 +- ...le.zoekt-ci-image-1.0 => Dockerfile.zoekt-ci-image-1.2 | 8 +++----- ...ekt-servers-1.1 => run-zoekt-servers-with-new-indexer} | 0 4 files changed, 6 insertions(+), 8 deletions(-) rename Dockerfile.zoekt-ci-image-1.0 => Dockerfile.zoekt-ci-image-1.2 (54%) rename assets/zoekt-ci-image/{run-zoekt-servers-1.1 => run-zoekt-servers-with-new-indexer} (100%) diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml index 3402672..e277d5e 100644 --- a/.gitlab/ci/custom.images.yml +++ b/.gitlab/ci/custom.images.yml @@ -59,10 +59,10 @@ alpine-bash-jq-curl-git: apollo: extends: .build_static_image -zoekt-ci-image-1.0: +zoekt-ci-image-1.1: extends: .build_static_image -zoekt-ci-image-1.1: +zoekt-ci-image-1.2: extends: .build_static_image postgres-12-pgvector-0.4.1: diff --git a/Dockerfile.zoekt-ci-image-1.1 b/Dockerfile.zoekt-ci-image-1.1 index e8531e6..d9cedb2 100644 --- a/Dockerfile.zoekt-ci-image-1.1 +++ b/Dockerfile.zoekt-ci-image-1.1 @@ -16,7 +16,7 @@ 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 +COPY assets/zoekt-ci-image/run-zoekt-servers-with-new-indexer run-zoekt-servers EXPOSE 6060 EXPOSE 6070 diff --git a/Dockerfile.zoekt-ci-image-1.0 b/Dockerfile.zoekt-ci-image-1.2 similarity index 54% rename from Dockerfile.zoekt-ci-image-1.0 rename to Dockerfile.zoekt-ci-image-1.2 index 4360eaa..3aad338 100644 --- a/Dockerfile.zoekt-ci-image-1.0 +++ b/Dockerfile.zoekt-ci-image-1.2 @@ -5,20 +5,18 @@ WORKDIR /usr/src/app RUN apk add git ENV ZOEKT_VERSION=c08faec66fc26a41007b2176fbea86c52b0efe4b +ENV GITLAB_ZOEKT_INDEXER_VERSION=573c68ccac4c6195c46cfd4582221fce2509ea74 RUN apk add go && \ go install github.com/sourcegraph/zoekt/cmd/zoekt-webserver@$ZOEKT_VERSION && \ - go install github.com/sourcegraph/zoekt/cmd/zoekt-git-clone@$ZOEKT_VERSION && \ - go install github.com/sourcegraph/zoekt/cmd/zoekt-git-index@$ZOEKT_VERSION && \ - go install github.com/sourcegraph/zoekt/cmd/zoekt-dynamic-indexserver@$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 -RUN apk add git COPY --from=build /go/bin/* /usr/bin/ -COPY assets/zoekt-ci-image/run-zoekt-servers run-zoekt-servers +COPY assets/zoekt-ci-image/run-zoekt-servers-with-new-indexer run-zoekt-servers EXPOSE 6060 EXPOSE 6070 diff --git a/assets/zoekt-ci-image/run-zoekt-servers-1.1 b/assets/zoekt-ci-image/run-zoekt-servers-with-new-indexer similarity index 100% rename from assets/zoekt-ci-image/run-zoekt-servers-1.1 rename to assets/zoekt-ci-image/run-zoekt-servers-with-new-indexer