From 7dd5b70486fe89c3896a3ea9c16219090b583bcb Mon Sep 17 00:00:00 2001
From: Keegan Carruthers-Smith <keegan.csmith@gmail.com>
Date: Wed, 7 Aug 2024 08:14:40 +0200
Subject: [PATCH] docker: remove scip-ctags from Dockerfile

This is an optional dependency that I don't believe OSS users of docker
use. We used to use these dockerfiles in Sourcegraph, but have since
moved to building it in our own CI with scip-ctags.

Test Plan: built locally

  docker build -t zoekt .
  docker build -t zoekt-indexserver . -f Dockerfile.indexserver
  docker build -t zoekt-webserver   . -f Dockerfile.webserver
---
 Dockerfile             | 14 --------------
 Dockerfile.indexserver |  1 -
 2 files changed, 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b0a07a5ca..6370c8aea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,19 +13,6 @@ COPY . ./
 ARG VERSION
 RUN go install -ldflags "-X github.com/sourcegraph/zoekt.Version=$VERSION" ./cmd/...
 
-FROM rust:alpine3.19 AS rust-builder
-
-RUN apk add --no-cache git wget musl-dev build-base
-
-RUN wget -qO- https://github.com/sourcegraph/sourcegraph/archive/0c8aa18eece45922a2b56dc0f94e21b1bb533e7d.tar.gz | tar xz && mv sourcegraph-* sourcegraph
-
-ARG TARGETARCH
-
-# Because .cargo/config.toml doesnt support triplet-specific env
-RUN cd sourcegraph/docker-images/syntax-highlighter && /sourcegraph/cmd/symbols/cargo-config.sh && cd /
-
-RUN cargo install --path sourcegraph/docker-images/syntax-highlighter --root /syntect_server --bin scip-ctags
-
 FROM alpine:3.19 AS zoekt
 
 RUN apk add --no-cache git ca-certificates bind-tools tini jansson wget
@@ -34,6 +21,5 @@ COPY install-ctags-alpine.sh .
 RUN ./install-ctags-alpine.sh && rm install-ctags-alpine.sh
 
 COPY --from=builder /go/bin/* /usr/local/bin/
-COPY --from=rust-builder /syntect_server/bin/scip-ctags /usr/local/bin/scip-ctags
 
 ENTRYPOINT ["/sbin/tini", "--"]
diff --git a/Dockerfile.indexserver b/Dockerfile.indexserver
index 38d81c65c..d1ddb90d0 100644
--- a/Dockerfile.indexserver
+++ b/Dockerfile.indexserver
@@ -14,7 +14,6 @@ RUN mkdir -p ${DATA_DIR}
 
 COPY --from=zoekt \
     /usr/local/bin/universal-* \
-    /usr/local/bin/scip-ctags \
     /usr/local/bin/zoekt-sourcegraph-indexserver \
     /usr/local/bin/zoekt-archive-index \
     /usr/local/bin/zoekt-git-index \