Skip to content
Closed
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
4 changes: 2 additions & 2 deletions .buildkite/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ steps:
sg release run test --workdir=. --config-from-commit

- label: "(promote) Release: test"
if: build.branch =~ /^promote\/release-.*/
if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/
plugins:
- ssh://git@github.com/sourcegraph/sg-buildkite-plugin.git#main: ~
command: |
Expand All @@ -58,7 +58,7 @@ steps:


- label: "(promote) Release: finalize"
if: build.branch =~ /^promote\/release-.*/
if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/
plugins:
- ssh://git@github.com/sourcegraph/sg-buildkite-plugin.git#main: ~
command: |
Expand Down
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/postgresql-16:6.0.0@sha256:224a2604331cb73809f466394c5b4f3ca95bf6a5a140cb75820dfe67301074bb'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgresql-16:8.1.1335@sha256:4e2a8621a4b6b1d512eefdf1238b4cd95d68b31a1949619d998154ee6d12f1ec'
cpus: 4
mem_limit: '2g'
healthcheck:
Expand All @@ -30,7 +30,7 @@ services:

codeintel-db:
container_name: codeintel-db
image: 'index.docker.io/sourcegraph/postgresql-16:6.0.0@sha256:224a2604331cb73809f466394c5b4f3ca95bf6a5a140cb75820dfe67301074bb'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgresql-16:8.1.1335@sha256:4e2a8621a4b6b1d512eefdf1238b4cd95d68b31a1949619d998154ee6d12f1ec'
cpus: 4
mem_limit: '2g'
healthcheck:
Expand Down
52 changes: 26 additions & 26 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:6.1.2889@sha256:67b5b187f006bb789898cd1ab02fd82f860fe1511524a416ba63ee71ebd603c6'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/migrator:8.1.1335@sha256:04fa9aac5c9ae36c1f9553766e32d682eefcdcfdd8def8af1948b2448d8785b0'
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:6.1.2889@sha256:26443b2905169ec27efba3c090d9c04e0c0779d7fb4001cbdcbe32ec1598eb59'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/caddy:8.1.1335@sha256:2520df07b72b43a3985225b58675d146491b877e554993c3fc3e3b95516afe90'
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:6.1.2889@sha256:43dad562a65d08842659abdd06cf3c92d3745cc9e18c3762e458b78028a86e1e'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/frontend:8.1.1335@sha256:ed4434288bde56c7af6ac9814efc7e74c1bcb742ea7e635bb681e9dd079beab8'
cpus: 4
mem_limit: '8g'
env_file: sourcegraph-uploads.env
Expand Down Expand Up @@ -178,7 +178,7 @@ services:
#
sourcegraph-frontend-internal:
container_name: sourcegraph-frontend-internal
image: 'index.docker.io/sourcegraph/frontend:6.1.2889@sha256:43dad562a65d08842659abdd06cf3c92d3745cc9e18c3762e458b78028a86e1e'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/frontend:8.1.1335@sha256:ed4434288bde56c7af6ac9814efc7e74c1bcb742ea7e635bb681e9dd079beab8'
cpus: 4
mem_limit: '8g'
env_file: sourcegraph-uploads.env
Expand Down Expand Up @@ -225,7 +225,7 @@ services:
#
gitserver-0:
container_name: gitserver-0
image: 'index.docker.io/sourcegraph/gitserver:6.1.2889@sha256:282142b7886f58b0ea7251575c92d5c837ff8649d5831c9c52745ebed6f3af4f'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/gitserver:8.1.1335@sha256:a5ac6208f43846246e0f601a1f70a50102fd3d679535753f72af9afbf3736d35'
cpus: 4
mem_limit: '8g'
env_file: sourcegraph-uploads.env
Expand All @@ -249,7 +249,7 @@ services:
#
zoekt-indexserver-0:
container_name: zoekt-indexserver-0
image: 'index.docker.io/sourcegraph/search-indexer:6.1.2889@sha256:8a79ecf88f4f22ff72c8a50f33a2d43506c44deddf6ef2e43d8101af9ccd97c0'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/search-indexer:8.1.1335@sha256:4bfe6abf9a3f93768b5c1792c1f382f3b6d5d6102df07dcfd1d084157a6fdf49'
cpus: 8
mem_limit: '16g'
environment:
Expand All @@ -272,7 +272,7 @@ services:
#
zoekt-webserver-0:
container_name: zoekt-webserver-0
image: 'index.docker.io/sourcegraph/indexed-searcher:6.1.2889@sha256:9bb181a003811fb0193c4fa594ded800f2f155752829f1c4f97a7bfa37dbe69e'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/indexed-searcher:8.1.1335@sha256:dc4e0e7c4eea8d664adbf1baa52840eb3ccc522673ed7509f443ca4c50151be6'
cpus: 8
mem_limit: '50g'
environment:
Expand All @@ -299,7 +299,7 @@ services:
#
searcher-0:
container_name: searcher-0
image: 'index.docker.io/sourcegraph/searcher:6.1.2889@sha256:66f633e4e666d65684915087009bdbdb8a46dad6eccb4c307a6de141e0225be6'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/searcher:8.1.1335@sha256:85d38fb5a1fdc00f4cadd4d595c55e9779cf5484f3f325047d138026376f4023'
cpus: 2
mem_limit: '2g'
env_file: sourcegraph-uploads.env
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:6.1.2889@sha256:2a8ec49e080ff19e6f05f92c39cfc67ac50b8e2ff5aba4dcbd7451bba1e8d539'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/precise-code-intel-worker:8.1.1335@sha256:c35b8d71044e638f841f7d3431d5d11b1fe3e502160137af25f265048a47c4cb'
cpus: 2
mem_limit: '4g'
env_file: sourcegraph-uploads.env
Expand All @@ -351,7 +351,7 @@ services:
#
worker:
container_name: worker
image: 'index.docker.io/sourcegraph/worker:6.1.2889@sha256:1ef615670e315edda8511ab1e06ffd27b98129bc962bf06aca455c7731baf482'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/worker:8.1.1335@sha256:3f336f89ac548b9f68e3c47a18a395fdb628b4378785dbbc69fbf3976064f7b3'
cpus: 4
mem_limit: '4g'
env_file: sourcegraph-uploads.env
Expand All @@ -377,7 +377,7 @@ services:
#
syntactic-code-intel-worker:
container_name: syntactic-code-intel-worker
image: 'index.docker.io/sourcegraph/syntactic-code-intel-worker:6.1.1295@sha256:c6e2b097b8f16394e339588e208c43587f1fa6a35cb44e9759622c448ddc1445'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/syntactic-code-intel-worker:8.1.1335@sha256:41e7b00d6855439e1cb9ca89d36897bca4b4c7ba1cc907291381f9b8d88782f1'
cpus: 2
mem_limit: '4g'
env_file: sourcegraph-uploads.env
Expand All @@ -404,7 +404,7 @@ services:
#
syntect-server:
container_name: syntect-server
image: 'index.docker.io/sourcegraph/syntax-highlighter:6.1.2889@sha256:eea296267ca84c8d06eb9c1e44fd5f4c4fbb3f0490193517cc3764d558a773c6'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/syntax-highlighter:8.1.1335@sha256:e47041da43accb4a0a889bcaa23b4ea6737f580233006bf6a8345878be39de21'
cpus: 4
mem_limit: '6g'
healthcheck:
Expand All @@ -425,7 +425,7 @@ services:
#
prometheus:
container_name: prometheus
image: 'index.docker.io/sourcegraph/prometheus:6.1.2889@sha256:75fa45933ecb03f7aca1d54ec5ebc05d11ff300494a2ca8fbaefa25c83f0326f'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/prometheus:8.1.1335@sha256:3c4e0fbce1683032270aa218a09df287482784dd340efe9622328e7e95308764'
cpus: 4
mem_limit: '8g'
volumes:
Expand All @@ -452,7 +452,7 @@ services:
# 'GF_SERVER_ROOT_URL='https://grafana.example.com'
grafana:
container_name: grafana
image: 'index.docker.io/sourcegraph/grafana:6.3.3@sha256:2f68b9b1542e7d75459d983b606d2fdd1c11a75610464e3d7a6ced4f3ac474bf'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/grafana:8.1.1335@sha256:c8b9c46126bccb794f6993b1f9e7750ed964241ea22fe7651a781a8c6f721240'
cpus: 1
mem_limit: '1g'
volumes:
Expand All @@ -471,7 +471,7 @@ services:
#
cadvisor:
container_name: cadvisor
image: 'index.docker.io/sourcegraph/cadvisor:6.1.2889@sha256:c13394cf2de03154dd48e78129bf3d4cc31854ab98dedafd3901b413d54b4822'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/cadvisor:8.1.1335@sha256:a8f805b8e112ff16f3ca69bc5ce18921421848dcfbed8f8c98d995e19f085862'
cpus: 1
mem_limit: '1g'
# You may set `privileged` to `false and `cadvisor` will run with reduced privileges.
Expand Down Expand Up @@ -504,7 +504,7 @@ services:
#
node-exporter:
container_name: node-exporter
image: 'index.docker.io/sourcegraph/node-exporter:6.1.2889@sha256:e496aa37a1053cd59f0025c232fd58261ae08d934269870a343061c7a9596bfd'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/node-exporter:8.1.1335@sha256:c5c24d5669d33b7d3a176ab5ad620a3c238d2383a3634044c99c987eef0b6e70'
cpus: .5
mem_limit: '1g'
pid: 'host'
Expand Down Expand Up @@ -533,7 +533,7 @@ services:
#
pgsql:
container_name: pgsql
image: 'index.docker.io/sourcegraph/postgresql-16:6.1.2889@sha256:8cb7b0f54c7ab464f8e3b26918a70bebcb060219dd0b91084209563238ec1dd5'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgresql-16:8.1.1335@sha256:4e2a8621a4b6b1d512eefdf1238b4cd95d68b31a1949619d998154ee6d12f1ec'
cpus: 4
mem_limit: '4g'
shm_size: '1g'
Expand Down Expand Up @@ -561,7 +561,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:6.1.2889@sha256:a2fedb3d4aa845375d3c60f37e2813d095c6718c2afa96c2bcc8c17dc8b73991'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgres_exporter:8.1.1335@sha256:ab2d202e816dfa819f62fa2092a235eece3461977d6324ba5624b689efebc79f'
cpus: 0.1
mem_limit: '50m'
networks:
Expand All @@ -580,7 +580,7 @@ services:
#
codeintel-db:
container_name: codeintel-db
image: 'index.docker.io/sourcegraph/postgresql-16:6.1.2889@sha256:8cb7b0f54c7ab464f8e3b26918a70bebcb060219dd0b91084209563238ec1dd5'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgresql-16:8.1.1335@sha256:4e2a8621a4b6b1d512eefdf1238b4cd95d68b31a1949619d998154ee6d12f1ec'
cpus: 4
mem_limit: '4g'
shm_size: '1g'
Expand Down Expand Up @@ -608,7 +608,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:6.1.2889@sha256:a2fedb3d4aa845375d3c60f37e2813d095c6718c2afa96c2bcc8c17dc8b73991'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgres_exporter:8.1.1335@sha256:ab2d202e816dfa819f62fa2092a235eece3461977d6324ba5624b689efebc79f'
cpus: 0.1
mem_limit: '50m'
networks:
Expand All @@ -627,7 +627,7 @@ services:
#
codeinsights-db:
container_name: codeinsights-db
image: 'index.docker.io/sourcegraph/postgresql-16-codeinsights:6.1.2889@sha256:7d84febae82181e096f79e26f6459e86fa66a40ccbe30ff0f37cb118707e4e2a'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgresql-16-codeinsights:8.1.1335@sha256:4cf13e5b758876054f2ef1236257938fc58aad2a8ad84ab143b7680a8d18912b'
cpus: 4
mem_limit: '2g'
shm_size: '1g'
Expand Down Expand Up @@ -660,7 +660,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:6.1.2889@sha256:a2fedb3d4aa845375d3c60f37e2813d095c6718c2afa96c2bcc8c17dc8b73991'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgres_exporter:8.1.1335@sha256:ab2d202e816dfa819f62fa2092a235eece3461977d6324ba5624b689efebc79f'
cpus: 0.1
mem_limit: '50m'
networks:
Expand All @@ -679,7 +679,7 @@ services:
#
blobstore:
container_name: blobstore
image: 'index.docker.io/sourcegraph/blobstore:6.1.2889@sha256:8f49a897d7f7ad4655df9cd79959620ddb73406adccccd567c4846aa24ec4a01'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/blobstore:8.1.1335@sha256:00c2645fc98f16756615ba1720b6485ab8e44bd41d0b07dc5470aac4dd45da3c'
cpus: 1
mem_limit: '1g'
healthcheck:
Expand All @@ -702,7 +702,7 @@ services:
#
redis-cache:
container_name: redis-cache
image: 'index.docker.io/sourcegraph/redis-cache:6.1.2889@sha256:204c164bc59119cde8b8d19a640897e8ffe008e040b730bed2188f28fca0d31c'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/redis-cache:8.1.1335@sha256:1fdba976c2af60ff74e4c3bc9a1bc19c168f87a905f2e44f35f1c1604cfa5f19'
cpus: 1
mem_limit: '7g'
volumes:
Expand All @@ -718,7 +718,7 @@ services:
#
redis-store:
container_name: redis-store
image: 'index.docker.io/sourcegraph/redis-store:6.1.2889@sha256:4f4dfb3074e586b7eb8ab2ba631285aeb5e018452219e2f1a2f235c85b8de4bc'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/redis-store:8.1.1335@sha256:e778a15bff45242e52803aa33731f359cb027b7dfb0c0b5b891bac0b7a08693a'
cpus: 1
mem_limit: '7g'
volumes:
Expand All @@ -733,7 +733,7 @@ services:
# Ports exposed to the public internet: none
otel-collector:
container_name: otel-collector
image: 'index.docker.io/sourcegraph/opentelemetry-collector:6.1.2889@sha256:c05e84380dd81d74ff952f73d132710dc4a162fa26c0a0709fba58dcb2829958'
image: 'us-docker.pkg.dev/sourcegraph-images/internal/opentelemetry-collector:8.1.1335@sha256:f3fc8f838c0da223beac0e77f0f3792bd2056182292de61272e803986a83f07d'
cpus: 1
mem_limit: '1g'
networks:
Expand Down
36 changes: 0 additions & 36 deletions release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,39 +224,3 @@ promoteToPublic:
cat << EOF | buildkite-agent annotate --style info
Promoted release is **publicly available** through a git tag at [\`{{version}}\`](https://github.com/sourcegraph/deploy-sourcegraph-docker/tree/{{version}}).
EOF

- name: "update main with latest version"
- name: "git"
cmd: |
set -eu
branch="promote/release-{{version}}-update-main"
echo "Checking out origin/main"
git fetch origin main
git switch main
echo "Creating branch origin/${branch}"
git switch -c "${branch}"

- name: docker(compose):tags
cmd: |
set -eu
registry=index.docker.io/sourcegraph
sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/

- name: "git:branch"
cmd: |
set -eu
branch="promote/release-{{version}}-update-main"
git commit -am 'prep update main: {{version}}' -m 'update main with latest release'
git push origin "${branch}"

- name: "github:pr"
cmd: |
set -eu
# Create PR to merge release updates into main branch
gh pr create \
--fill \
--draft \
--base main \
--title "Update main: build {{version}}" \
--body "Test plan: automated release PR, CI will perform additional checks"
echo "🚢 Please check the associated CI build to ensure the process completed".
Loading