diff --git a/.gitlab/ci/custom.images.yml b/.gitlab/ci/custom.images.yml index 9464067..4cf1a7e 100644 --- a/.gitlab/ci/custom.images.yml +++ b/.gitlab/ci/custom.images.yml @@ -65,15 +65,12 @@ alpine-bash-jq-curl-git: apollo: extends: .build_static_image -zoekt-ci-image-1.2: - extends: .build_static_image - -zoekt-ci-image-1.5: - extends: .build_static_image - zoekt-ci-image-1.6: extends: .build_static_image +zoekt-ci-image-1.7: + extends: .build_static_image + postgres-12-pgvector-0.4.1: extends: .build_static_image diff --git a/Dockerfile.zoekt-ci-image-1.2 b/Dockerfile.zoekt-ci-image-1.2 deleted file mode 100644 index 3aad338..0000000 --- a/Dockerfile.zoekt-ci-image-1.2 +++ /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=c08faec66fc26a41007b2176fbea86c52b0efe4b -ENV GITLAB_ZOEKT_INDEXER_VERSION=573c68ccac4c6195c46cfd4582221fce2509ea74 - -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.5 b/Dockerfile.zoekt-ci-image-1.7 similarity index 89% rename from Dockerfile.zoekt-ci-image-1.5 rename to Dockerfile.zoekt-ci-image-1.7 index d22c3ae..ce607aa 100644 --- a/Dockerfile.zoekt-ci-image-1.5 +++ b/Dockerfile.zoekt-ci-image-1.7 @@ -5,7 +5,7 @@ WORKDIR /usr/src/app RUN apk add git ENV ZOEKT_VERSION=fcb279ae404c0aa102121b28257143ad16e77482 -ENV GITLAB_ZOEKT_INDEXER_VERSION=25cbe4df6187d53c451d711f8ef58c3d854d60dc +ENV GITLAB_ZOEKT_INDEXER_VERSION=2ff7245c079d350ac920d92fbcd4d32a078ac4b3 RUN apk add go && \ go install github.com/sourcegraph/zoekt/cmd/zoekt-webserver@$ZOEKT_VERSION && \