NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-zoekt-ci-image' into 'master'

Browse source 
Fix Zoekt CI image. Bump to v1.5

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/752

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Dmitry Gruzd <dgruzd@gitlab.com>
This commit is contained in:
Stan Hu 2023-11-29 17:13:00 +00:00
commit 0f7c52489d
5 changed files with 17 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.gitlab/ci/custom.images.yml
View file

@ -62,10 +62,7 @@ apollo:
zoekt-ci-image-1.2: zoekt-ci-image-1.2:
extends: .build_static_image extends: .build_static_image
zoekt-ci-image-1.3: zoekt-ci-image-1.5:
extends: .build_static_image
zoekt-ci-image-1.4:
extends: .build_static_image extends: .build_static_image
postgres-12-pgvector-0.4.1: postgres-12-pgvector-0.4.1:

24
Dockerfile.zoekt-ci-image-1.3
View file

@ -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"]

4
Dockerfile.zoekt-ci-image-1.4 → Dockerfile.zoekt-ci-image-1.5
View file

@ -16,7 +16,9 @@ FROM alpine:3.17 as main
COPY --from=build /go/bin/* /usr/bin/ 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 6060
EXPOSE 6070 EXPOSE 6070

5
assets/zoekt-ci-image/run-zoekt-servers
View file

@ -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

13
assets/zoekt-ci-image/run-zoekt-servers-v1.5 Executable file
View file

@ -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