56 changes: 28 additions & 28 deletions docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
# for this container will need to be updated to reflect the new connection information.
migrator:
container_name: migrator
image: 'index.docker.io/sourcegraph/migrator:187572_2022-12-06_cbecc5321c7d@sha256:93fc175df594738a98a62f2057271824cdb674b0e63bedac9dc7cb0f04db76bb'
image: 'index.docker.io/sourcegraph/migrator:4.5.0@sha256:687bb1794f530d178d30da4c5d32d2168fc95438d3727b7beed053fe1bcc6d9b'
cpus: 0.5
mem_limit: '500m'
command: ['up']
Expand Down Expand Up @@ -69,7 +69,7 @@ services:
# https://caddyserver.com/docs/caddyfile
caddy:
container_name: caddy
image: 'index.docker.io/caddy:2.5.1-alpine@sha256:6e62b63d4d7a4826f9e93c904a0e5b886a8bea2234b6569e300924282a2e8e6c'
image: 'index.docker.io/caddy:2.5.2-alpine@sha256:cfa7d94aa1f0c68a167b147a8573711283df2cd6fc285d220387f20206ff4874'
cpus: 4
mem_limit: '4g'
environment:
Expand Down Expand Up @@ -124,7 +124,7 @@ services:
# service.
sourcegraph-frontend-0:
container_name: sourcegraph-frontend-0
image: 'index.docker.io/sourcegraph/frontend:187572_2022-12-06_cbecc5321c7d@sha256:73e64a8636e70ebbaf7f4a3300479529294f67e8cf644cdaea02435915aec869'
image: 'index.docker.io/sourcegraph/frontend:4.5.0@sha256:3bf28af73687fa83af1f03ff21b1393f4b60949286a055d1ef4e529d2be840c5'
cpus: 4
mem_limit: '8g'
environment:
Expand Down Expand Up @@ -168,7 +168,7 @@ services:
#
sourcegraph-frontend-internal:
container_name: sourcegraph-frontend-internal
image: 'index.docker.io/sourcegraph/frontend:187572_2022-12-06_cbecc5321c7d@sha256:73e64a8636e70ebbaf7f4a3300479529294f67e8cf644cdaea02435915aec869'
image: 'index.docker.io/sourcegraph/frontend:4.5.0@sha256:3bf28af73687fa83af1f03ff21b1393f4b60949286a055d1ef4e529d2be840c5'
cpus: 4
mem_limit: '8g'
environment:
Expand Down Expand Up @@ -216,7 +216,7 @@ services:
#
gitserver-0:
container_name: gitserver-0
image: 'index.docker.io/sourcegraph/gitserver:187572_2022-12-06_cbecc5321c7d@sha256:87642b2f0cccbdcd661e470c8f7aa6c022ab03065a2c8ab565afc4b8829a4531'
image: 'index.docker.io/sourcegraph/gitserver:4.5.0@sha256:fd390905aca509bc37f6e2b912338de33eb689abf17caf4e58c16e4c3e94b0cf'
cpus: 4
mem_limit: '8g'
environment:
Expand All @@ -240,7 +240,7 @@ services:
#
zoekt-indexserver-0:
container_name: zoekt-indexserver-0
image: 'index.docker.io/sourcegraph/search-indexer:187572_2022-12-06_cbecc5321c7d@sha256:a3ae20e4130b4846e2c3078b9ba942854890348da37c8fa7ee385c081b7d1666'
image: 'index.docker.io/sourcegraph/search-indexer:4.5.0@sha256:2cab0ebb22aacec48e65762e819b2bb4a5969ff1feb7a8c7b645e54700fb14ad'
cpus: 8
mem_limit: '16g'
environment:
Expand All @@ -263,7 +263,7 @@ services:
#
zoekt-webserver-0:
container_name: zoekt-webserver-0
image: 'index.docker.io/sourcegraph/indexed-searcher:187572_2022-12-06_cbecc5321c7d@sha256:79bec59c17482e4039931ed083113bd8723d74c42b96c3c489062f6b33b806f0'
image: 'index.docker.io/sourcegraph/indexed-searcher:4.5.0@sha256:e58d02918558b617fa7533526d51ec176c0277d0051b0cb5aa3d03c84f3963fe'
cpus: 8
mem_limit: '50g'
environment:
Expand All @@ -290,7 +290,7 @@ services:
#
searcher-0:
container_name: searcher-0
image: 'index.docker.io/sourcegraph/searcher:187572_2022-12-06_cbecc5321c7d@sha256:c0d7b580c31e956dc586e3947edd2afb850cf5954e83010236294c57478256da'
image: 'index.docker.io/sourcegraph/searcher:4.5.0@sha256:7fdab442b17dbba759c3af11665ad153e5139f3f8aeabc52a71b730be43cf2b1'
cpus: 2
mem_limit: '2g'
environment:
Expand All @@ -317,7 +317,7 @@ services:
#
github-proxy:
container_name: github-proxy
image: 'index.docker.io/sourcegraph/github-proxy:187572_2022-12-06_cbecc5321c7d@sha256:b4739adfced18f2a8883da931da681f444b489f6606052246f7c8d536f22e425'
image: 'index.docker.io/sourcegraph/github-proxy:4.5.0@sha256:9599bd71a35fcde829ea272ade23c3b2ce9b0d4a46011220e7be844c807307c9'
cpus: 1
mem_limit: '1g'
environment:
Expand All @@ -334,7 +334,7 @@ services:
#
precise-code-intel-worker:
container_name: precise-code-intel-worker
image: 'index.docker.io/sourcegraph/precise-code-intel-worker:187572_2022-12-06_cbecc5321c7d@sha256:d1b1546d784fec8c90928a40e1b7eafc33202a53e4fcd501001d3f4a73e5c8ce'
image: 'index.docker.io/sourcegraph/precise-code-intel-worker:4.5.0@sha256:b8fbdec7c2abdbe7fabf50be3d25568739a42ef2ee951b712ed4bf42ff2a2c4b'
cpus: 2
mem_limit: '4g'
environment:
Expand All @@ -360,7 +360,7 @@ services:
#
repo-updater:
container_name: repo-updater
image: 'index.docker.io/sourcegraph/repo-updater:187572_2022-12-06_cbecc5321c7d@sha256:0bf2b95c73bceff8c3edb96299175fe36a550f57fd3f5256d38fa2c42992655a'
image: 'index.docker.io/sourcegraph/repo-updater:4.5.0@sha256:9d1672276d37dcd6b2144328293bc89399b7e1d58fbfaea956b2ecf890edfbd3'
cpus: 4
mem_limit: '4g'
environment:
Expand All @@ -381,7 +381,7 @@ services:
#
worker:
container_name: worker
image: 'index.docker.io/sourcegraph/worker:187572_2022-12-06_cbecc5321c7d@sha256:0092211fee815b82d426ccf0a30999f8fb40749811e3a83c7570e576f028da74'
image: 'index.docker.io/sourcegraph/worker:4.5.0@sha256:249ebd13177f6f61d59e5cb24fa40373a9ad65d2ebd622de3ba33b9221a9b8b2'
cpus: 4
mem_limit: '4g'
environment:
Expand All @@ -408,7 +408,7 @@ services:
#
syntect-server:
container_name: syntect-server
image: 'index.docker.io/sourcegraph/syntax-highlighter:187572_2022-12-06_cbecc5321c7d@sha256:b88b20f56e942cc253109bb7f4b07746ebaecc2ff7393cdaf6415ffb8778fc45'
image: 'index.docker.io/sourcegraph/syntax-highlighter:4.5.0@sha256:2f9eab98c5913cc813e79489a11247718fb17ba9a06fd6283e802fade2fb60fa'
cpus: 4
mem_limit: '6g'
healthcheck:
Expand All @@ -429,7 +429,7 @@ services:
#
symbols-0:
container_name: symbols-0
image: 'index.docker.io/sourcegraph/symbols:187572_2022-12-06_cbecc5321c7d@sha256:75615a60f318dc898eae2e5037efcd53e63cf28c2b8fca388b6923d215ff9db9'
image: 'index.docker.io/sourcegraph/symbols:4.5.0@sha256:faa08c08907146181d7fbdcb4e971f1180aaba6eef5137e1bc4d270726258ec5'
cpus: 2
mem_limit: '4g'
environment:
Expand All @@ -455,7 +455,7 @@ services:
#
prometheus:
container_name: prometheus
image: 'index.docker.io/sourcegraph/prometheus:187572_2022-12-06_cbecc5321c7d@sha256:2113ccab80409e995ee7ed9a3d386051f4ca73186375a3a0d7e3d55c90fa2007'
image: 'index.docker.io/sourcegraph/prometheus:4.5.0@sha256:4fe9a5fdee206b1aac9d32afb31ad57e1882394aad9e7e9f719a1b2741afcae5'
cpus: 4
mem_limit: '8g'
volumes:
Expand All @@ -482,7 +482,7 @@ services:
# 'GF_SERVER_ROOT_URL='https://grafana.example.com'
grafana:
container_name: grafana
image: 'index.docker.io/sourcegraph/grafana:187572_2022-12-06_cbecc5321c7d@sha256:cf295a1dada50607a364390a54744dbc9142aa99b42c07f1bb623ca251639d2c'
image: 'index.docker.io/sourcegraph/grafana:4.5.0@sha256:f70a7f79c5c90cab0d5cfb8f3dbca4dc60ed390b045aff1a86079c87bfe9a8af'
cpus: 1
mem_limit: '1g'
volumes:
Expand All @@ -503,7 +503,7 @@ services:
#
cadvisor:
container_name: cadvisor
image: 'index.docker.io/sourcegraph/cadvisor:187572_2022-12-06_cbecc5321c7d@sha256:755748f2f9b00d8f70bd65349e85235585bdf1a663e26198c8eaf91dfd5636e1'
image: 'index.docker.io/sourcegraph/cadvisor:4.5.0@sha256:5117f2bc817c16fb129acb6f9b070af8f1be09d3d9a8f88e3297f7adfff9af0d'
cpus: 1
mem_limit: '1g'
# You may set `privileged` to `false and `cadvisor` will run with reduced privileges.
Expand Down Expand Up @@ -536,7 +536,7 @@ services:
#
node-exporter:
container_name: node-exporter
image: 'index.docker.io/sourcegraph/node-exporter:187572_2022-12-06_cbecc5321c7d@sha256:2d9dcdf0b2226f0c3d550a64d2667710265462350a3ba9ebe37d0302bc64af0f'
image: 'index.docker.io/sourcegraph/node-exporter:4.5.0@sha256:fa8e5700b7762fffe0674e944762f44bb787a7e44d97569fe55348260453bf80'
cpus: .5
mem_limit: '1g'
pid: 'host'
Expand Down Expand Up @@ -565,7 +565,7 @@ services:
#
pgsql:
container_name: pgsql
image: 'index.docker.io/sourcegraph/postgres-12-alpine:187572_2022-12-06_cbecc5321c7d@sha256:44f6e9a51fafb99573cbd767f20f68913db5a02920c5974e4fa560735d745328'
image: 'index.docker.io/sourcegraph/postgres-12-alpine:4.5.0@sha256:fc27849a8a70eb395afd22cea6d482f81c73bcf062eb7f78fa2f6e5a429b6a16'
cpus: 4
mem_limit: '4g'
shm_size: '1g'
Expand Down Expand Up @@ -593,7 +593,7 @@ services:
# for this container will need to be updated to reflect the new connection information.
pgsql-exporter:
container_name: pgsql-exporter
image: 'index.docker.io/sourcegraph/postgres_exporter:187572_2022-12-06_cbecc5321c7d@sha256:85d9ca134db535f0482e6e5cacf194ea118bf24d0fd52e36ba6714802d59c30a'
image: 'index.docker.io/sourcegraph/postgres_exporter:4.5.0@sha256:b6b6c42c8068b3ce3ae290e936c7031f9a9314e011bbdecfeb7b345356968567'
cpus: 0.1
mem_limit: '50m'
networks:
Expand All @@ -612,7 +612,7 @@ services:
#
codeintel-db:
container_name: codeintel-db
image: 'index.docker.io/sourcegraph/codeintel-db:187572_2022-12-06_cbecc5321c7d@sha256:7fb02a9392ce4dd3d4210dbd5792c09c4210a2dfc6dc389ed679137784359102'
image: 'index.docker.io/sourcegraph/codeintel-db:4.5.0@sha256:fc923d60a330b0b4b5dc086cf2a7a52dab7cff62592f1fc6dc466914df9d3f1b'
cpus: 4
mem_limit: '4g'
shm_size: '1g'
Expand Down Expand Up @@ -640,7 +640,7 @@ services:
# for this container will need to be updated to reflect the new connection information.
codeintel-db-exporter:
container_name: codeintel-db-exporter
image: 'index.docker.io/sourcegraph/postgres_exporter:187572_2022-12-06_cbecc5321c7d@sha256:85d9ca134db535f0482e6e5cacf194ea118bf24d0fd52e36ba6714802d59c30a'
image: 'index.docker.io/sourcegraph/postgres_exporter:4.5.0@sha256:b6b6c42c8068b3ce3ae290e936c7031f9a9314e011bbdecfeb7b345356968567'
cpus: 0.1
mem_limit: '50m'
networks:
Expand All @@ -659,7 +659,7 @@ services:
#
codeinsights-db:
container_name: codeinsights-db
image: 'index.docker.io/sourcegraph/codeinsights-db:187572_2022-12-06_cbecc5321c7d@sha256:4dd89a1279e7d55ddcb5b570d0bb544422dd1ecb0e3662f23d22f9643837c2b5'
image: 'index.docker.io/sourcegraph/codeinsights-db:4.5.0@sha256:6c38760505cffe11b3490599078f586b58ca1922bee066e45f98cd7c458ae678'
cpus: 4
mem_limit: '2g'
shm_size: '1g'
Expand Down Expand Up @@ -692,7 +692,7 @@ services:
# for this container will need to be updated to reflect the new connection information.
codeinsights-db-exporter:
container_name: codeinsights-db-exporter
image: 'index.docker.io/sourcegraph/postgres_exporter:187572_2022-12-06_cbecc5321c7d@sha256:85d9ca134db535f0482e6e5cacf194ea118bf24d0fd52e36ba6714802d59c30a'
image: 'index.docker.io/sourcegraph/postgres_exporter:4.5.0@sha256:b6b6c42c8068b3ce3ae290e936c7031f9a9314e011bbdecfeb7b345356968567'
cpus: 0.1
mem_limit: '50m'
networks:
Expand All @@ -711,7 +711,7 @@ services:
#
blobstore:
container_name: blobstore
image: 'index.docker.io/sourcegraph/blobstore:187572_2022-12-06_cbecc5321c7d@sha256:8e57384c78a3b31cbe31d41656dbcbb8ee7279d96630a33936a2098afabb1317'
image: 'index.docker.io/sourcegraph/blobstore:4.5.0@sha256:c698fc450e913c78f0dba798013efe02d2bb6abcb481b1679d9b0f1b68bdb120'
cpus: 1
mem_limit: '1g'
healthcheck:
Expand All @@ -734,7 +734,7 @@ services:
#
redis-cache:
container_name: redis-cache
image: 'index.docker.io/sourcegraph/redis-cache:187572_2022-12-06_cbecc5321c7d@sha256:bb62b6d761513b1651e8499532570068a4509d5d0cf5131f0dd8b8e2ef74c72d'
image: 'index.docker.io/sourcegraph/redis-cache:4.5.0@sha256:acdb0b6436648f88bbdee692d4f9f0b2b83d9e16f3ba16c3faa439bef0408d13'
cpus: 1
mem_limit: '7g'
volumes:
Expand All @@ -750,7 +750,7 @@ services:
#
redis-store:
container_name: redis-store
image: 'index.docker.io/sourcegraph/redis-store:187572_2022-12-06_cbecc5321c7d@sha256:a3e4f611bcf1fe6f256a54b81f6ddb9fc2e45d7a038fa276b800b895eca09fe5'
image: 'index.docker.io/sourcegraph/redis-store:4.5.0@sha256:1a134767207c443f883cc9b04ad8a29d1c56dd637138eb05fb276c47c1f1da5b'
cpus: 1
mem_limit: '7g'
volumes:
Expand All @@ -765,7 +765,7 @@ services:
# Ports exposed to the public internet: none
otel-collector:
container_name: otel-collector
image: 'index.docker.io/sourcegraph/opentelemetry-collector:187572_2022-12-06_cbecc5321c7d@sha256:113a84fcef33f06f7e529961d5eb64400488953b23ac07ea8a3d628db6789ef0'
image: 'index.docker.io/sourcegraph/opentelemetry-collector:4.5.0@sha256:12f3fc137edea8319ebf574e15e6c27c19fb0b7ca17165973f98c8d8c342ca1d'
cpus: 1
mem_limit: '1g'
networks:
Expand Down
23 changes: 23 additions & 0 deletions docker-compose/executors/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Executors

Executors are Sourcegraph’s solution for running untrusted code in a secure and controllable way. For more information on executors and how they are used see the Executors [documentation](https://docs.sourcegraph.com/admin/executors)

## Deploying

This directory contains a compose file to deploy a Sourcegraph Executor.

NOTE: Executors require privileged access in order to run correctly on docker-compose based deployments.

To learn more visit TODO

To run this as part of a Sourcegraph deployment on the machine machine, execute the following command from the `docker-compose` directory:

```bash
docker-compose -f docker-compose.yaml -f executors/executor.docker-compose.yaml up -d
```

To run this on a standalone machine, execute the following from the `executors` directory

```bash
docker-compose up -d executor.docker-compose.yaml
```
33 changes: 33 additions & 0 deletions docker-compose/executors/executor.docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
version: '2.4'
services:
executor:
container_name: executor
image: 'index.docker.io/sourcegraph/executor:4.5.0@sha256:3701a647ab3833b4aa0205ce0c46f38911dd1311f9161edbf0b63d9c76ac8242'
cpus: 1
mem_limit: '4g'
# Run as root (required for docker daemon control)
user: root
# Run with privileged capabilities (required for docker daemon control)
privileged: true
environment:
# Refer to https://docs.sourcegraph.com/admin/deploy_executors_binary#step-2-setup-environment-variables on how to populate these variables
- EXECUTOR_FRONTEND_URL=http://sourcegraph-frontend-0:3080
# Note: Must match `executors.accessToken` in site config
- EXECUTOR_FRONTEND_PASSWORD=
# Choose what work to process
- EXECUTOR_QUEUE_NAME=
# Note: Must match left-hand side of scratch volume mount
- EXECUTOR_DOCKER_HOST_MOUNT_PATH=/tmp/sourcegraph/executor-scratch
# Note: Must match right-hand side of scratch volume mount
- TMPDIR=/scratch
# Run as root (required for docker daemon control)
- UID=1000
- GID=1000
volumes:
# Mount docker socket
- '/var/run/docker.sock:/var/run/docker.sock'
# Mount volume for workspaces shared by executor and launched containers
- '/tmp/sourcegraph/executor-scratch:/scratch'
networks:
- sourcegraph
restart: always
2 changes: 1 addition & 1 deletion docker-compose/jaeger/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
#
jaeger:
container_name: jaeger
image: 'index.docker.io/sourcegraph/jaeger-all-in-one:187572_2022-12-06_cbecc5321c7d@sha256:8d32c6f19e3b424d1a8fea89cd2b503b0358bf74be6120f6bf6bb22435d11741'
image: 'index.docker.io/sourcegraph/jaeger-all-in-one:4.5.0@sha256:461476b01968324a0d8cb43a0176713e006f99cdb1f2efc3ab2210fd0bb812c2'
cpus: 0.5
mem_limit: '512m'
ports:
Expand Down
2 changes: 1 addition & 1 deletion nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @sourcegraph: This file should be kept in sync with https://github.com/sourcegraph/sourcegraph/blob/master/cmd/server/shared/assets/nginx.conf
# @sourcegraph: This file should be kept in sync with https://github.com/sourcegraph/sourcegraph/blob/main/cmd/server/shared/assets/nginx.conf
#
# You can adjust the configuration to add additional TLS or HTTP features.
# Read more at https://docs.sourcegraph.com/admin/nginx
Expand Down
2 changes: 1 addition & 1 deletion nginx/nginx/sourcegraph_backend.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @sourcegraph: This file was adapted from https://github.com/sourcegraph/sourcegraph/blob/master/cmd/server/shared/assets/nginx/sourcegraph_backend.conf
# @sourcegraph: This file was adapted from https://github.com/sourcegraph/sourcegraph/blob/main/cmd/server/shared/assets/nginx/sourcegraph_backend.conf
#
# Do not remove. This config is included in the upstream context for backend by
# nginx.conf
Expand Down
2 changes: 1 addition & 1 deletion nginx/nginx/sourcegraph_http.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @sourcegraph: This file should be kept in sync with https://github.com/sourcegraph/sourcegraph/blob/master/cmd/server/shared/assets/nginx/sourcegraph_http.conf
# @sourcegraph: This file should be kept in sync with https://github.com/sourcegraph/sourcegraph/blob/main/cmd/server/shared/assets/nginx/sourcegraph_http.conf
#
# Do not remove. The contents of sourcegraph_http.conf can change between
# versions and may include improvements to the configuration.
Expand Down
2 changes: 1 addition & 1 deletion nginx/nginx/sourcegraph_main.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @sourcegraph: This file should be kept in sync with https://github.com/sourcegraph/sourcegraph/blob/master/cmd/server/shared/assets/nginx/sourcegraph_main.conf
# @sourcegraph: This file should be kept in sync with https://github.com/sourcegraph/sourcegraph/blob/main/cmd/server/shared/assets/nginx/sourcegraph_main.conf
#
# Do not remove. The contents of sourcegraph_main.conf can change between
# versions and may include improvements to the configuration.
Expand Down
2 changes: 1 addition & 1 deletion nginx/nginx/sourcegraph_server.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @sourcegraph: This file should be kept in sync with https://github.com/sourcegraph/sourcegraph/blob/master/cmd/server/shared/assets/nginx/sourcegraph_server.conf
# @sourcegraph: This file should be kept in sync with https://github.com/sourcegraph/sourcegraph/blob/main/cmd/server/shared/assets/nginx/sourcegraph_server.conf
#
# Do not modify.

Expand Down
2 changes: 1 addition & 1 deletion pure-docker/deploy-blobstore.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ docker run --detach \
--memory=1g \
-p 0.0.0.0:9000:9000 \
-v $VOLUME:/data \
index.docker.io/sourcegraph/blobstore:187572_2022-12-06_cbecc5321c7d@sha256:8e57384c78a3b31cbe31d41656dbcbb8ee7279d96630a33936a2098afabb1317
index.docker.io/sourcegraph/blobstore:4.5.0@sha256:c698fc450e913c78f0dba798013efe02d2bb6abcb481b1679d9b0f1b68bdb120
2 changes: 1 addition & 1 deletion pure-docker/deploy-caddy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ docker run --detach \
-p 0.0.0.0:443:443 \
-v $VOLUME:/caddy-storage \
--mount type=bind,source="$(pwd)"/../caddy/builtins/http.Caddyfile,target=/etc/caddy/Caddyfile \
index.docker.io/caddy:2.5.1-alpine@sha256:6e62b63d4d7a4826f9e93c904a0e5b886a8bea2234b6569e300924282a2e8e6c
index.docker.io/caddy:2.5.2-alpine@sha256:cfa7d94aa1f0c68a167b147a8573711283df2cd6fc285d220387f20206ff4874

2 changes: 1 addition & 1 deletion pure-docker/deploy-cadvisor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sudo docker run --detach \
--volume=/dev/disk/:/dev/disk:ro \
--privileged \
--device=/dev/kmsg \
index.docker.io/sourcegraph/cadvisor:187572_2022-12-06_cbecc5321c7d@sha256:755748f2f9b00d8f70bd65349e85235585bdf1a663e26198c8eaf91dfd5636e1 \
index.docker.io/sourcegraph/cadvisor:4.5.0@sha256:5117f2bc817c16fb129acb6f9b070af8f1be09d3d9a8f88e3297f7adfff9af0d \
--port=8080

echo "Deployed cadvisor"
2 changes: 1 addition & 1 deletion pure-docker/deploy-codeinsights-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ docker run --detach \
-e POSTGRES_USER=postgres \
-e PGDATA=/var/lib/postgresql/data/pgdata \
-v $VOLUME:/var/lib/postgresql/data/ \
index.docker.io/sourcegraph/codeinsights-db:187572_2022-12-06_cbecc5321c7d@sha256:4dd89a1279e7d55ddcb5b570d0bb544422dd1ecb0e3662f23d22f9643837c2b5
index.docker.io/sourcegraph/codeinsights-db:4.5.0@sha256:6c38760505cffe11b3490599078f586b58ca1922bee066e45f98cd7c458ae678

# Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
# but anything 12 and higher is supported.
Expand Down
2 changes: 1 addition & 1 deletion pure-docker/deploy-codeintel-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ docker run --detach \
--memory=2g \
-e PGDATA=/var/lib/postgresql/data/pgdata \
-v $VOLUME:/var/lib/postgresql/data/ \
index.docker.io/sourcegraph/codeintel-db:187572_2022-12-06_cbecc5321c7d@sha256:7fb02a9392ce4dd3d4210dbd5792c09c4210a2dfc6dc389ed679137784359102
index.docker.io/sourcegraph/codeintel-db:4.5.0@sha256:fc923d60a330b0b4b5dc086cf2a7a52dab7cff62592f1fc6dc466914df9d3f1b

# Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
# but anything 12 and higher is supported.
Expand Down
2 changes: 1 addition & 1 deletion pure-docker/deploy-frontend-internal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@ docker run --detach \
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
-e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \
-v $VOLUME:/mnt/cache \
index.docker.io/sourcegraph/frontend:187572_2022-12-06_cbecc5321c7d@sha256:73e64a8636e70ebbaf7f4a3300479529294f67e8cf644cdaea02435915aec869
index.docker.io/sourcegraph/frontend:4.5.0@sha256:3bf28af73687fa83af1f03ff21b1393f4b60949286a055d1ef4e529d2be840c5

echo "Deployed sourcegraph-frontend-internal service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-frontend.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ docker run --detach \
-e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \
-v $VOLUME:/mnt/cache \
-p 0.0.0.0:$((3080 + $1)):3080 \
index.docker.io/sourcegraph/frontend:187572_2022-12-06_cbecc5321c7d@sha256:73e64a8636e70ebbaf7f4a3300479529294f67e8cf644cdaea02435915aec869
index.docker.io/sourcegraph/frontend:4.5.0@sha256:3bf28af73687fa83af1f03ff21b1393f4b60949286a055d1ef4e529d2be840c5

# Note: SRC_GIT_SERVERS, SEARCHER_URL, and SYMBOLS_URL are space-separated
# lists which each allow you to specify more container instances for scaling
Expand Down
2 changes: 1 addition & 1 deletion pure-docker/deploy-github-proxy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ docker run --detach \
-e GOMAXPROCS=1 \
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
index.docker.io/sourcegraph/github-proxy:187572_2022-12-06_cbecc5321c7d@sha256:b4739adfced18f2a8883da931da681f444b489f6606052246f7c8d536f22e425
index.docker.io/sourcegraph/github-proxy:4.5.0@sha256:9599bd71a35fcde829ea272ade23c3b2ce9b0d4a46011220e7be844c807307c9

echo "Deployed github-proxy service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-gitserver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ docker run --detach \
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
-e 'GITHUB_BASE_URL=http://github-proxy:3180' \
-v $VOLUME:/data/repos \
index.docker.io/sourcegraph/gitserver:187572_2022-12-06_cbecc5321c7d@sha256:87642b2f0cccbdcd661e470c8f7aa6c022ab03065a2c8ab565afc4b8829a4531
index.docker.io/sourcegraph/gitserver:4.5.0@sha256:fd390905aca509bc37f6e2b912338de33eb689abf17caf4e58c16e4c3e94b0cf

echo "Deployed gitserver $1 service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-grafana.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker run --detach \
-v $VOLUME:/var/lib/grafana \
-v $(pwd)/../grafana/datasources:/sg_config_grafana/provisioning/datasources \
-v $(pwd)/../grafana/dashboards:/sg_grafana_additional_dashboards \
index.docker.io/sourcegraph/grafana:187572_2022-12-06_cbecc5321c7d@sha256:cf295a1dada50607a364390a54744dbc9142aa99b42c07f1bb623ca251639d2c
index.docker.io/sourcegraph/grafana:4.5.0@sha256:f70a7f79c5c90cab0d5cfb8f3dbca4dc60ed390b045aff1a86079c87bfe9a8af

# Add the following lines above if you wish to use an auth proxy with Grafana:
#
Expand Down
2 changes: 1 addition & 1 deletion pure-docker/deploy-migrator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ docker run --detach \
-e CODEINTEL_PGUSER=sg \
-e CODEINTEL_PGHOST=codeintel-db \
-e CODEINSIGHTS_PGDATASOURCE=postgres://postgres:password@codeinsights-db:5432/postgres \
index.docker.io/sourcegraph/migrator:187572_2022-12-06_cbecc5321c7d@sha256:93fc175df594738a98a62f2057271824cdb674b0e63bedac9dc7cb0f04db76bb \
index.docker.io/sourcegraph/migrator:4.5.0@sha256:687bb1794f530d178d30da4c5d32d2168fc95438d3727b7beed053fe1bcc6d9b \
up -db=all

echo "Deployed migrator service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-node-exporter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sudo docker run --detach \
--volume=/proc:/host/proc:ro \
--volume=/sys:/host/sys:ro \
-p 0.0.0.0:9100:9100 \
index.docker.io/sourcegraph/node-exporter:187572_2022-12-06_cbecc5321c7d@sha256:2d9dcdf0b2226f0c3d550a64d2667710265462350a3ba9ebe37d0302bc64af0f \
index.docker.io/sourcegraph/node-exporter:4.5.0@sha256:fa8e5700b7762fffe0674e944762f44bb787a7e44d97569fe55348260453bf80 \
'--path.procfs=/host/proc' \
'--path.rootfs=/rootfs' \
'--path.sysfs=/host/sys' \
Expand Down
2 changes: 1 addition & 1 deletion pure-docker/deploy-otel-collector.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ docker run --detach \
--memory=1g \
-e JAEGER_HOST=jaeger \
-v $(pwd)/../otel-collector/config.yaml:/etc/otel-collector/config.yaml \
index.docker.io/sourcegraph/opentelemetry-collector:187572_2022-12-06_cbecc5321c7d@sha256:113a84fcef33f06f7e529961d5eb64400488953b23ac07ea8a3d628db6789ef0 \
index.docker.io/sourcegraph/opentelemetry-collector:4.5.0@sha256:12f3fc137edea8319ebf574e15e6c27c19fb0b7ca17165973f98c8d8c342ca1d \
--config /etc/otel-collector/configs/logging.yaml
2 changes: 1 addition & 1 deletion pure-docker/deploy-pgsql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ docker run --detach \
--memory=2g \
-e PGDATA=/var/lib/postgresql/data/pgdata \
-v $VOLUME:/var/lib/postgresql/data/ \
index.docker.io/sourcegraph/postgres-12-alpine:187572_2022-12-06_cbecc5321c7d@sha256:44f6e9a51fafb99573cbd767f20f68913db5a02920c5974e4fa560735d745328
index.docker.io/sourcegraph/postgres-12-alpine:4.5.0@sha256:fc27849a8a70eb395afd22cea6d482f81c73bcf062eb7f78fa2f6e5a429b6a16

# Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
# but anything 12 and higher is supported.
Expand Down
2 changes: 1 addition & 1 deletion pure-docker/deploy-precise-code-intel-worker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ docker run --detach \
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
-e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \
index.docker.io/sourcegraph/precise-code-intel-worker:187572_2022-12-06_cbecc5321c7d@sha256:d1b1546d784fec8c90928a40e1b7eafc33202a53e4fcd501001d3f4a73e5c8ce
index.docker.io/sourcegraph/precise-code-intel-worker:4.5.0@sha256:b8fbdec7c2abdbe7fabf50be3d25568739a42ef2ee951b712ed4bf42ff2a2c4b

echo "Deployed precise-code-intel-worker service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-prometheus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ docker run --detach \
-v $VOLUME:/prometheus \
-v $(pwd)/../prometheus:/sg_prometheus_add_ons \
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
index.docker.io/sourcegraph/prometheus:187572_2022-12-06_cbecc5321c7d@sha256:2113ccab80409e995ee7ed9a3d386051f4ca73186375a3a0d7e3d55c90fa2007
index.docker.io/sourcegraph/prometheus:4.5.0@sha256:4fe9a5fdee206b1aac9d32afb31ad57e1882394aad9e7e9f719a1b2741afcae5
2 changes: 1 addition & 1 deletion pure-docker/deploy-redis-cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ docker run --detach \
--cpus=1 \
--memory=6g \
-v $VOLUME:/redis-data \
index.docker.io/sourcegraph/redis-cache:187572_2022-12-06_cbecc5321c7d@sha256:bb62b6d761513b1651e8499532570068a4509d5d0cf5131f0dd8b8e2ef74c72d
index.docker.io/sourcegraph/redis-cache:4.5.0@sha256:acdb0b6436648f88bbdee692d4f9f0b2b83d9e16f3ba16c3faa439bef0408d13

echo "Deployed redis-cache service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-redis-store.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ docker run --detach \
--cpus=1 \
--memory=6g \
-v $VOLUME:/redis-data \
index.docker.io/sourcegraph/redis-store:187572_2022-12-06_cbecc5321c7d@sha256:a3e4f611bcf1fe6f256a54b81f6ddb9fc2e45d7a038fa276b800b895eca09fe5
index.docker.io/sourcegraph/redis-store:4.5.0@sha256:1a134767207c443f883cc9b04ad8a29d1c56dd637138eb05fb276c47c1f1da5b

echo "Deployed redis-store service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-repo-updater.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ docker run --detach \
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
-e GITHUB_BASE_URL=http://github-proxy:3180 \
-v $VOLUME:/mnt/cache \
index.docker.io/sourcegraph/repo-updater:187572_2022-12-06_cbecc5321c7d@sha256:0bf2b95c73bceff8c3edb96299175fe36a550f57fd3f5256d38fa2c42992655a
index.docker.io/sourcegraph/repo-updater:4.5.0@sha256:9d1672276d37dcd6b2144328293bc89399b7e1d58fbfaea956b2ecf890edfbd3

echo "Deployed repo-updater service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-searcher.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ docker run --detach \
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
-v $VOLUME:/mnt/cache \
index.docker.io/sourcegraph/searcher:187572_2022-12-06_cbecc5321c7d@sha256:c0d7b580c31e956dc586e3947edd2afb850cf5954e83010236294c57478256da
index.docker.io/sourcegraph/searcher:4.5.0@sha256:7fdab442b17dbba759c3af11665ad153e5139f3f8aeabc52a71b730be43cf2b1

echo "Deployed searcher $1 service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-symbols.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ docker run --detach \
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
-v $VOLUME:/mnt/cache \
index.docker.io/sourcegraph/symbols:187572_2022-12-06_cbecc5321c7d@sha256:75615a60f318dc898eae2e5037efcd53e63cf28c2b8fca388b6923d215ff9db9
index.docker.io/sourcegraph/symbols:4.5.0@sha256:faa08c08907146181d7fbdcb4e971f1180aaba6eef5137e1bc4d270726258ec5

echo "Deployed symbols $1 service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-syntect-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ docker run --detach \
--restart=always \
--cpus=4 \
--memory=6g \
index.docker.io/sourcegraph/syntax-highlighter:187572_2022-12-06_cbecc5321c7d@sha256:b88b20f56e942cc253109bb7f4b07746ebaecc2ff7393cdaf6415ffb8778fc45
index.docker.io/sourcegraph/syntax-highlighter:4.5.0@sha256:2f9eab98c5913cc813e79489a11247718fb17ba9a06fd6283e802fade2fb60fa

echo "Deployed syntect-server service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-worker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ docker run --detach \
-e PRECISE_CODE_INTEL_UPLOAD_BACKEND=blobstore \
-e PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT=http://blobstore:9000 \
-v $VOLUME:/mnt/cache \
index.docker.io/sourcegraph/worker:187572_2022-12-06_cbecc5321c7d@sha256:0092211fee815b82d426ccf0a30999f8fb40749811e3a83c7570e576f028da74
index.docker.io/sourcegraph/worker:4.5.0@sha256:249ebd13177f6f61d59e5cb24fa40373a9ad65d2ebd622de3ba33b9221a9b8b2

echo "Deployed worker service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-zoekt-indexserver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ docker run --detach \
-e 'OPENTELEMETRY_DISABLED=false' \
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
-v $VOLUME:/data/index \
index.docker.io/sourcegraph/search-indexer:187572_2022-12-06_cbecc5321c7d@sha256:a3ae20e4130b4846e2c3078b9ba942854890348da37c8fa7ee385c081b7d1666
index.docker.io/sourcegraph/search-indexer:4.5.0@sha256:2cab0ebb22aacec48e65762e819b2bb4a5969ff1feb7a8c7b645e54700fb14ad

echo "Deployed zoekt-indexserver $1 service"
2 changes: 1 addition & 1 deletion pure-docker/deploy-zoekt-webserver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ docker run --detach \
-e 'OPENTELEMETRY_DISABLED=false' \
-e 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317' \
-v $VOLUME:/data/index \
index.docker.io/sourcegraph/indexed-searcher:187572_2022-12-06_cbecc5321c7d@sha256:79bec59c17482e4039931ed083113bd8723d74c42b96c3c489062f6b33b806f0
index.docker.io/sourcegraph/indexed-searcher:4.5.0@sha256:e58d02918558b617fa7533526d51ec176c0277d0051b0cb5aa3d03c84f3963fe

echo "Deployed zoekt-webserver $1 service"
7 changes: 0 additions & 7 deletions test/smoke-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,7 @@ deploy_sourcegraph() {
if [[ "$TEST_TYPE" == "pure-docker-test" ]]; then
./test/volume-config.sh
timeout 600s ./pure-docker/deploy.sh

if [[ "$GIT_BRANCH" == *"customer-replica"* ]]; then
# Expected number of containers on e.g. 3.18-customer-replica branch.
expect_containers="61"
else
# Expected number of containers on `master` branch.
expect_containers="26"
fi
elif [[ "$TEST_TYPE" == "docker-compose-test" ]]; then
docker-compose --file docker-compose/docker-compose.yaml up -d -t 600
expect_containers="27"
Expand Down