Skip to content

Commit fe3eb90

Browse files
authored
Revert "Merge branch 'release'" (#525)
This reverts commit 7f9cc4c, reversing changes made to d27e277.
1 parent 7f9cc4c commit fe3eb90

29 files changed

Lines changed: 50 additions & 51 deletions

.DS_Store

-10 KB
Binary file not shown.

.export.swp

-12 KB
Binary file not shown.

deploy-sourcegraph-docker

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
#
1313
pgsql:
1414
container_name: pgsql
15-
image: 'index.docker.io/sourcegraph/postgres-12.6:3.29.1@sha256:2d8bbfc7d954beb7d300261dfa9ad54bc6087ac16252b6bc1dd33ffec800ae46'
15+
image: 'index.docker.io/sourcegraph/postgres-12.6:95244_2021-05-06_2c1f77e@sha256:35040317490324a15e1259c9023a726eb27c694530f6f8877e87d337c7b97778'
1616
cpus: 4
1717
mem_limit: '2g'
1818
healthcheck:
@@ -29,7 +29,7 @@ services:
2929

3030
codeintel-db:
3131
container_name: codeintel-db
32-
image: 'index.docker.io/sourcegraph/codeintel-db:3.29.1@sha256:35040317490324a15e1259c9023a726eb27c694530f6f8877e87d337c7b97778'
32+
image: 'index.docker.io/sourcegraph/codeintel-db:91468_2021-03-30_b77d2e6@sha256:aa937c1c8ab20f3c809f04480d5a73791b05be59d3183726fd499ae0a123e982'
3333
cpus: 4
3434
mem_limit: '2g'
3535
healthcheck:

docker-compose/docker-compose.yaml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ services:
6969
# service.
7070
sourcegraph-frontend-0:
7171
container_name: sourcegraph-frontend-0
72-
image: 'index.docker.io/sourcegraph/frontend:3.29.1@sha256:ce659cb1a065ca295e2b209299eeb2c50a251a84dae54c27818273001e23f59e'
72+
image: 'index.docker.io/sourcegraph/frontend:insiders@sha256:07206787b154da77d133333a507bdd26df7fb6f17b696bcf1c628ac8f69a4236'
7373
cpus: 4
7474
mem_limit: '8g'
7575
environment:
@@ -113,7 +113,7 @@ services:
113113
#
114114
sourcegraph-frontend-internal:
115115
container_name: sourcegraph-frontend-internal
116-
image: 'index.docker.io/sourcegraph/frontend:3.29.1@sha256:ce659cb1a065ca295e2b209299eeb2c50a251a84dae54c27818273001e23f59e'
116+
image: 'index.docker.io/sourcegraph/frontend:insiders@sha256:07206787b154da77d133333a507bdd26df7fb6f17b696bcf1c628ac8f69a4236'
117117
cpus: 4
118118
mem_limit: '8g'
119119
environment:
@@ -159,7 +159,7 @@ services:
159159
#
160160
gitserver-0:
161161
container_name: gitserver-0
162-
image: 'index.docker.io/sourcegraph/gitserver:3.29.1@sha256:7c58baf8a36335ca86197c9d2c2db2c351f608a574973ce06b4790cc36ce9b0a'
162+
image: 'index.docker.io/sourcegraph/gitserver:insiders@sha256:2c2fb7ba482518481be45a17b0ac81698c3062efa2e4e2133ab928ab031a43bc'
163163
cpus: 4
164164
mem_limit: '8g'
165165
environment:
@@ -183,7 +183,7 @@ services:
183183
#
184184
zoekt-indexserver-0:
185185
container_name: zoekt-indexserver-0
186-
image: 'index.docker.io/sourcegraph/search-indexer:3.29.1@sha256:5675107888a618b47603759739c3f82ff90106dd06c68b017fa8ac65e8778ab6'
186+
image: 'index.docker.io/sourcegraph/search-indexer:insiders@sha256:5e9a2f7cdc3f46d84d3eaa03b8473d5a5850a7082291e3da961781d858b05a84'
187187
mem_limit: '16g'
188188
environment:
189189
- GOMAXPROCS=8
@@ -203,7 +203,7 @@ services:
203203
#
204204
zoekt-webserver-0:
205205
container_name: zoekt-webserver-0
206-
image: 'index.docker.io/sourcegraph/indexed-searcher:3.29.1@sha256:45e49dc5e188b0cfcdbee7d411c75d69b290bc1d933d801084374cdb8ea11e95'
206+
image: 'index.docker.io/sourcegraph/indexed-searcher:insiders@sha256:ede7be935ab07792cdf7a508e01dc5316915e30e8661c270d8d1c4f15c9ebd15'
207207
cpus: 8
208208
mem_limit: '50g'
209209
environment:
@@ -229,7 +229,7 @@ services:
229229
#
230230
searcher-0:
231231
container_name: searcher-0
232-
image: 'index.docker.io/sourcegraph/searcher:3.29.1@sha256:907c403a9e1b24b25d8b099e155bb4d22e3399cf985bf2119217b0797f7e57f3'
232+
image: 'index.docker.io/sourcegraph/searcher:insiders@sha256:8c5751c7a499cae8ba0ad772b06a02d6a8270021946fde71937480dd42ac64ac'
233233
cpus: 2
234234
mem_limit: '2g'
235235
environment:
@@ -257,7 +257,7 @@ services:
257257
#
258258
github-proxy:
259259
container_name: github-proxy
260-
image: 'index.docker.io/sourcegraph/github-proxy:3.29.1@sha256:68cdda9e9e3795b2da841b2a6ef5665e14b93a051cee9809bc9081fc04e48d7a'
260+
image: 'index.docker.io/sourcegraph/github-proxy:insiders@sha256:1e6c71f78d4729208bf2016977a18b7fa9a4856bbb111546c66bff49f914b54b'
261261
cpus: 1
262262
mem_limit: '1g'
263263
environment:
@@ -275,7 +275,7 @@ services:
275275
#
276276
precise-code-intel-worker:
277277
container_name: precise-code-intel-worker
278-
image: 'index.docker.io/sourcegraph/precise-code-intel-worker:3.29.1@sha256:364d097cce739ec158af2b795c6cb4402f296d9f761d4d8d2cbefa5a45e4a06e'
278+
image: 'index.docker.io/sourcegraph/precise-code-intel-worker:insiders@sha256:62992ccbd790f72e59bb03a79d13bcdc46bdf5680c01e84fb44cc51a9d484f8e'
279279
cpus: 2
280280
mem_limit: '4g'
281281
environment:
@@ -301,7 +301,7 @@ services:
301301
#
302302
query-runner:
303303
container_name: query-runner
304-
image: 'index.docker.io/sourcegraph/query-runner:3.29.1@sha256:dca71f41bf6244d903e87753c614c93e76aaea1d6876ed4324b7986047ab1efa'
304+
image: 'index.docker.io/sourcegraph/query-runner:insiders@sha256:59721e8267aa7ee95822c8609e9bba1ad1f6ebebf19b27203fe31905f5169278'
305305
cpus: 1
306306
mem_limit: '1g'
307307
environment:
@@ -320,7 +320,7 @@ services:
320320
#
321321
repo-updater:
322322
container_name: repo-updater
323-
image: 'index.docker.io/sourcegraph/repo-updater:3.29.1@sha256:247d27867f4be321dd371560ea21c47071c36c334cfcb3a56f1d413890b482e7'
323+
image: 'index.docker.io/sourcegraph/repo-updater:insiders@sha256:2b2b3f34bbb6d6dd045d976843337aaa29057b44637eddc352c7c8ba9da62c2c'
324324
cpus: 4
325325
mem_limit: '4g'
326326
environment:
@@ -342,7 +342,7 @@ services:
342342
#
343343
worker:
344344
container_name: worker
345-
image: 'index.docker.io/sourcegraph/worker:3.29.1@sha256:b0e4900f4ad41288b3c84e7ab7ac7e5a2e2355150f3d400b29ae8a018ac4ee8f'
345+
image: 'index.docker.io/sourcegraph/worker:insiders@sha256:b6bfaf41e075f1e9c342a39881f578a344c151c70dcf93099ebf8a82ad0011da'
346346
cpus: 4
347347
mem_limit: '4g'
348348
environment:
@@ -363,7 +363,7 @@ services:
363363
#
364364
syntect-server:
365365
container_name: syntect-server
366-
image: 'index.docker.io/sourcegraph/syntax-highlighter:3.29.1@sha256:1d2ac738eec37f8a3ac4da3d73350a4f9be6a2d730074f07ce42dd9dd978b5fc'
366+
image: 'index.docker.io/sourcegraph/syntax-highlighter:insiders@sha256:8854665264522a86b711c732d803395478dab30f6df6197b5d0c1c7c21cd6261'
367367
cpus: 4
368368
mem_limit: '6g'
369369
healthcheck:
@@ -384,7 +384,7 @@ services:
384384
#
385385
symbols-0:
386386
container_name: symbols-0
387-
image: 'index.docker.io/sourcegraph/symbols:3.29.1@sha256:eb4ab149e6eea7601dd7335df35b505649204f9a47e0c83efcfbc595d6f8914b'
387+
image: 'index.docker.io/sourcegraph/symbols:insiders@sha256:bdd8ee612b0291859874af64fca88d14a425be7670d8f49a06fc360fe7a433f7'
388388
cpus: 2
389389
mem_limit: '4g'
390390
environment:
@@ -411,7 +411,7 @@ services:
411411
#
412412
prometheus:
413413
container_name: prometheus
414-
image: 'index.docker.io/sourcegraph/prometheus:3.29.1@sha256:5d8b0fdb4bf012b11bdf0bfa79de755ab2ea3c132dcb3e65a7884253106c8989'
414+
image: 'index.docker.io/sourcegraph/prometheus:insiders@sha256:1e9505398973212f93094328ed22d725ac6773542d99b0e3845009702aa45068'
415415
cpus: 4
416416
mem_limit: '8g'
417417
volumes:
@@ -438,7 +438,7 @@ services:
438438
# 'GF_SERVER_ROOT_URL='https://grafana.example.com'
439439
grafana:
440440
container_name: grafana
441-
image: 'index.docker.io/sourcegraph/grafana:3.29.1@sha256:d391dfbe7b8d8fc2fa5f7c33ec4c909c2f258383984462ce64c8994dad15a787'
441+
image: 'index.docker.io/sourcegraph/grafana:insiders@sha256:28f89e88961ef7fc87b1b8c9f47ffae36bcfb3350b3782af3bbb4a5a956da4fb'
442442
cpus: 1
443443
mem_limit: '1g'
444444
volumes:
@@ -459,7 +459,7 @@ services:
459459
#
460460
cadvisor:
461461
container_name: cadvisor
462-
image: 'index.docker.io/sourcegraph/cadvisor:3.29.1@sha256:395e7b6b0f24f8aab511f22aa86e3dcb969e455e3bf0e512ce8b2831756fc912'
462+
image: 'index.docker.io/sourcegraph/cadvisor:insiders@sha256:ae163e3912bbbb1e2abd81581b81dc36b8ee9b3264805a7bde8bfb9f47981253'
463463
cpus: 1
464464
mem_limit: '1g'
465465
volumes:
@@ -486,7 +486,7 @@ services:
486486
#
487487
jaeger:
488488
container_name: jaeger
489-
image: 'index.docker.io/sourcegraph/jaeger-all-in-one:3.29.1@sha256:7722a13208fe6f8de68ad644c2e7ac2bfd87f7ad7c0e470f1df2ebec73d98ba7'
489+
image: 'index.docker.io/sourcegraph/jaeger-all-in-one:insiders@sha256:5ac56c83b2284a19cc736fe66cf11facaa084a28417382b35773ff1ab87fe166'
490490
cpus: 0.5
491491
mem_limit: '512m'
492492
ports:
@@ -513,7 +513,7 @@ services:
513513
#
514514
pgsql:
515515
container_name: pgsql
516-
image: 'index.docker.io/sourcegraph/postgres-12.6:3.29.1@sha256:2d8bbfc7d954beb7d300261dfa9ad54bc6087ac16252b6bc1dd33ffec800ae46'
516+
image: 'index.docker.io/sourcegraph/postgres-12.6:95244_2021-05-06_2c1f77e@sha256:35040317490324a15e1259c9023a726eb27c694530f6f8877e87d337c7b97778'
517517
cpus: 4
518518
mem_limit: '2g'
519519
healthcheck:
@@ -538,7 +538,7 @@ services:
538538
#
539539
codeintel-db:
540540
container_name: codeintel-db
541-
image: 'index.docker.io/sourcegraph/codeintel-db:3.29.1@sha256:35040317490324a15e1259c9023a726eb27c694530f6f8877e87d337c7b97778'
541+
image: 'index.docker.io/sourcegraph/codeintel-db:91468_2021-03-30_b77d2e6@sha256:aa937c1c8ab20f3c809f04480d5a73791b05be59d3183726fd499ae0a123e982'
542542
cpus: 4
543543
mem_limit: '2g'
544544
healthcheck:
@@ -567,7 +567,7 @@ services:
567567
# would be bad but it can be rebuilt given enough time.)
568568
codeinsights-db:
569569
container_name: codeinsights-db
570-
image: "index.docker.io/sourcegraph/codeinsights-db:3.29.1@sha256:f985af2fef860cc48be40ded864df025b8794b02b86e66cbc6c55bfe3c418831"
570+
image: "index.docker.io/sourcegraph/codeinsights-db:insiders@sha256:75be25ec13a1a2706adefff68c8101a58d692e8d36ebac3e43f33b9304e5b8c7"
571571
cpus: 4
572572
mem_limit: "2g"
573573
environment:
@@ -589,7 +589,7 @@ services:
589589
#
590590
minio:
591591
container_name: minio
592-
image: 'index.docker.io/sourcegraph/minio:3.29.1@sha256:4f39c3fa2ecf208c0df013e36883d25c3eb8a88ec10d6b1718c2f2b62a34c665'
592+
image: 'index.docker.io/sourcegraph/minio:insiders@sha256:4f39c3fa2ecf208c0df013e36883d25c3eb8a88ec10d6b1718c2f2b62a34c665'
593593
cpus: 1
594594
mem_limit: '1g'
595595
environment:
@@ -616,7 +616,7 @@ services:
616616
#
617617
redis-cache:
618618
container_name: redis-cache
619-
image: 'index.docker.io/sourcegraph/redis-cache:3.29.1@sha256:35245d84f0d154d12501ea4b997fa21913939cc4ce7c4de288b44d1d7e50624c'
619+
image: 'index.docker.io/sourcegraph/redis-cache:insiders@sha256:35245d84f0d154d12501ea4b997fa21913939cc4ce7c4de288b44d1d7e50624c'
620620
cpus: 1
621621
mem_limit: '7g'
622622
volumes:
@@ -632,7 +632,7 @@ services:
632632
#
633633
redis-store:
634634
container_name: redis-store
635-
image: 'index.docker.io/sourcegraph/redis-store:3.29.1@sha256:5e9fec6f4f9801fcd012a5eb4d35d1f50e9e7c6aad2733790698ab28b8378930'
635+
image: 'index.docker.io/sourcegraph/redis-store:insiders@sha256:5e9fec6f4f9801fcd012a5eb4d35d1f50e9e7c6aad2733790698ab28b8378930'
636636
cpus: 1
637637
mem_limit: '7g'
638638
volumes:

nginx/.DS_Store

-6 KB
Binary file not shown.

pure-docker/deploy-cadvisor.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ sudo docker run --detach \
2424
--volume=/sys:/sys:ro \
2525
--volume=/var/lib/docker/:/var/lib/docker:ro \
2626
--volume=/dev/disk/:/dev/disk:ro \
27-
index.docker.io/sourcegraph/cadvisor:3.29.1@sha256:395e7b6b0f24f8aab511f22aa86e3dcb969e455e3bf0e512ce8b2831756fc912 \
27+
index.docker.io/sourcegraph/cadvisor:insiders@sha256:90179250038aa47222dc9cea2cf8a9b1b35c3adb01a4bf42fc87b14963c01e91 \
2828
--port=8080
2929

3030
echo "Deployed cadvisor"

pure-docker/deploy-codeinsights-db.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ docker run --detach \
2020
-e POSTGRES_PASSWORD=password \
2121
-e PGDATA=/var/lib/postgresql/data/pgdata \
2222
-v $VOLUME:/var/lib/postgresql/data/ \
23-
index.docker.io/sourcegraph/codeinsights-db:3.29.1@sha256:f985af2fef860cc48be40ded864df025b8794b02b86e66cbc6c55bfe3c418831
23+
index.docker.io/sourcegraph/codeinsights-db:insiders@sha256:f985af2fef860cc48be40ded864df025b8794b02b86e66cbc6c55bfe3c418831
2424

2525
# Note: You should deploy this as a container, do not try to connect it to your external
2626
# Postgres deployment (TimescaleDB is a bit special and most hosted Postgres deployments

pure-docker/deploy-codeintel-db.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ docker run --detach \
1919
--memory=2g \
2020
-e PGDATA=/var/lib/postgresql/data/pgdata \
2121
-v $VOLUME:/var/lib/postgresql/data/ \
22-
index.docker.io/sourcegraph/codeintel-db:3.29.1@sha256:35040317490324a15e1259c9023a726eb27c694530f6f8877e87d337c7b97778
22+
index.docker.io/sourcegraph/codeintel-db:91468_2021-03-30_b77d2e6@sha256:aa937c1c8ab20f3c809f04480d5a73791b05be59d3183726fd499ae0a123e982
2323

2424
# Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
2525
# but anything 12 and higher is supported.

pure-docker/deploy-frontend-internal.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ docker run --detach \
4040
-e GITHUB_BASE_URL=http://github-proxy:3180 \
4141
-e PROMETHEUS_URL=http://prometheus:9090 \
4242
-v $VOLUME:/mnt/cache \
43-
index.docker.io/sourcegraph/frontend:3.29.1@sha256:ce659cb1a065ca295e2b209299eeb2c50a251a84dae54c27818273001e23f59e
43+
index.docker.io/sourcegraph/frontend:insiders@sha256:3a77ddb36fb8723d1b81ba422589a5008480f0c99f5f43b447d1e659bb8e915a
4444

4545
echo "Deployed sourcegraph-frontend-internal service"

0 commit comments

Comments
 (0)