Skip to content

Commit b686869

Browse files
authored
Embeddings Service (#918)
* Add embeddings service
1 parent 7904805 commit b686869

File tree

5 files changed

+81
-31
lines changed

5 files changed

+81
-31
lines changed

docker-compose/db-only-migrate.docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
#
1414
pgsql:
1515
container_name: pgsql
16-
image: 'index.docker.io/sourcegraph/postgres-12-alpine:187572_2022-12-06_cbecc5321c7d@sha256:44f6e9a51fafb99573cbd767f20f68913db5a02920c5974e4fa560735d745328'
16+
image: 'index.docker.io/sourcegraph/postgres-12-alpine:216430_2023-05-02_5.0-3cc9006de32c@sha256:931a3b043d79f4cc7692a96810e18f0db231f36534a6748ea862903768ceeef0'
1717
cpus: 4
1818
mem_limit: '2g'
1919
healthcheck:
@@ -30,7 +30,7 @@ services:
3030

3131
codeintel-db:
3232
container_name: codeintel-db
33-
image: 'index.docker.io/sourcegraph/codeintel-db:187572_2022-12-06_cbecc5321c7d@sha256:7fb02a9392ce4dd3d4210dbd5792c09c4210a2dfc6dc389ed679137784359102'
33+
image: 'index.docker.io/sourcegraph/codeintel-db:216430_2023-05-02_5.0-3cc9006de32c@sha256:931a3b043d79f4cc7692a96810e18f0db231f36534a6748ea862903768ceeef0'
3434
cpus: 4
3535
mem_limit: '2g'
3636
healthcheck:

docker-compose/docker-compose.yaml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
# for this container will need to be updated to reflect the new connection information.
1414
migrator:
1515
container_name: migrator
16-
image: 'index.docker.io/sourcegraph/migrator:187572_2022-12-06_cbecc5321c7d@sha256:93fc175df594738a98a62f2057271824cdb674b0e63bedac9dc7cb0f04db76bb'
16+
image: 'index.docker.io/sourcegraph/migrator:216430_2023-05-02_5.0-3cc9006de32c@sha256:b8e48a03a546e955eec228843b76f44ca86211c914fc0685f81985a2c20e269b'
1717
cpus: 0.5
1818
mem_limit: '500m'
1919
command: ['up']
@@ -124,7 +124,7 @@ services:
124124
# service.
125125
sourcegraph-frontend-0:
126126
container_name: sourcegraph-frontend-0
127-
image: 'index.docker.io/sourcegraph/frontend:187572_2022-12-06_cbecc5321c7d@sha256:73e64a8636e70ebbaf7f4a3300479529294f67e8cf644cdaea02435915aec869'
127+
image: 'index.docker.io/sourcegraph/frontend:216430_2023-05-02_5.0-3cc9006de32c@sha256:871772686b707f1e2d18524dc5d23837922eee244c91190ad8a636d88d3563df'
128128
cpus: 4
129129
mem_limit: '8g'
130130
environment:
@@ -182,7 +182,7 @@ services:
182182
#
183183
sourcegraph-frontend-internal:
184184
container_name: sourcegraph-frontend-internal
185-
image: 'index.docker.io/sourcegraph/frontend:187572_2022-12-06_cbecc5321c7d@sha256:73e64a8636e70ebbaf7f4a3300479529294f67e8cf644cdaea02435915aec869'
185+
image: 'index.docker.io/sourcegraph/frontend:216430_2023-05-02_5.0-3cc9006de32c@sha256:871772686b707f1e2d18524dc5d23837922eee244c91190ad8a636d88d3563df'
186186
cpus: 4
187187
mem_limit: '8g'
188188
environment:
@@ -230,7 +230,7 @@ services:
230230
#
231231
gitserver-0:
232232
container_name: gitserver-0
233-
image: 'index.docker.io/sourcegraph/gitserver:187572_2022-12-06_cbecc5321c7d@sha256:87642b2f0cccbdcd661e470c8f7aa6c022ab03065a2c8ab565afc4b8829a4531'
233+
image: 'index.docker.io/sourcegraph/gitserver:216430_2023-05-02_5.0-3cc9006de32c@sha256:c8f62c859b789be15ecc78c16e9fbf21cb818262b3880d87e48b05ff8bf2c684'
234234
cpus: 4
235235
mem_limit: '8g'
236236
environment:
@@ -254,7 +254,7 @@ services:
254254
#
255255
zoekt-indexserver-0:
256256
container_name: zoekt-indexserver-0
257-
image: 'index.docker.io/sourcegraph/search-indexer:187572_2022-12-06_cbecc5321c7d@sha256:a3ae20e4130b4846e2c3078b9ba942854890348da37c8fa7ee385c081b7d1666'
257+
image: 'index.docker.io/sourcegraph/search-indexer:216430_2023-05-02_5.0-3cc9006de32c@sha256:42e4dbd82a7038c8cc46f2748e897bdf8d8d0dea9d365151dec7946fabfef687'
258258
cpus: 8
259259
mem_limit: '16g'
260260
environment:
@@ -277,7 +277,7 @@ services:
277277
#
278278
zoekt-webserver-0:
279279
container_name: zoekt-webserver-0
280-
image: 'index.docker.io/sourcegraph/indexed-searcher:187572_2022-12-06_cbecc5321c7d@sha256:79bec59c17482e4039931ed083113bd8723d74c42b96c3c489062f6b33b806f0'
280+
image: 'index.docker.io/sourcegraph/indexed-searcher:216430_2023-05-02_5.0-3cc9006de32c@sha256:818a6d607f8ff35631a98d56ef8feb2a4257b6398473128132d85901c60b8b9d'
281281
cpus: 8
282282
mem_limit: '50g'
283283
environment:
@@ -304,7 +304,7 @@ services:
304304
#
305305
searcher-0:
306306
container_name: searcher-0
307-
image: 'index.docker.io/sourcegraph/searcher:187572_2022-12-06_cbecc5321c7d@sha256:c0d7b580c31e956dc586e3947edd2afb850cf5954e83010236294c57478256da'
307+
image: 'index.docker.io/sourcegraph/searcher:216430_2023-05-02_5.0-3cc9006de32c@sha256:4a40c10251454e5fda00f4b367f4f378e19b532bc93ba8a7dbfdefed27e10f05'
308308
cpus: 2
309309
mem_limit: '2g'
310310
environment:
@@ -331,7 +331,7 @@ services:
331331
#
332332
github-proxy:
333333
container_name: github-proxy
334-
image: 'index.docker.io/sourcegraph/github-proxy:187572_2022-12-06_cbecc5321c7d@sha256:b4739adfced18f2a8883da931da681f444b489f6606052246f7c8d536f22e425'
334+
image: 'index.docker.io/sourcegraph/github-proxy:216430_2023-05-02_5.0-3cc9006de32c@sha256:30d4550f51febc1e32ec8af175ef8cce4d1706fd75468572da86f6da451f546f'
335335
cpus: 1
336336
mem_limit: '1g'
337337
environment:
@@ -348,7 +348,7 @@ services:
348348
#
349349
precise-code-intel-worker:
350350
container_name: precise-code-intel-worker
351-
image: 'index.docker.io/sourcegraph/precise-code-intel-worker:187572_2022-12-06_cbecc5321c7d@sha256:d1b1546d784fec8c90928a40e1b7eafc33202a53e4fcd501001d3f4a73e5c8ce'
351+
image: 'index.docker.io/sourcegraph/precise-code-intel-worker:216430_2023-05-02_5.0-3cc9006de32c@sha256:6194050008a585b34e841f51529475312c24b17cbe36851d2a4988a5d1defb69'
352352
cpus: 2
353353
mem_limit: '4g'
354354
environment:
@@ -374,7 +374,7 @@ services:
374374
#
375375
repo-updater:
376376
container_name: repo-updater
377-
image: 'index.docker.io/sourcegraph/repo-updater:187572_2022-12-06_cbecc5321c7d@sha256:0bf2b95c73bceff8c3edb96299175fe36a550f57fd3f5256d38fa2c42992655a'
377+
image: 'index.docker.io/sourcegraph/repo-updater:216430_2023-05-02_5.0-3cc9006de32c@sha256:c91ae5f636b8a7a1b06d6c899da6a2b40f0be91aaf704116dac1c3a491db6517'
378378
cpus: 4
379379
mem_limit: '4g'
380380
environment:
@@ -395,7 +395,7 @@ services:
395395
#
396396
worker:
397397
container_name: worker
398-
image: 'index.docker.io/sourcegraph/worker:187572_2022-12-06_cbecc5321c7d@sha256:0092211fee815b82d426ccf0a30999f8fb40749811e3a83c7570e576f028da74'
398+
image: 'index.docker.io/sourcegraph/worker:216430_2023-05-02_5.0-3cc9006de32c@sha256:d3d9e1d684a1a4a337810dc0a9caa95bd9caa17120527be227ca3b5cae622b59'
399399
cpus: 4
400400
mem_limit: '4g'
401401
environment:
@@ -422,7 +422,7 @@ services:
422422
#
423423
syntect-server:
424424
container_name: syntect-server
425-
image: 'index.docker.io/sourcegraph/syntax-highlighter:187572_2022-12-06_cbecc5321c7d@sha256:b88b20f56e942cc253109bb7f4b07746ebaecc2ff7393cdaf6415ffb8778fc45'
425+
image: 'index.docker.io/sourcegraph/syntax-highlighter:216430_2023-05-02_5.0-3cc9006de32c@sha256:d39a9234cf5f9128d5bf7430448efd4284c505fab6a310c1ec08a62a9d396fea'
426426
cpus: 4
427427
mem_limit: '6g'
428428
healthcheck:
@@ -443,7 +443,7 @@ services:
443443
#
444444
symbols-0:
445445
container_name: symbols-0
446-
image: 'index.docker.io/sourcegraph/symbols:187572_2022-12-06_cbecc5321c7d@sha256:75615a60f318dc898eae2e5037efcd53e63cf28c2b8fca388b6923d215ff9db9'
446+
image: 'index.docker.io/sourcegraph/symbols:216430_2023-05-02_5.0-3cc9006de32c@sha256:bcf074d381291574d9e34df9c31665981bd4dc3ca737412bbeedf8fedcc6372b'
447447
cpus: 2
448448
mem_limit: '4g'
449449
environment:
@@ -469,7 +469,7 @@ services:
469469
#
470470
prometheus:
471471
container_name: prometheus
472-
image: 'index.docker.io/sourcegraph/prometheus:187572_2022-12-06_cbecc5321c7d@sha256:2113ccab80409e995ee7ed9a3d386051f4ca73186375a3a0d7e3d55c90fa2007'
472+
image: 'index.docker.io/sourcegraph/prometheus:216430_2023-05-02_5.0-3cc9006de32c@sha256:da67ba5c797a7b7752cebd6507e903a2726c172c01cab7ce0e7deadff288bab8'
473473
cpus: 4
474474
mem_limit: '8g'
475475
volumes:
@@ -496,7 +496,7 @@ services:
496496
# 'GF_SERVER_ROOT_URL='https://grafana.example.com'
497497
grafana:
498498
container_name: grafana
499-
image: 'index.docker.io/sourcegraph/grafana:187572_2022-12-06_cbecc5321c7d@sha256:cf295a1dada50607a364390a54744dbc9142aa99b42c07f1bb623ca251639d2c'
499+
image: 'index.docker.io/sourcegraph/grafana:216430_2023-05-02_5.0-3cc9006de32c@sha256:63baeadda6d33195ccd7d742670e500a80bacace3ed5cf0eb7d3a6c276ef7c34'
500500
cpus: 1
501501
mem_limit: '1g'
502502
volumes:
@@ -517,7 +517,7 @@ services:
517517
#
518518
cadvisor:
519519
container_name: cadvisor
520-
image: 'index.docker.io/sourcegraph/cadvisor:187572_2022-12-06_cbecc5321c7d@sha256:755748f2f9b00d8f70bd65349e85235585bdf1a663e26198c8eaf91dfd5636e1'
520+
image: 'index.docker.io/sourcegraph/cadvisor:216430_2023-05-02_5.0-3cc9006de32c@sha256:6ea7f53807e4a559ee825ba2a0c4c3b3f721275f0b5ce0e979f4fdad8a4e478a'
521521
cpus: 1
522522
mem_limit: '1g'
523523
# You may set `privileged` to `false and `cadvisor` will run with reduced privileges.
@@ -550,7 +550,7 @@ services:
550550
#
551551
node-exporter:
552552
container_name: node-exporter
553-
image: 'index.docker.io/sourcegraph/node-exporter:187572_2022-12-06_cbecc5321c7d@sha256:2d9dcdf0b2226f0c3d550a64d2667710265462350a3ba9ebe37d0302bc64af0f'
553+
image: 'index.docker.io/sourcegraph/node-exporter:216430_2023-05-02_5.0-3cc9006de32c@sha256:fa8e5700b7762fffe0674e944762f44bb787a7e44d97569fe55348260453bf80'
554554
cpus: .5
555555
mem_limit: '1g'
556556
pid: 'host'
@@ -579,7 +579,7 @@ services:
579579
#
580580
pgsql:
581581
container_name: pgsql
582-
image: 'index.docker.io/sourcegraph/postgres-12-alpine:187572_2022-12-06_cbecc5321c7d@sha256:44f6e9a51fafb99573cbd767f20f68913db5a02920c5974e4fa560735d745328'
582+
image: 'index.docker.io/sourcegraph/postgres-12-alpine:216430_2023-05-02_5.0-3cc9006de32c@sha256:931a3b043d79f4cc7692a96810e18f0db231f36534a6748ea862903768ceeef0'
583583
cpus: 4
584584
mem_limit: '4g'
585585
shm_size: '1g'
@@ -607,7 +607,7 @@ services:
607607
# for this container will need to be updated to reflect the new connection information.
608608
pgsql-exporter:
609609
container_name: pgsql-exporter
610-
image: 'index.docker.io/sourcegraph/postgres_exporter:187572_2022-12-06_cbecc5321c7d@sha256:85d9ca134db535f0482e6e5cacf194ea118bf24d0fd52e36ba6714802d59c30a'
610+
image: 'index.docker.io/sourcegraph/postgres_exporter:216430_2023-05-02_5.0-3cc9006de32c@sha256:0d88b491e837616f563fd3097cd4113338728e857ffee6d57b4c48ba1350af9f'
611611
cpus: 0.1
612612
mem_limit: '50m'
613613
networks:
@@ -626,7 +626,7 @@ services:
626626
#
627627
codeintel-db:
628628
container_name: codeintel-db
629-
image: 'index.docker.io/sourcegraph/codeintel-db:187572_2022-12-06_cbecc5321c7d@sha256:7fb02a9392ce4dd3d4210dbd5792c09c4210a2dfc6dc389ed679137784359102'
629+
image: 'index.docker.io/sourcegraph/codeintel-db:216430_2023-05-02_5.0-3cc9006de32c@sha256:931a3b043d79f4cc7692a96810e18f0db231f36534a6748ea862903768ceeef0'
630630
cpus: 4
631631
mem_limit: '4g'
632632
shm_size: '1g'
@@ -654,7 +654,7 @@ services:
654654
# for this container will need to be updated to reflect the new connection information.
655655
codeintel-db-exporter:
656656
container_name: codeintel-db-exporter
657-
image: 'index.docker.io/sourcegraph/postgres_exporter:187572_2022-12-06_cbecc5321c7d@sha256:85d9ca134db535f0482e6e5cacf194ea118bf24d0fd52e36ba6714802d59c30a'
657+
image: 'index.docker.io/sourcegraph/postgres_exporter:216430_2023-05-02_5.0-3cc9006de32c@sha256:0d88b491e837616f563fd3097cd4113338728e857ffee6d57b4c48ba1350af9f'
658658
cpus: 0.1
659659
mem_limit: '50m'
660660
networks:
@@ -673,7 +673,7 @@ services:
673673
#
674674
codeinsights-db:
675675
container_name: codeinsights-db
676-
image: 'index.docker.io/sourcegraph/codeinsights-db:187572_2022-12-06_cbecc5321c7d@sha256:4dd89a1279e7d55ddcb5b570d0bb544422dd1ecb0e3662f23d22f9643837c2b5'
676+
image: 'index.docker.io/sourcegraph/codeinsights-db:216430_2023-05-02_5.0-3cc9006de32c@sha256:910e98d4ddb6e5fef28be69f6395e567bbfab3f29f9d340dcdf45e83ca84cdd3'
677677
cpus: 4
678678
mem_limit: '2g'
679679
shm_size: '1g'
@@ -706,7 +706,7 @@ services:
706706
# for this container will need to be updated to reflect the new connection information.
707707
codeinsights-db-exporter:
708708
container_name: codeinsights-db-exporter
709-
image: 'index.docker.io/sourcegraph/postgres_exporter:187572_2022-12-06_cbecc5321c7d@sha256:85d9ca134db535f0482e6e5cacf194ea118bf24d0fd52e36ba6714802d59c30a'
709+
image: 'index.docker.io/sourcegraph/postgres_exporter:216430_2023-05-02_5.0-3cc9006de32c@sha256:0d88b491e837616f563fd3097cd4113338728e857ffee6d57b4c48ba1350af9f'
710710
cpus: 0.1
711711
mem_limit: '50m'
712712
networks:
@@ -725,7 +725,7 @@ services:
725725
#
726726
blobstore:
727727
container_name: blobstore
728-
image: 'index.docker.io/sourcegraph/blobstore:187572_2022-12-06_cbecc5321c7d@sha256:8e57384c78a3b31cbe31d41656dbcbb8ee7279d96630a33936a2098afabb1317'
728+
image: 'index.docker.io/sourcegraph/blobstore:216430_2023-05-02_5.0-3cc9006de32c@sha256:ae1cf541f65441809f3495c037af4f9df1d049defdf0309a65d685f579c7e594'
729729
cpus: 1
730730
mem_limit: '1g'
731731
healthcheck:
@@ -748,7 +748,7 @@ services:
748748
#
749749
redis-cache:
750750
container_name: redis-cache
751-
image: 'index.docker.io/sourcegraph/redis-cache:187572_2022-12-06_cbecc5321c7d@sha256:bb62b6d761513b1651e8499532570068a4509d5d0cf5131f0dd8b8e2ef74c72d'
751+
image: 'index.docker.io/sourcegraph/redis-cache:216430_2023-05-02_5.0-3cc9006de32c@sha256:60d9265507efe5b9ae51087bc7433932dfcd84d7e75c2513800baeb93fa9ea0f'
752752
cpus: 1
753753
mem_limit: '7g'
754754
volumes:
@@ -764,7 +764,7 @@ services:
764764
#
765765
redis-store:
766766
container_name: redis-store
767-
image: 'index.docker.io/sourcegraph/redis-store:187572_2022-12-06_cbecc5321c7d@sha256:a3e4f611bcf1fe6f256a54b81f6ddb9fc2e45d7a038fa276b800b895eca09fe5'
767+
image: 'index.docker.io/sourcegraph/redis-store:216430_2023-05-02_5.0-3cc9006de32c@sha256:fd1640997cad4ce114b98a7885636e6f48483712cea754411cf4d47e770d9219'
768768
cpus: 1
769769
mem_limit: '7g'
770770
volumes:
@@ -779,7 +779,7 @@ services:
779779
# Ports exposed to the public internet: none
780780
otel-collector:
781781
container_name: otel-collector
782-
image: 'index.docker.io/sourcegraph/opentelemetry-collector:187572_2022-12-06_cbecc5321c7d@sha256:113a84fcef33f06f7e529961d5eb64400488953b23ac07ea8a3d628db6789ef0'
782+
image: 'index.docker.io/sourcegraph/opentelemetry-collector:216430_2023-05-02_5.0-3cc9006de32c@sha256:7783e0a2676813f955f45debc10099ee97e104c42fe27cd315848ba58de86cd4'
783783
cpus: 1
784784
mem_limit: '1g'
785785
networks:
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
version: '2.4'
2+
services:
3+
# Description: Handles embeddings searches for Cody.
4+
#
5+
# Ports exposed to other Sourcegraph services: 6060/TCP
6+
# Ports exposed to the public internet: none
7+
#
8+
embeddings:
9+
container_name: embeddings
10+
image: 'index.docker.io/sourcegraph/embeddings:216430_2023-05-02_5.0-3cc9006de32c@sha256:c8cd7c5abca562d6a79bb524c49b9d0e76a3cb119226baa29ca0508faf652f03'
11+
cpus: 4
12+
mem_limit: '64g'
13+
environment:
14+
- 'SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090'
15+
- 'OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317'
16+
- 'SRC_GIT_SERVERS=gitserver-0:3178'
17+
# Assuming you use the blobstore deployment, this is all it takes to access
18+
# stored embeddings from this service. If you use a cloud storage bucket,
19+
# configure by following the docs
20+
# https://docs.sourcegraph.com/cody/explanations/code_graph_context#storing-embedding-indexes
21+
# IMPORTANT: config must match `worker` below
22+
- 'EMBEDDINGS_UPLOAD_BACKEND=blobstore'
23+
- 'EMBEDDINGS_UPLOAD_AWS_ENDPOINT=http://blobstore:9000'
24+
networks:
25+
- sourcegraph
26+
restart: always
27+
28+
worker:
29+
environment:
30+
- 'EMBEDDINGS_UPLOAD_BACKEND=blobstore'
31+
- 'EMBEDDINGS_UPLOAD_AWS_ENDPOINT=http://blobstore:9000'
32+
33+
sourcegraph-frontend-0:
34+
environment:
35+
# Adding embeddings and to the list of prof services. (Last entry is new).
36+
- |
37+
SRC_PROF_SERVICES=
38+
[
39+
{ "Name": "frontend-0", "Host": "sourcegraph-frontend-0:6060" },
40+
{ "Name": "frontend-internal-0", "Host": "sourcegraph-frontend-internal:6060" },
41+
{ "Name": "gitserver-0", "Host": "gitserver-0:6060" },
42+
{ "Name": "searcher-0", "Host": "searcher-0:6060" },
43+
{ "Name": "symbols-0", "Host": "symbols-0:6060" },
44+
{ "Name": "repo-updater", "Host": "repo-updater:6060" },
45+
{ "Name": "github-proxy", "Host": "github-proxy:6060" },
46+
{ "Name": "worker", "Host": "worker:6060" },
47+
{ "Name": "zoekt-indexserver-0", "Host": "zoekt-indexserver-0:6072" },
48+
{ "Name": "zoekt-webserver-0", "Host": "zoekt-webserver-0:6070", "DefaultPath": "/debug/requests/" },
49+
{ "Name": "embeddings", "Host": "embeddings:6060" }
50+
]

docker-compose/executors/executor.docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '2.4'
22
services:
33
executor:
44
container_name: executor
5-
image: 'index.docker.io/sourcegraph/executor:insiders@sha256:21ed2073df3ae60ac548546e6ecc3a2c3c00b31c635df67508ee11079d5bf156'
5+
image: 'index.docker.io/sourcegraph/executor:216430_2023-05-02_5.0-3cc9006de32c@sha256:c4a3345793d3e858631dde1eac69b10cc37bc522e7266f9061ed8ad1fde6e8a0'
66
cpus: 1
77
mem_limit: '4g'
88
# Run as root (required for docker daemon control)

docker-compose/jaeger/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
#
1111
jaeger:
1212
container_name: jaeger
13-
image: 'index.docker.io/sourcegraph/jaeger-all-in-one:187572_2022-12-06_cbecc5321c7d@sha256:8d32c6f19e3b424d1a8fea89cd2b503b0358bf74be6120f6bf6bb22435d11741'
13+
image: 'index.docker.io/sourcegraph/jaeger-all-in-one:216430_2023-05-02_5.0-3cc9006de32c@sha256:ec73cff6ea398d96241a9451634fc83682292b0175cc63c09f1f866cf03beb8d'
1414
cpus: 0.5
1515
mem_limit: '512m'
1616
ports:

0 commit comments

Comments
 (0)