diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index cbdcbd37c..311ac2bb0 100755 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -9,13 +9,11 @@ pushd "$(dirname "${BASH_SOURCE[0]}")"/../.. WORKDIR=$(pwd) PIDFILE=/var/lock/dobackup.pid -remove_pidfile() -{ +remove_pidfile() { rm -f "$PIDFILE" } -another_instance() -{ +another_instance() { echo "There is another instance running, skipping" exit 0 } @@ -24,7 +22,10 @@ if [ -f "$PIDFILE" ]; then kill -0 "$(cat $PIDFILE)" && another_instance fi trap remove_pidfile EXIT -echo $$ > "$PIDFILE" +echo $$ >"$PIDFILE" + +echo "Install plugins??" +cat "${WORKDIR}/.tool-versions" | cut -d' ' -f1 | grep "^[^\#]" | xargs -i asdf plugin add {} echo "Installing asdf dependencies as defined in '${WORKDIR}/.tool-versions':" asdf install diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml index d8277e7b2..68a119bd8 100644 --- a/docker-compose/db-only-migrate.docker-compose.yaml +++ b/docker-compose/db-only-migrate.docker-compose.yaml @@ -13,7 +13,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgresql-16:6.0.0@sha256:224a2604331cb73809f466394c5b4f3ca95bf6a5a140cb75820dfe67301074bb' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:6.4.2622@sha256:1405bcf57dbef1fac3d8c43d0adea5a4ee2e0b93469b579592c62e885d02d865' cpus: 4 mem_limit: '2g' healthcheck: @@ -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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:6.4.2622@sha256:1405bcf57dbef1fac3d8c43d0adea5a4ee2e0b93469b579592c62e885d02d865' cpus: 4 mem_limit: '2g' healthcheck: diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 60403932f..da06e6c73 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/migrator:6.4.2622@sha256:b4f621bc4ab20226c569b6bb742e98139a9f4059e626e1c73f3edf42e3327831' cpus: 0.5 mem_limit: '500m' command: ['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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/caddy:6.4.2622@sha256:b3d3ab1d3190ce0e2d28178d164eb20c3564357d7cb9d79b8f38e089888077ef' cpus: 4 mem_limit: '4g' environment: @@ -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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:6.4.2622@sha256:505441839f7bb6a711dd4cfab2e2b6944cd819a0e80f0f1db33fa7cbe321023e' cpus: 4 mem_limit: '8g' environment: @@ -177,7 +177,7 @@ services: # sourcegraph-frontend-internal: container_name: sourcegraph-frontend-internal - image: 'index.docker.io/sourcegraph/frontend:6.1.2889@sha256:43dad562a65d08842659abdd06cf3c92d3745cc9e18c3762e458b78028a86e1e' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:6.4.2622@sha256:505441839f7bb6a711dd4cfab2e2b6944cd819a0e80f0f1db33fa7cbe321023e' cpus: 4 mem_limit: '8g' environment: @@ -223,7 +223,7 @@ services: # gitserver-0: container_name: gitserver-0 - image: 'index.docker.io/sourcegraph/gitserver:6.1.2889@sha256:282142b7886f58b0ea7251575c92d5c837ff8649d5831c9c52745ebed6f3af4f' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/gitserver:6.4.2622@sha256:cab0287c5d1b22b483818a09164a914e882a1d21f99c7717ff524b2f303702bf' cpus: 4 mem_limit: '8g' environment: @@ -246,7 +246,7 @@ services: # zoekt-indexserver-0: container_name: zoekt-indexserver-0 - image: 'index.docker.io/sourcegraph/search-indexer:6.1.2889@sha256:8a79ecf88f4f22ff72c8a50f33a2d43506c44deddf6ef2e43d8101af9ccd97c0' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/search-indexer:6.4.2622@sha256:1b31f9a3509a0764d65b4b7b3b4282c8ee817af0430b5f28e460c09257d3e5d4' cpus: 8 mem_limit: '16g' environment: @@ -269,7 +269,7 @@ services: # zoekt-webserver-0: container_name: zoekt-webserver-0 - image: 'index.docker.io/sourcegraph/indexed-searcher:6.1.2889@sha256:9bb181a003811fb0193c4fa594ded800f2f155752829f1c4f97a7bfa37dbe69e' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/indexed-searcher:6.4.2622@sha256:9acaf1998a3b211f3876a4baf8fd48ce4cd285acbaca7845f15ee7916152885b' cpus: 8 mem_limit: '50g' environment: @@ -296,7 +296,7 @@ services: # searcher-0: container_name: searcher-0 - image: 'index.docker.io/sourcegraph/searcher:6.1.2889@sha256:66f633e4e666d65684915087009bdbdb8a46dad6eccb4c307a6de141e0225be6' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/searcher:6.4.2622@sha256:55ee3c6e837a62b82616c17ff81c5e9a1c284898affac2e807ec3dbcf80195a8' cpus: 2 mem_limit: '2g' environment: @@ -320,7 +320,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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/precise-code-intel-worker:6.4.2622@sha256:55c84511972964d9da722e56d79017a46ffd0d46177b13f73621b2690363ed5d' cpus: 2 mem_limit: '4g' environment: @@ -346,7 +346,7 @@ services: # worker: container_name: worker - image: 'index.docker.io/sourcegraph/worker:6.1.2889@sha256:1ef615670e315edda8511ab1e06ffd27b98129bc962bf06aca455c7731baf482' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/worker:6.4.2622@sha256:075f45a59753ed3d75d99fddccddd45f00e935d476ebcf56dcb9b7aa3c18ee44' cpus: 4 mem_limit: '4g' environment: @@ -371,7 +371,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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/syntactic-code-intel-worker:6.4.2622@sha256:2b8e26ff0971cbe9b145c05b73d784dd9e025764bdffd48271253ad45387fea4' cpus: 2 mem_limit: '4g' environment: @@ -398,7 +398,7 @@ services: # syntect-server: container_name: syntect-server - image: 'index.docker.io/sourcegraph/syntax-highlighter:6.1.2889@sha256:eea296267ca84c8d06eb9c1e44fd5f4c4fbb3f0490193517cc3764d558a773c6' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/syntax-highlighter:6.4.2622@sha256:2e1480f34e95c35115a4229cf0c1d69147f08de5907897b4ce890d9060ea458a' cpus: 4 mem_limit: '6g' healthcheck: @@ -419,7 +419,7 @@ services: # prometheus: container_name: prometheus - image: 'index.docker.io/sourcegraph/prometheus:6.1.2889@sha256:75fa45933ecb03f7aca1d54ec5ebc05d11ff300494a2ca8fbaefa25c83f0326f' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/prometheus:6.4.2622@sha256:7cc5b4212d31ea1f45f1d1256c0db9f2218850630238a6679b1ba9c52b7d14f4' cpus: 4 mem_limit: '8g' volumes: @@ -446,7 +446,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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/grafana:6.4.2622@sha256:9c694998b0aa40a73b48fe8483ad4bf584390a5fede972b5560e5a18d78b15eb' cpus: 1 mem_limit: '1g' volumes: @@ -465,7 +465,7 @@ services: # cadvisor: container_name: cadvisor - image: 'index.docker.io/sourcegraph/cadvisor:6.1.2889@sha256:c13394cf2de03154dd48e78129bf3d4cc31854ab98dedafd3901b413d54b4822' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/cadvisor:6.4.2622@sha256:e0509563bad90436e37118bc9e621fb77d4723f2d00389eb63c30e9f8807fb1d' cpus: 1 mem_limit: '1g' # You may set `privileged` to `false and `cadvisor` will run with reduced privileges. @@ -498,7 +498,7 @@ services: # node-exporter: container_name: node-exporter - image: 'index.docker.io/sourcegraph/node-exporter:6.1.2889@sha256:e496aa37a1053cd59f0025c232fd58261ae08d934269870a343061c7a9596bfd' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/node-exporter:6.4.2622@sha256:1102119ecfb6532650187a3f05f9cdf4c233da0a08c54dc6656da86dd2c3a3f9' cpus: .5 mem_limit: '1g' pid: 'host' @@ -527,7 +527,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgresql-16:6.1.2889@sha256:8cb7b0f54c7ab464f8e3b26918a70bebcb060219dd0b91084209563238ec1dd5' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:6.4.2622@sha256:1405bcf57dbef1fac3d8c43d0adea5a4ee2e0b93469b579592c62e885d02d865' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -555,7 +555,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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:6.4.2622@sha256:732bd1e4219fc7c7c4affda9cfaae0bb34ff245303adcbd5896441a37812512c' cpus: 0.1 mem_limit: '50m' networks: @@ -574,7 +574,7 @@ services: # codeintel-db: container_name: codeintel-db - image: 'index.docker.io/sourcegraph/postgresql-16:6.1.2889@sha256:8cb7b0f54c7ab464f8e3b26918a70bebcb060219dd0b91084209563238ec1dd5' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:6.4.2622@sha256:1405bcf57dbef1fac3d8c43d0adea5a4ee2e0b93469b579592c62e885d02d865' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -602,7 +602,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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:6.4.2622@sha256:732bd1e4219fc7c7c4affda9cfaae0bb34ff245303adcbd5896441a37812512c' cpus: 0.1 mem_limit: '50m' networks: @@ -621,7 +621,7 @@ services: # codeinsights-db: container_name: codeinsights-db - image: 'index.docker.io/sourcegraph/postgresql-16-codeinsights:6.1.2889@sha256:7d84febae82181e096f79e26f6459e86fa66a40ccbe30ff0f37cb118707e4e2a' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16-codeinsights:6.4.2622@sha256:edc6facecf0cf67945ae0929d20e55f2eae469e5e9c348a43dacd002d4e07bc6' cpus: 4 mem_limit: '2g' shm_size: '1g' @@ -654,7 +654,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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:6.4.2622@sha256:732bd1e4219fc7c7c4affda9cfaae0bb34ff245303adcbd5896441a37812512c' cpus: 0.1 mem_limit: '50m' networks: @@ -673,7 +673,7 @@ services: # blobstore: container_name: blobstore - image: 'index.docker.io/sourcegraph/blobstore:6.1.2889@sha256:8f49a897d7f7ad4655df9cd79959620ddb73406adccccd567c4846aa24ec4a01' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/blobstore:6.4.2622@sha256:b8f4abaa254c4f84dc8e1a119d43ed948737703724ab847c2ac3f7169e5cc3e2' cpus: 1 mem_limit: '1g' healthcheck: @@ -696,7 +696,7 @@ services: # redis-cache: container_name: redis-cache - image: 'index.docker.io/sourcegraph/redis-cache:6.1.2889@sha256:204c164bc59119cde8b8d19a640897e8ffe008e040b730bed2188f28fca0d31c' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-cache:6.4.2622@sha256:70b4d6723618eeadf7188311774b1852b8f7ccbc8133397818b1548192109967' cpus: 1 mem_limit: '7g' volumes: @@ -712,7 +712,7 @@ services: # redis-store: container_name: redis-store - image: 'index.docker.io/sourcegraph/redis-store:6.1.2889@sha256:4f4dfb3074e586b7eb8ab2ba631285aeb5e018452219e2f1a2f235c85b8de4bc' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-store:6.4.2622@sha256:2af4d645985bb8f9c90a5dde18d8f09e8dc192fdce10c90d4a085ad6e81df64c' cpus: 1 mem_limit: '7g' volumes: @@ -727,7 +727,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-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:6.4.2622@sha256:1ad127910d82d2788fa35347ea31faf1b706845c30d63822416724100e61880e' cpus: 1 mem_limit: '1g' networks: diff --git a/docker-compose/executors/executor.docker-compose.yaml b/docker-compose/executors/executor.docker-compose.yaml index c7fc82486..e9af721a0 100644 --- a/docker-compose/executors/executor.docker-compose.yaml +++ b/docker-compose/executors/executor.docker-compose.yaml @@ -2,7 +2,7 @@ version: '2.4' services: executor: container_name: executor - image: 'index.docker.io/sourcegraph/executor:6.0.0@sha256:0be94a7c91f8273db10fdf46718c6596340ab2acc570e7b85353806e67a27508' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/executor:6.4.2622@sha256:a3903694616ec8b69472b70021fc881942b1bbfe43d1e0a05c5612f1cafb42b3' cpus: 1 mem_limit: '4g' # Run as root (required for docker daemon control) diff --git a/docker-compose/jaeger/docker-compose.yaml b/docker-compose/jaeger/docker-compose.yaml index 29e925ca1..392b35c2a 100644 --- a/docker-compose/jaeger/docker-compose.yaml +++ b/docker-compose/jaeger/docker-compose.yaml @@ -10,7 +10,7 @@ services: # jaeger: container_name: jaeger - image: 'index.docker.io/sourcegraph/jaeger-all-in-one:6.1.2889@sha256:d35f0bf61a5be6fe73714bb06e489a68024a77ea7d0a9f346c42633d66c8b1d3' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/jaeger-all-in-one:6.4.2622@sha256:50d8e3ca32a8c5948affbe17b85cb335fcdc75512f9c2b20dcf3370b4072939d' cpus: 0.5 mem_limit: '512m' ports: diff --git a/release.yaml b/release.yaml index 2224a8e22..8076a0dd2 100644 --- a/release.yaml +++ b/release.yaml @@ -10,9 +10,6 @@ requirements: # We use wget here, because curl --fail-with-body was introduced in a version ulterior to what we can have on the CI agents. - name: "wget" cmd: "wget --help" - - name: "go" - cmd: "which go" - fixInstructions: "install golang" - name: "GitHub cli exists" cmd: "which gh" fixInstructions: "install GitHub cli"