Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 20b3321

Browse files
eseligereseliger
authored
Remove GitHub proxy service (#49)
See sourcegraph/sourcegraph#55290, we're removing this service in favor of deployment simplicity with a redis-based equivalent.
1 parent 602da27 commit 20b3321

File tree

10 files changed

+25
-63
lines changed

10 files changed

+25
-63
lines changed

‎prometheus/prometheus_targets.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
targets:
66
- cadvisor:8080
77
- sourcegraph-frontend-internal:6060
8-
- labels:
9-
nodename: "sourcegraph-docker-compose-host"
10-
job: github-proxy
11-
targets:
12-
- github-proxy:6060
138
- labels:
149
nodename: "sourcegraph-docker-compose-host"
1510
job: repo-updater

‎pure-docker/deploy-frontend-internal.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ docker run --detach \
3737
-e REPO_UPDATER_URL=http://repo-updater:3182 \
3838
-e GRAFANA_SERVER_URL=http://grafana:3000 \
3939
-e JAEGER_SERVER_URL=http://jaeger:16686 \
40-
-e GITHUB_BASE_URL=http://github-proxy:3180 \
4140
-e PROMETHEUS_URL=http://prometheus:9090 \
4241
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
4342
-e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \

‎pure-docker/deploy-frontend.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ docker run --detach \
3838
-e REPO_UPDATER_URL=http://repo-updater:3182 \
3939
-e GRAFANA_SERVER_URL=http://grafana:3370 \
4040
-e JAEGER_SERVER_URL=http://jaeger:16686 \
41-
-e GITHUB_BASE_URL=http://github-proxy:3180 \
4241
-e PROMETHEUS_URL=http://prometheus:9090 \
4342
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
4443
-e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \

‎pure-docker/deploy-github-proxy.sh‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎pure-docker/deploy-gitserver.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ docker run --detach \
2222
-e GOMAXPROCS=4 \
2323
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
2424
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
25-
-e 'GITHUB_BASE_URL=http://github-proxy:3180' \
2625
-v $VOLUME:/data/repos \
2726
index.docker.io/sourcegraph/gitserver:4.4.0@sha256:ffef2bc4b9fbcfdb0b833230990af458260787ff3903de64108846ae375d17e6
2827

‎pure-docker/deploy-repo-updater.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ docker run --detach \
2121
-e GOMAXPROCS=1 \
2222
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
2323
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
24-
-e GITHUB_BASE_URL=http://github-proxy:3180 \
2524
-v $VOLUME:/mnt/cache \
2625
index.docker.io/sourcegraph/repo-updater:4.4.0@sha256:e4b71290ec21a6471eb4b9e1efb169af96212b7dfa72d9fd22ea722a49b3c707
2726

‎pure-docker/deploy-worker.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ docker run --detach \
2121
-e GOMAXPROCS=1 \
2222
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
2323
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
24-
-e GITHUB_BASE_URL=http://github-proxy:3180 \
2524
-e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
2625
-e SEARCHER_URL="$(addresses "http://searcher-" $NUM_SEARCHER ":3181")" \
2726
-e SRC_GIT_SERVERS="$(addresses "gitserver-" $NUM_GITSERVER ":3178")" \

‎pure-docker/deploy.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ docker network create sourcegraph &>/dev/null || true
1313
./deploy-apache.sh
1414
./deploy-node-exporter.sh
1515
./deploy-cadvisor.sh
16-
./deploy-github-proxy.sh
1716
for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done
1817
./deploy-grafana.sh
1918
./deploy-precise-code-intel-worker.sh

‎pure-docker/teardown.sh‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,29 @@ source ./replicas.sh
88

99
docker rm -f apache &>/dev/null || true &
1010
docker rm -f node-exporter &>/dev/null || true &
11-
docker rm -f cadvisor &> /dev/null || true &
12-
docker rm -f sourcegraph-frontend-internal &> /dev/null || true &
13-
docker rm -f $(addresses "sourcegraph-frontend-" $NUM_FRONTEND "") &> /dev/null || true &
14-
docker rm -f github-proxy &> /dev/null || true &
15-
docker rm -f $(addresses "gitserver-" $NUM_GITSERVER "") &> /dev/null || true &
16-
docker rm -f grafana &> /dev/null || true
17-
docker rm -f jaeger &> /dev/null || true
18-
docker rm -f precise-code-intel-worker &> /dev/null || true
19-
docker rm -f pgsql &> /dev/null || true &
20-
docker rm -f codeintel-db &> /dev/null || true &
21-
docker rm -f codeinsights-db &> /dev/null || true &
22-
docker rm -f blobstore &> /dev/null || true &
23-
docker rm -f migrator &> /dev/null || true &
24-
docker rm -f prometheus &> /dev/null || true
25-
docker rm -f redis-cache &> /dev/null || true &
26-
docker rm -f redis-store &> /dev/null || true &
27-
docker rm -f repo-updater &> /dev/null || true &
28-
docker rm -f worker &> /dev/null || true &
29-
docker rm -f $(addresses "searcher-" $NUM_SEARCHER "") &> /dev/null || true &
30-
docker rm -f $(addresses "symbols-" $NUM_SYMBOLS "") &> /dev/null || true &
31-
docker rm -f syntect-server &> /dev/null || true &
32-
docker rm -f $(addresses "zoekt-indexserver-" $NUM_INDEXED_SEARCH "") &> /dev/null || true &
33-
docker rm -f $(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH "") &> /dev/null || true &
34-
docker rm -f otel-collector &> /dev/null || true &
11+
docker rm -f cadvisor &>/dev/null || true &
12+
docker rm -f sourcegraph-frontend-internal &>/dev/null || true &
13+
docker rm -f $(addresses "sourcegraph-frontend-" $NUM_FRONTEND "") &>/dev/null || true &
14+
docker rm -f $(addresses "gitserver-" $NUM_GITSERVER "") &>/dev/null || true &
15+
docker rm -f grafana &>/dev/null || true
16+
docker rm -f jaeger &>/dev/null || true
17+
docker rm -f precise-code-intel-worker &>/dev/null || true
18+
docker rm -f pgsql &>/dev/null || true &
19+
docker rm -f codeintel-db &>/dev/null || true &
20+
docker rm -f codeinsights-db &>/dev/null || true &
21+
docker rm -f blobstore &>/dev/null || true &
22+
docker rm -f migrator &>/dev/null || true &
23+
docker rm -f prometheus &>/dev/null || true
24+
docker rm -f redis-cache &>/dev/null || true &
25+
docker rm -f redis-store &>/dev/null || true &
26+
docker rm -f repo-updater &>/dev/null || true &
27+
docker rm -f worker &>/dev/null || true &
28+
docker rm -f $(addresses "searcher-" $NUM_SEARCHER "") &>/dev/null || true &
29+
docker rm -f $(addresses "symbols-" $NUM_SYMBOLS "") &>/dev/null || true &
30+
docker rm -f syntect-server &>/dev/null || true &
31+
docker rm -f $(addresses "zoekt-indexserver-" $NUM_INDEXED_SEARCH "") &>/dev/null || true &
32+
docker rm -f $(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH "") &>/dev/null || true &
33+
docker rm -f otel-collector &>/dev/null || true &
3534

36-
docker network rm sourcegraph &> /dev/null || true &
35+
docker network rm sourcegraph &>/dev/null || true &
3736
wait

‎test/smoke-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ deploy_sourcegraph() {
77
./test/volume-config.sh
88
timeout 600s ./pure-docker/deploy.sh
99

10-
expect_containers="61"
10+
expect_containers="60"
1111

1212
echo "Giving containers 90s to start..."
1313
sleep 90

0 commit comments

Comments
 (0)