From b25c50b05b9b1c540b16b782897f55403b51f40d Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Wed, 7 Oct 2020 12:46:40 -0700 Subject: [PATCH] Remove non-OSS GraphQL, INI, TOML, Perforce syntax highlighting. (#14456) - take two (#14465) This reverts commit ddb241f372ad5b707b15f51a57e7b9a727d0514b - bringing back the change. It uses a fixed image which no longer segfaults, see: https://github.com/sourcegraph/syntect_server/commit/33427526494d4ca72b39c1bbe0b3d7d17c36adb3 --- CHANGELOG.md | 1 + cmd/server/Dockerfile | 2 +- dev/syntect_server.sh | 2 +- docker-images/syntax-highlighter/build.sh | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 769076fccc0..ba744913dd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ All notable changes to Sourcegraph are documented in this file. ### Removed +- Syntax highlighting for GraphQL, INI, TOML, and Perforce files has been removed [due to incompatible/absent licenses](https://github.com/sourcegraph/sourcegraph/issues/13933). We plan to [add it back in the future](https://github.com/sourcegraph/sourcegraph/issues?q=is%3Aissue+is%3Aopen+add+syntax+highlighting+for+develop+a+). - Search scope pages (`/search/scope/:id`) were removed. - User-defined search scopes are no longer shown below the search bar on the homepage. Use the [`quicklinks`](https://docs.sourcegraph.com/user/quick_links) setting instead to display links there. - The explore page (`/explore`) was removed. diff --git a/cmd/server/Dockerfile b/cmd/server/Dockerfile index 2b3de3ca506..92e3cf42d85 100644 --- a/cmd/server/Dockerfile +++ b/cmd/server/Dockerfile @@ -39,7 +39,7 @@ RUN apk update && apk add --no-cache \ # hadolint ignore=DL3022 COPY --from=comby/comby:0.18.4@sha256:b47ce282778bfea7f80d45f5ef0cc546ba0d6347baccebaf171a7866143b2593 /usr/local/bin/comby /usr/local/bin/comby # hadolint ignore=DL3022 -COPY --from=sourcegraph/syntect_server:ff37f90@sha256:aa93514b7bc3aaf7a4e9c92e5ff52ee5052db6fb101255a69f054e5b8cdb46ff /syntect_server /usr/local/bin/ +COPY --from=sourcegraph/syntect_server:3342752@sha256:b9e1f7471ebe596415ca2c7ab8e1282d7c4ba4e4e71390d80e9924a73139d793 /syntect_server /usr/local/bin/ # install postgres 11 # hadolint ignore=DL3022,DL3003,DL3018,DL3019,SC2035 diff --git a/dev/syntect_server.sh b/dev/syntect_server.sh index aa44d17bdf0..0339fa61600 100755 --- a/dev/syntect_server.sh +++ b/dev/syntect_server.sh @@ -23,4 +23,4 @@ if [[ "${INSECURE_DEV:-}" == '1' ]]; then fi docker inspect syntect_server >/dev/null 2>&1 && docker rm -f syntect_server -exec docker run --name=syntect_server --rm -p9238:9238 "${addr[@]}" sourcegraph/syntect_server:ff37f90@sha256:aa93514b7bc3aaf7a4e9c92e5ff52ee5052db6fb101255a69f054e5b8cdb46ff +exec docker run --name=syntect_server --rm -p9238:9238 "${addr[@]}" sourcegraph/syntect_server:3342752@sha256:b9e1f7471ebe596415ca2c7ab8e1282d7c4ba4e4e71390d80e9924a73139d793 diff --git a/docker-images/syntax-highlighter/build.sh b/docker-images/syntax-highlighter/build.sh index 093f10775d7..9d4b1fdea95 100755 --- a/docker-images/syntax-highlighter/build.sh +++ b/docker-images/syntax-highlighter/build.sh @@ -6,5 +6,5 @@ set -ex # actual image currently lives here: https://github.com/sourcegraph/infrastructure/tree/master/docker-images # # TODO: Move the image to this directory so it is open-source and built in CI automatically. -docker pull index.docker.io/sourcegraph/syntect_server:c22bde0@sha256:07b9f1ff4bd2c60299f9404144cd72897fa4de2308d1be65c35bcdcd10e5410d -docker tag index.docker.io/sourcegraph/syntect_server:c22bde0@sha256:07b9f1ff4bd2c60299f9404144cd72897fa4de2308d1be65c35bcdcd10e5410d "$IMAGE" +docker pull index.docker.io/sourcegraph/syntect_server:3342752@sha256:b9e1f7471ebe596415ca2c7ab8e1282d7c4ba4e4e71390d80e9924a73139d793 +docker tag index.docker.io/sourcegraph/syntect_server:3342752@sha256:b9e1f7471ebe596415ca2c7ab8e1282d7c4ba4e4e71390d80e9924a73139d793 "$IMAGE"