diff --git a/changelog/pvl_gcr_offchain.md b/changelog/pvl_gcr_offchain.md new file mode 100644 index 0000000000..31e8f473c5 --- /dev/null +++ b/changelog/pvl_gcr_offchain.md @@ -0,0 +1,3 @@ +### Changed + +- Updated docker images URL to gcr.io/offchainlabs/prysm diff --git a/cmd/beacon-chain/BUILD.bazel b/cmd/beacon-chain/BUILD.bazel index ab9e8475d5..723d9a3007 100644 --- a/cmd/beacon-chain/BUILD.bazel +++ b/cmd/beacon-chain/BUILD.bazel @@ -73,7 +73,7 @@ prysm_image_upload( name = "push_images", binary = ":beacon-chain", entrypoint = ["/beacon-chain"], - repository = "gcr.io/prysmaticlabs/prysm/beacon-chain", + repository = "gcr.io/offchainlabs/prysm/beacon-chain", symlinks = { # Backwards compatibility for images that depended on the old filepath. "/app/cmd/beacon-chain/beacon-chain": "/beacon-chain", diff --git a/cmd/prysmctl/BUILD.bazel b/cmd/prysmctl/BUILD.bazel index fb58a9d1ce..4cfc7fcc3c 100644 --- a/cmd/prysmctl/BUILD.bazel +++ b/cmd/prysmctl/BUILD.bazel @@ -29,7 +29,7 @@ prysm_image_upload( name = "push_images", binary = ":prysmctl", entrypoint = ["/prysmctl"], - repository = "gcr.io/prysmaticlabs/prysm/cmd/prysmctl", + repository = "gcr.io/offchainlabs/prysm/cmd/prysmctl", symlinks = { # Backwards compatibility for images that depended on the old filepath. "/app/cmd/prysmctl/prysmctl": "/prysmctl", diff --git a/cmd/validator/BUILD.bazel b/cmd/validator/BUILD.bazel index ad82d1f334..a7ff3198f8 100644 --- a/cmd/validator/BUILD.bazel +++ b/cmd/validator/BUILD.bazel @@ -60,7 +60,7 @@ prysm_image_upload( name = "push_images", binary = ":validator", entrypoint = ["/validator"], - repository = "gcr.io/prysmaticlabs/prysm/validator", + repository = "gcr.io/offchainlabs/prysm/validator", symlinks = { # Backwards compatibility for images that depended on the old filepath. "/app/cmd/validator/validator": "/validator", diff --git a/hack/tag-versioned-docker-images.sh b/hack/tag-versioned-docker-images.sh deleted file mode 100755 index f5c0aef6ca..0000000000 --- a/hack/tag-versioned-docker-images.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -# This script is used to tag docker images with a specific commit or tag the -# docker images as ":stable" with the --stable flag. - -# List of docker tags to update with git versioned tag. -DOCKER_IMAGES=( - # Beacon chain images - "gcr.io/prysmaticlabs/prysm/beacon-chain" - "index.docker.io/prysmaticlabs/prysm-beacon-chain" - # Validator images - "gcr.io/prysmaticlabs/prysm/validator" - "index.docker.io/prysmaticlabs/prysm-validator" - # Slasher images - "gcr.io/prysmaticlabs/prysm/slasher" - "index.docker.io/prysmaticlabs/prysm-slasher" -) - - -# Check that the current commit has an associated git tag. -TAG=$(git describe --tags HEAD) -TAG_COMMIT=$(git rev-list -n 1 "$TAG") -CURRENT_COMMIT=$(git rev-parse HEAD) - -if [ "$TAG_COMMIT" != "$CURRENT_COMMIT" ] -then - echo "Current commit does not have an associated tag." - exit 1 -fi - -TAG_AS_STABLE=0 - -for arg in "$@" -do - case $arg in - -s|--stable) - TAG_AS_STABLE=1 - shift # Remove --stable from processing - ;; - *) - OTHER_ARGUMENTS+=("$1") - shift # Remove generic argument from processing - ;; - esac -done - -if [ "$TAG_AS_STABLE" = "1" ] -then - TAG="stable" -fi - -HEAD=HEAD-$(git rev-parse --short=6 HEAD) - -for image in "${DOCKER_IMAGES[@]}" -do - SRC="$image:$HEAD" - DST="$image:$TAG" - echo "Pulling $SRC" - docker pull "$SRC" - echo "Tagging $SRC as $DST" - docker tag "$SRC" "$DST" - echo "Pushing $DST" - docker push "$DST" -done - -exit 0 diff --git a/tools/bootnode/BUILD.bazel b/tools/bootnode/BUILD.bazel index 05ba2148c0..bb04620905 100644 --- a/tools/bootnode/BUILD.bazel +++ b/tools/bootnode/BUILD.bazel @@ -60,7 +60,7 @@ prysm_image_upload( name = "push_images", binary = ":bootnode", entrypoint = ["/bootnode"], - repository = "gcr.io/prysmaticlabs/prysm/bootnode", + repository = "gcr.io/offchainlabs/prysm/bootnode", symlinks = { # Backwards compatibility for images that depended on the old filepath. "/app/tools/bootnode/bootnode": "/bootnode", diff --git a/tools/enr-calculator/BUILD.bazel b/tools/enr-calculator/BUILD.bazel index 7d800194ef..4c09e30708 100644 --- a/tools/enr-calculator/BUILD.bazel +++ b/tools/enr-calculator/BUILD.bazel @@ -28,7 +28,7 @@ prysm_image_upload( name = "push_images", binary = ":enr-calculator", entrypoint = ["/enr-calculator"], - repository = "gcr.io/prysmaticlabs/prysm/enr-calculator", + repository = "gcr.io/offchainlabs/prysm/enr-calculator", symlinks = { # Backwards compatibility for images that depended on the old filepath. "/app/tools/enr-calculator/enr-calculator": "/enr-calculator", diff --git a/tools/eth1exporter/BUILD.bazel b/tools/eth1exporter/BUILD.bazel index 866e87c5d8..40c055ab0f 100644 --- a/tools/eth1exporter/BUILD.bazel +++ b/tools/eth1exporter/BUILD.bazel @@ -26,7 +26,7 @@ prysm_image_upload( name = "push_images", binary = ":eth1exporter", entrypoint = ["/eth1exporter"], - repository = "gcr.io/prysmaticlabs/prysm/eth1monitor", + repository = "gcr.io/offchainlabs/prysm/eth1monitor", symlinks = { # Backwards compatibility for images that depended on the old filepath. "/app/tools/eth1exporter/eth1exporter": "/eth1exporter", diff --git a/tools/http-request-sink/BUILD.bazel b/tools/http-request-sink/BUILD.bazel index ac622d617c..627f5a6bdb 100644 --- a/tools/http-request-sink/BUILD.bazel +++ b/tools/http-request-sink/BUILD.bazel @@ -30,7 +30,7 @@ prysm_image_upload( name = "push_images", binary = ":http-request-sink", entrypoint = ["/http-request-sink"], - repository = "gcr.io/prysmaticlabs/prysm/http-request-sink", + repository = "gcr.io/offchainlabs/prysm/http-request-sink", symlinks = { # Backwards compatibility for images that depended on the old filepath. "/app/tools/http-request-sink/http-request-sink": "/http-request-sink", diff --git a/tools/pcli/BUILD.bazel b/tools/pcli/BUILD.bazel index e06c06c152..2a90ef8f4c 100644 --- a/tools/pcli/BUILD.bazel +++ b/tools/pcli/BUILD.bazel @@ -38,7 +38,7 @@ prysm_image_upload( name = "push_images", binary = ":pcli", entrypoint = ["/pcli"], - repository = "gcr.io/prysmaticlabs/prysm/pcli", + repository = "gcr.io/offchainlabs/prysm/pcli", symlinks = { # Backwards compatibility for images that depended on the old filepath. "/app/tools/pcli/pcli": "/pcli",