Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ services:
- 'SYMBOLS_URL=http://symbols-0:3184'
- 'INDEXED_SEARCH_SERVERS=zoekt-webserver-0:6070'
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
- 'REPO_UPDATER_URL=http://repo-updater:3182'
- 'GRAFANA_SERVER_URL=http://grafana:3370'
- 'PROMETHEUS_URL=http://prometheus:9090'
- 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore'
Expand All @@ -152,7 +151,6 @@ services:
{ "Name": "gitserver-0", "Host": "gitserver-0:6060" },
{ "Name": "searcher-0", "Host": "searcher-0:6060" },
{ "Name": "symbols-0", "Host": "symbols-0:6060" },
{ "Name": "repo-updater", "Host": "repo-updater:6060" },
{ "Name": "worker", "Host": "worker:6060" },
{ "Name": "zoekt-indexserver-0", "Host": "zoekt-indexserver-0:6072" },
{ "Name": "zoekt-webserver-0", "Host": "zoekt-webserver-0:6070", "DefaultPath": "/debug/requests/" }
Expand Down Expand Up @@ -194,7 +192,6 @@ services:
- 'SYMBOLS_URL=http://symbols-0:3184'
- 'INDEXED_SEARCH_SERVERS=zoekt-webserver-0:6070'
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
- 'REPO_UPDATER_URL=http://repo-updater:3182'
- 'GRAFANA_SERVER_URL=http://grafana:3000'
- 'PROMETHEUS_URL=http://prometheus:9090'
- 'PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore'
Expand Down Expand Up @@ -342,26 +339,6 @@ services:
- sourcegraph
restart: always

# Description: Handles repository metadata (not Git data) lookups and updates from external code hosts and other similar services.
#
# Disk: 128GB / non-persistent SSD
# Ports exposed to other Sourcegraph services: 3182/TCP 6060/TCP
# Ports exposed to the public internet: none
#
repo-updater:
container_name: repo-updater
image: 'index.docker.io/sourcegraph/repo-updater:6.1.2889@sha256:95e8a28bd2d13270a5d0ab80eae5e8aac44913bd421fb92cf45d5550c4874fbc'
cpus: 4
mem_limit: '4g'
environment:
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
- 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317'
volumes:
- 'repo-updater:/mnt/cache'
networks:
- sourcegraph
restart: always

# Description: Manages background processes.
#
# Disk: 128GB / non-persistent SSD
Expand Down Expand Up @@ -802,7 +779,6 @@ volumes:
prometheus-v2:
redis-cache:
redis-store:
repo-updater:
worker:
searcher-0:
sourcegraph-frontend-0:
Expand Down
5 changes: 0 additions & 5 deletions prometheus/prometheus_targets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
targets:
- cadvisor:48080
- sourcegraph-frontend-internal:6060
- labels:
nodename: "sourcegraph-docker-compose-host"
job: repo-updater
targets:
- repo-updater:6060
- labels:
nodename: "sourcegraph-docker-compose-host"
job: worker
Expand Down
1 change: 0 additions & 1 deletion pure-docker/deploy-frontend-internal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ docker run --detach \
-e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \
-e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-e REPO_UPDATER_URL=http://repo-updater:3182 \
-e GRAFANA_SERVER_URL=http://grafana:3000 \
-e PROMETHEUS_URL=http://prometheus:9090 \
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
Expand Down
1 change: 0 additions & 1 deletion pure-docker/deploy-frontend.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ docker run --detach \
-e SYMBOLS_URL="$(addresses "http://symbols-" $NUM_SYMBOLS ":3184")" \
-e INDEXED_SEARCH_SERVERS="$(addresses "zoekt-webserver-" $NUM_INDEXED_SEARCH ":6070")" \
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-e REPO_UPDATER_URL=http://repo-updater:3182 \
-e GRAFANA_SERVER_URL=http://grafana:3370 \
-e PROMETHEUS_URL=http://prometheus:9090 \
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
Expand Down
27 changes: 0 additions & 27 deletions pure-docker/deploy-repo-updater.sh

This file was deleted.

1 change: 0 additions & 1 deletion pure-docker/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done
./deploy-prometheus.sh
./deploy-redis-cache.sh
./deploy-redis-store.sh
./deploy-repo-updater.sh
./deploy-worker.sh
./deploy-otel-collector.sh
for i in $(seq 0 $(($NUM_SEARCHER - 1))); do ./deploy-searcher.sh $i; done
Expand Down
1 change: 0 additions & 1 deletion pure-docker/teardown.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ docker rm -f migrator &>/dev/null || true &
docker rm -f prometheus &>/dev/null || true
docker rm -f redis-cache &>/dev/null || true &
docker rm -f redis-store &>/dev/null || true &
docker rm -f repo-updater &>/dev/null || true &
docker rm -f worker &>/dev/null || true &
docker rm -f $(addresses "searcher-" $NUM_SEARCHER "") &>/dev/null || true &
docker rm -f $(addresses "symbols-" $NUM_SYMBOLS "") &>/dev/null || true &
Expand Down
4 changes: 2 additions & 2 deletions test/smoke-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ deploy_sourcegraph() {
if [[ "$TEST_TYPE" == "pure-docker-test" ]]; then
./test/volume-config.sh
timeout 600s ./pure-docker/deploy.sh
expect_containers="25"
expect_containers="24"
elif [[ "$TEST_TYPE" == "docker-compose-test" ]]; then
docker-compose --file docker-compose/docker-compose.yaml up -d -t 600
expect_containers="27"
expect_containers="26"
fi

echo "Giving containers 90s to start..."
Expand Down
2 changes: 1 addition & 1 deletion test/volume-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ echo
echo "forcing static permissions on volume directories"
echo
pushd ~/sourcegraph-docker
chown -R 100:101 gitserver* prometheus-v2* worker* repo-updater* searcher* sourcegraph-frontend* symbols* zoekt* blobstore-disk
chown -R 100:101 gitserver* prometheus-v2* worker* searcher* sourcegraph-frontend* symbols* zoekt* blobstore-disk
chown -R 999:1000 redis-store-disk redis-cache-disk
chown -R 472:472 grafana-disk
chown -R 999:999 pgsql-disk codeintel-db-disk
Expand Down
Loading