Skip to content
Closed
Show file tree
Hide file tree
Changes from 3 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
4 changes: 2 additions & 2 deletions docker-compose/db-only-migrate.docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
#
pgsql:
container_name: pgsql
image: 'index.docker.io/sourcegraph/postgres-12-alpine:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8'
image: 'index.docker.io/sourcegraph/postgres-12-alpine:5.10.2832@sha256:019bb4090f2bc20218887f5fd1bcfaa122ca090460f5803e1df4f6637947cb26'
cpus: 4
mem_limit: '2g'
healthcheck:
Expand All @@ -30,7 +30,7 @@ services:

codeintel-db:
container_name: codeintel-db
image: 'index.docker.io/sourcegraph/codeintel-db:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8'
image: 'index.docker.io/sourcegraph/codeintel-db:5.10.2832@sha256:019bb4090f2bc20218887f5fd1bcfaa122ca090460f5803e1df4f6637947cb26'
cpus: 4
mem_limit: '2g'
healthcheck:
Expand Down
54 changes: 27 additions & 27 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:5.9.1590@sha256:7031d742e1eeb7843aa9a9af4165c96b59776da0d630742b77fb805f12864ac6'
image: 'index.docker.io/sourcegraph/migrator:5.10.2832@sha256:4f5e69016f947211ef7d14e88df091550a6472f5281b025f08d234d8acc0d993'
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/sourcegraph/caddy:5.9.1590@sha256:2ce418076ccc4f0d75bab18a587f8a3853f5e02daaf1f3946232f3dea399c05a'
image: 'index.docker.io/sourcegraph/caddy:5.10.2832@sha256:c32388e630abaf57bebf43fa0536b7bc1026360a0cb63908a89d7a3d227a00aa'
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:5.9.1590@sha256:8ee5bf8cf1addad9c9165681a162be6f695bfa823a9cb97114758a849a39892c'
image: 'index.docker.io/sourcegraph/frontend:5.10.2832@sha256:b918b672d858dc6e0c9e48f0669a59bc1a78aed9bfceec020788f689829ad415'
cpus: 4
mem_limit: '8g'
environment:
Expand Down Expand Up @@ -180,7 +180,7 @@ services:
#
sourcegraph-frontend-internal:
container_name: sourcegraph-frontend-internal
image: 'index.docker.io/sourcegraph/frontend:5.9.1590@sha256:8ee5bf8cf1addad9c9165681a162be6f695bfa823a9cb97114758a849a39892c'
image: 'index.docker.io/sourcegraph/frontend:5.10.2832@sha256:b918b672d858dc6e0c9e48f0669a59bc1a78aed9bfceec020788f689829ad415'
cpus: 4
mem_limit: '8g'
environment:
Expand Down Expand Up @@ -227,7 +227,7 @@ services:
#
gitserver-0:
container_name: gitserver-0
image: 'index.docker.io/sourcegraph/gitserver:5.9.1590@sha256:63ab3a2dbd3bc678e4bdd313bcaa277607a8cf2d88e82897d043a070a7da7471'
image: 'index.docker.io/sourcegraph/gitserver:5.10.2832@sha256:da3e193ab6b37ffa9374fb44d727ebfdbe62f88e117c902e488b348c59663ace'
cpus: 4
mem_limit: '8g'
environment:
Expand All @@ -250,7 +250,7 @@ services:
#
zoekt-indexserver-0:
container_name: zoekt-indexserver-0
image: 'index.docker.io/sourcegraph/search-indexer:5.9.1590@sha256:93a61fc432c7776144c1bff3c682143b6a2634acf64d9d5c5ab857c72810bc35'
image: 'index.docker.io/sourcegraph/search-indexer:5.10.2832@sha256:deedce4cb9a7c01105904c427d615a23e34301e52728af8f08c73fda4eecbee1'
cpus: 8
mem_limit: '16g'
environment:
Expand All @@ -273,7 +273,7 @@ services:
#
zoekt-webserver-0:
container_name: zoekt-webserver-0
image: 'index.docker.io/sourcegraph/indexed-searcher:5.9.1590@sha256:49499a9b8eda091f6cbe41058e1701994dd09ffbb9de2dddde34943db32643c3'
image: 'index.docker.io/sourcegraph/indexed-searcher:5.10.2832@sha256:876a5b31fd55dfcd827329b64e2ba5bcce7ed268e0964736b4527aa8b17a835b'
cpus: 8
mem_limit: '50g'
environment:
Expand All @@ -300,7 +300,7 @@ services:
#
searcher-0:
container_name: searcher-0
image: 'index.docker.io/sourcegraph/searcher:5.9.1590@sha256:76173ca0542622c390c5ae2af2cf8e40a9b175f01dc4a9c931285ac2cfd88854'
image: 'index.docker.io/sourcegraph/searcher:5.10.2832@sha256:cd129b4232059e670d275a1c5b20b46c869b099631014c5980258f608f4b5053'
cpus: 2
mem_limit: '2g'
environment:
Expand All @@ -324,7 +324,7 @@ services:
#
precise-code-intel-worker:
container_name: precise-code-intel-worker
image: 'index.docker.io/sourcegraph/precise-code-intel-worker:5.9.1590@sha256:3f0257b29bc7b79a05701d33e4d1b14998a33254644fe478569ee23b9ec229be'
image: 'index.docker.io/sourcegraph/precise-code-intel-worker:5.10.2832@sha256:62f10f3cd7aa7dd74053ac76057c914b90a8ced07c999e3d862b50544b11bc09'
cpus: 2
mem_limit: '4g'
environment:
Expand All @@ -350,7 +350,7 @@ services:
#
repo-updater:
container_name: repo-updater
image: 'index.docker.io/sourcegraph/repo-updater:5.9.1590@sha256:d8ec1e1487ed803d07f9fb0dfa2db0a4a637871fa7ba778378749a398de724d9'
image: 'index.docker.io/sourcegraph/repo-updater:5.10.2832@sha256:2fc71baa001a842760f219379343e7f89ed144ad8e2d9925ed3f988ba15b9b35'
cpus: 4
mem_limit: '4g'
environment:
Expand All @@ -370,7 +370,7 @@ services:
#
worker:
container_name: worker
image: 'index.docker.io/sourcegraph/worker:5.9.1590@sha256:b258021d297a7a562982a5606507d4e4ddb27ebe010f3fdbbda20ab7f0a9f4fc'
image: 'index.docker.io/sourcegraph/worker:5.10.2832@sha256:a4a9a4fb88855ce043536e0f694e29327cea881a8ca28a54a99d87d3bc63f783'
cpus: 4
mem_limit: '4g'
environment:
Expand All @@ -396,7 +396,7 @@ services:
#
syntect-server:
container_name: syntect-server
image: 'index.docker.io/sourcegraph/syntax-highlighter:5.9.1590@sha256:7a15d6fd63d0d6a39f9066209f3c406674b41cf1d365e172cc30cd877e7c0885'
image: 'index.docker.io/sourcegraph/syntax-highlighter:5.10.2832@sha256:6043ae53bb68c84ef466902dce435e2e42f72a6ebb6fbc3c1902554ca946917f'
cpus: 4
mem_limit: '6g'
healthcheck:
Expand All @@ -417,7 +417,7 @@ services:
#
symbols-0:
container_name: symbols-0
image: 'index.docker.io/sourcegraph/symbols:5.9.1590@sha256:f4c570b42fbdedc132010c94f1d20fa286c09b255b4bc57e51885b41dd4ea886'
image: 'index.docker.io/sourcegraph/symbols:5.10.2832@sha256:83b4a9d2c6b14f16adaffcd87578efd132dadcf7307611661e3c6bc61f1c9640'
cpus: 2
mem_limit: '4g'
environment:
Expand All @@ -443,7 +443,7 @@ services:
#
prometheus:
container_name: prometheus
image: 'index.docker.io/sourcegraph/prometheus:5.9.1590@sha256:c05d053c0a4faaf8f814996bb922fd74784cc6853dd23a33e4df61e56262ac44'
image: 'index.docker.io/sourcegraph/prometheus:5.10.2832@sha256:18023ce87c412b62e3c8f56030247de55f0d545608edefdfc041c5a95d1c4951'
cpus: 4
mem_limit: '8g'
volumes:
Expand All @@ -470,7 +470,7 @@ services:
# 'GF_SERVER_ROOT_URL='https://grafana.example.com'
grafana:
container_name: grafana
image: 'index.docker.io/sourcegraph/grafana:5.9.1590@sha256:ac4e6f2ab247165ee07314f8947d32a9df5bef4a24e73413b3b3664da870954f'
image: 'index.docker.io/sourcegraph/grafana:5.10.2832@sha256:5bbc2a2a9a32490a0ea7969a400ae17af1baa22a8216c45fa14168d560574f79'
cpus: 1
mem_limit: '1g'
volumes:
Expand All @@ -491,7 +491,7 @@ services:
#
cadvisor:
container_name: cadvisor
image: 'index.docker.io/sourcegraph/cadvisor:5.9.1590@sha256:406a3e6b0ca6384008be43c9b87c761c8e98737f2294af92bcaa2a35a563e63e'
image: 'index.docker.io/sourcegraph/cadvisor:5.10.2832@sha256:22f81bf1d57b6f9d14c831639f6ec8057649c4d1525d0df46efb4872d5e95308'
cpus: 1
mem_limit: '1g'
# You may set `privileged` to `false and `cadvisor` will run with reduced privileges.
Expand Down Expand Up @@ -524,7 +524,7 @@ services:
#
node-exporter:
container_name: node-exporter
image: 'index.docker.io/sourcegraph/node-exporter:5.9.1590@sha256:5a7d2c0b90a86dfb852053e0af4b6b701606dc4e4f69b15411fe9d123198ff2b'
image: 'index.docker.io/sourcegraph/node-exporter:5.10.2832@sha256:c31345f0ad1f9665b121d09df45ba9cfc87945b31a8ae7aaa528a2564e3002e4'
cpus: .5
mem_limit: '1g'
pid: 'host'
Expand Down Expand Up @@ -553,7 +553,7 @@ services:
#
pgsql:
container_name: pgsql
image: 'index.docker.io/sourcegraph/postgres-12-alpine:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8'
image: 'index.docker.io/sourcegraph/postgresql-16:5.10.2832@sha256:7a637a98960cb7d3ac6705c7f7335874c005ed9f0c68bfaa0e5eebf2d7f71e94'
cpus: 4
mem_limit: '4g'
shm_size: '1g'
Expand Down Expand Up @@ -581,7 +581,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:5.9.1590@sha256:ebf5dd7809ae10b617d497f71f430022f88dcab92b55fb4c58df60c43345ab34'
image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.2832@sha256:190eea7189d7831be9f04f13a47cfb19de9a1c1ac18739ac40d261f05c2b41aa'
cpus: 0.1
mem_limit: '50m'
networks:
Expand All @@ -600,7 +600,7 @@ services:
#
codeintel-db:
container_name: codeintel-db
image: 'index.docker.io/sourcegraph/codeintel-db:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8'
image: 'index.docker.io/sourcegraph/postgresql-16:5.10.2832@sha256:7a637a98960cb7d3ac6705c7f7335874c005ed9f0c68bfaa0e5eebf2d7f71e94'
cpus: 4
mem_limit: '4g'
shm_size: '1g'
Expand Down Expand Up @@ -628,7 +628,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:5.9.1590@sha256:ebf5dd7809ae10b617d497f71f430022f88dcab92b55fb4c58df60c43345ab34'
image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.2832@sha256:190eea7189d7831be9f04f13a47cfb19de9a1c1ac18739ac40d261f05c2b41aa'
cpus: 0.1
mem_limit: '50m'
networks:
Expand All @@ -647,7 +647,7 @@ services:
#
codeinsights-db:
container_name: codeinsights-db
image: 'index.docker.io/sourcegraph/codeinsights-db:5.9.1590@sha256:4e75b2c463ce1ef3bfeec4bb71a16693df02005e66b9e697859ce61064e08f42'
image: 'index.docker.io/sourcegraph/postgresql-16-codeinsights:5.10.2832@sha256:96b88fb2fe8bbd735be8ee75e5b49c70d7dc11089ae5fa7307955728adba6a7d'
cpus: 4
mem_limit: '2g'
shm_size: '1g'
Expand Down Expand Up @@ -680,7 +680,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:5.9.1590@sha256:ebf5dd7809ae10b617d497f71f430022f88dcab92b55fb4c58df60c43345ab34'
image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.2832@sha256:190eea7189d7831be9f04f13a47cfb19de9a1c1ac18739ac40d261f05c2b41aa'
cpus: 0.1
mem_limit: '50m'
networks:
Expand All @@ -699,7 +699,7 @@ services:
#
blobstore:
container_name: blobstore
image: 'index.docker.io/sourcegraph/blobstore:5.9.1590@sha256:e0a170cbc4ecab83ed0471273c2632394a602dea1817e698affc72c14c7469ca'
image: 'index.docker.io/sourcegraph/blobstore:5.10.2832@sha256:f6b5ca96aa06a48e0c2c1f0387af74bb965029e27d4e0a58cdc38fbd4ac3c80e'
cpus: 1
mem_limit: '1g'
healthcheck:
Expand All @@ -722,7 +722,7 @@ services:
#
redis-cache:
container_name: redis-cache
image: 'index.docker.io/sourcegraph/redis-cache:5.9.1590@sha256:aca0a5616ef20c955aeca2e71034e0d4dd65e899716cdc08d72ef1ce1fa9564f'
image: 'index.docker.io/sourcegraph/redis-cache:5.10.2832@sha256:7c62920aa1cfbaf4f7ecb216786120a0f880de872669dea5afa0459af5bf36a5'
cpus: 1
mem_limit: '7g'
volumes:
Expand All @@ -738,7 +738,7 @@ services:
#
redis-store:
container_name: redis-store
image: 'index.docker.io/sourcegraph/redis-store:5.9.1590@sha256:d7d8b5cd4d784b6f8025941701f6db95e0d3ea263e165b611295d30bdc0e6e60'
image: 'index.docker.io/sourcegraph/redis-store:5.10.2832@sha256:413d44f4cc7ec3625f0dcaac2b2a8faa3c2455e78df7ba0e7485e2f0b09a2a41'
cpus: 1
mem_limit: '7g'
volumes:
Expand All @@ -753,7 +753,7 @@ services:
# Ports exposed to the public internet: none
otel-collector:
container_name: otel-collector
image: 'index.docker.io/sourcegraph/opentelemetry-collector:5.9.1590@sha256:21eb71c47ee13f071e899fd16befd25357449da4fd279a0d0d000b59aa9e3057'
image: 'index.docker.io/sourcegraph/opentelemetry-collector:5.10.2832@sha256:b1cc044ff1263220944c00bd056779fe789deb72aaf7d5f9f23bba1af66683dd'
cpus: 1
mem_limit: '1g'
networks:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/executors/executor.docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2.4'
services:
executor:
container_name: executor
image: 'index.docker.io/sourcegraph/executor:5.9.1590@sha256:131141c304cceadcfe7afbe73f909d1202c39140225e3e9476963ffbd9eb3214'
image: 'index.docker.io/sourcegraph/executor:5.10.2832@sha256:f47dfe9663f316cb224f401f6be3bbf96ae4f3bbd379fb4322f5ff5fca31b40b'
cpus: 1
mem_limit: '4g'
# Run as root (required for docker daemon control)
Expand Down
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:5.9.1590@sha256:58bf91017d27e766374cfe4c4d526138fad5ca93944ae46aca1760fdbc7edf75'
image: 'index.docker.io/sourcegraph/jaeger-all-in-one:5.10.2832@sha256:1d316ea0996b31dc38bef8ccee74f1bd0383500931ea0f79defa69a9594c6144'
cpus: 0.5
mem_limit: '512m'
ports:
Expand Down
22 changes: 11 additions & 11 deletions pure-docker/deploy-codeinsights-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ VOLUME="$HOME/sourcegraph-docker/codeinsights-db-disk"
./ensure-volume.sh $VOLUME 999

docker run --detach \
--name=codeinsights-db \
--network=sourcegraph \
--restart=always \
--cpus=4 \
--memory=2g \
-e POSTGRES_DB=postgres \
-e POSTGRES_PASSWORD=password \
-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
--name=codeinsights-db \
--network=sourcegraph \
--restart=always \
--cpus=4 \
--memory=2g \
-e POSTGRES_DB=postgres \
-e POSTGRES_PASSWORD=password \
-e POSTGRES_USER=postgres \
-e PGDATA=/var/lib/postgresql/data/pgdata \
-v $VOLUME:/var/lib/postgresql/data/ \
index.docker.io/sourcegraph/postgresql-16-codeinsights:insiders

# Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
# but anything 12 and higher is supported.
Expand Down
16 changes: 8 additions & 8 deletions pure-docker/deploy-codeintel-db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ set -e
VOLUME="$HOME/sourcegraph-docker/codeintel-db-disk"
./ensure-volume.sh $VOLUME 999
docker run --detach \
--name=codeintel-db \
--network=sourcegraph \
--restart=always \
--cpus=4 \
--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
--name=codeintel-db \
--network=sourcegraph \
--restart=always \
--cpus=4 \
--memory=2g \
-e PGDATA=/var/lib/postgresql/data/pgdata \
-v $VOLUME:/var/lib/postgresql/data/ \
index.docker.io/sourcegraph/postgresql-16:insiders

# Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
# but anything 12 and higher is supported.
Expand Down
16 changes: 8 additions & 8 deletions pure-docker/deploy-pgsql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ set -e
VOLUME="$HOME/sourcegraph-docker/pgsql-disk"
./ensure-volume.sh $VOLUME 999
docker run --detach \
--name=pgsql \
--network=sourcegraph \
--restart=always \
--cpus=4 \
--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
--name=pgsql \
--network=sourcegraph \
--restart=always \
--cpus=4 \
--memory=2g \
-e PGDATA=/var/lib/postgresql/data/pgdata \
-v $VOLUME:/var/lib/postgresql/data/ \
index.docker.io/sourcegraph/postgresql-16:insiders

# Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
# but anything 12 and higher is supported.
Expand Down
Loading