From d1633449a3963bad782b3fdc8ec7d785e222d9a4 Mon Sep 17 00:00:00 2001
From: Chris Wendt <chrismwendt@gmail.com>
Date: Mon, 27 Sep 2021 22:18:12 -0600
Subject: [PATCH] sg: rename syntect_server to syntax-highlighter in dev
 (#25402)

---
 dev/sg/README.md |  4 ++--
 sg.config.yaml   | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/dev/sg/README.md b/dev/sg/README.md
index 7808b681020..15609ecfbb9 100644
--- a/dev/sg/README.md
+++ b/dev/sg/README.md
@@ -242,7 +242,7 @@ commandsets:
     - watch
     - caddy
     - web
-    - syntect_server
+    - syntax-highlighter
     - zoekt-indexserver-0
     - zoekt-indexserver-1
     - zoekt-webserver-0
@@ -265,7 +265,7 @@ commandsets:
     - watch
     - caddy
     - web
-    - syntect_server
+    - syntax-highlighter
     - zoekt-indexserver-0
     - zoekt-indexserver-1
     - zoekt-webserver-0
diff --git a/sg.config.yaml b/sg.config.yaml
index d2caaafce47..a74d77ed6a4 100644
--- a/sg.config.yaml
+++ b/sg.config.yaml
@@ -328,14 +328,17 @@ commands:
     env:
       DOCSITE_VERSION: v1.7.0 # make sure to update all DOCSITE_VERSION
 
-  syntect_server:
+  syntax-highlighter:
     ignoreStdout: true
     ignoreStderr: true
     cmd: |
-      docker run --name=syntect_server --rm -p9238:9238 \
+      docker run --name=syntax-highlighter --rm -p9238:9238 \
       -e WORKERS=1 -e ROCKET_ADDRESS=0.0.0.0 \
       sourcegraph/syntax-highlighter@sha256:92a5c181dbf2d8aead5171c985139bf38c496bef2ac98afbd64c3612967fe5cc
-    install: docker inspect syntect_server >/dev/null 2>&1 && docker rm -f syntect_server || true
+    install: |
+      # Remove containers by the old name, too.
+      docker inspect syntect_server >/dev/null 2>&1 && docker rm -f syntect_server || true
+      docker inspect syntax-highlighter >/dev/null 2>&1 && docker rm -f syntax-highlighter || true
     env:
       # This is not needed actually
       INSECURE_DEV: 1
@@ -679,7 +682,7 @@ commandsets:
       - web
       - caddy
       - docsite
-      - syntect_server
+      - syntax-highlighter
       - github-proxy
       - zoekt-indexserver-0
       - zoekt-indexserver-1
@@ -702,7 +705,7 @@ commandsets:
       - query-runner
       - caddy
       - docsite
-      - syntect_server
+      - syntax-highlighter
       - github-proxy
       - zoekt-indexserver-0
       - zoekt-indexserver-1
@@ -732,7 +735,7 @@ commandsets:
       - query-runner
       - caddy
       - docsite
-      - syntect_server
+      - syntax-highlighter
       - github-proxy
       - zoekt-indexserver-0
       - zoekt-indexserver-1
@@ -758,7 +761,7 @@ commandsets:
       - query-runner
       - caddy
       - docsite
-      - syntect_server
+      - syntax-highlighter
       - github-proxy
       - zoekt-indexserver-0
       - zoekt-indexserver-1
@@ -803,7 +806,7 @@ commandsets:
       - query-runner
       - caddy
       - docsite
-      - syntect_server
+      - syntax-highlighter
       - github-proxy
       - zoekt-indexserver-0
       - zoekt-indexserver-1