From 623bc9b6af1405c1271fb782dc1dd3d8e4fb339b Mon Sep 17 00:00:00 2001
From: Michael Plump <plumpy@google.com>
Date: Fri, 6 Nov 2020 22:56:05 -0500
Subject: [PATCH] fix(boms): change default docker registry to
 spinnaker-community (#1820)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 .../halyard/config/config/v1/ArtifactSourcesConfig.java         | 2 +-
 .../core/registry/v1/WriteableProfileRegistryProperties.java    | 2 +-
 halyard-web/config/halyard.yml                                  | 2 +-
 install/Installer.sh                                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/config/v1/ArtifactSourcesConfig.java b/halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/config/v1/ArtifactSourcesConfig.java
index 8f7b54901b..fdfa964947 100644
--- a/halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/config/v1/ArtifactSourcesConfig.java
+++ b/halyard-config/src/main/java/com/netflix/spinnaker/halyard/config/config/v1/ArtifactSourcesConfig.java
@@ -30,7 +30,7 @@
 public class ArtifactSourcesConfig {
   String gitPrefix = "https://github.com/spinnaker";
   String googleImageProject = "marketplace-spinnaker-release";
-  String dockerRegistry = "gcr.io/spinnaker-marketplace";
+  String dockerRegistry = "us-docker.pkg.dev/spinnaker-community/docker";
   String debianRepository = "https://dl.bintray.com/spinnaker-releases/debians";
 
   public ArtifactSourcesConfig mergeWithBomSources(
diff --git a/halyard-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/WriteableProfileRegistryProperties.java b/halyard-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/WriteableProfileRegistryProperties.java
index 6d4879166d..dfbe0f31ef 100644
--- a/halyard-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/WriteableProfileRegistryProperties.java
+++ b/halyard-core/src/main/java/com/netflix/spinnaker/halyard/core/registry/v1/WriteableProfileRegistryProperties.java
@@ -24,5 +24,5 @@
 @ConfigurationProperties("spinnaker.config.input.gcs")
 public class WriteableProfileRegistryProperties {
   private String jsonPath = "";
-  private String project = "spinnaker-marketplace";
+  private String project = "spinnaker-community";
 }
diff --git a/halyard-web/config/halyard.yml b/halyard-web/config/halyard.yml
index 8987937d40..96a48f306b 100644
--- a/halyard-web/config/halyard.yml
+++ b/halyard-web/config/halyard.yml
@@ -11,7 +11,7 @@ halconfig:
 spinnaker:
   artifacts:
     debian: https://dl.bintray.com/spinnaker-releases/debians
-    docker: gcr.io/spinnaker-marketplace
+    docker: us-docker.pkg.dev/spinnaker-community/docker
   config:
     input:
       gcs:
diff --git a/install/Installer.sh b/install/Installer.sh
index 13da90f848..43b1fe6158 100755
--- a/install/Installer.sh
+++ b/install/Installer.sh
@@ -7,7 +7,7 @@ set -o pipefail
 
 REPOSITORY_URL="https://dl.bintray.com/spinnaker-releases/debians"
 SPINNAKER_REPOSITORY_URL="https://dl.bintray.com/spinnaker-releases/debians"
-SPINNAKER_DOCKER_REGISTRY="gcr.io/spinnaker-marketplace"
+SPINNAKER_DOCKER_REGISTRY="us-docker.pkg.dev/spinnaker-community/docker"
 SPINNAKER_GCE_PROJECT="marketplace-spinnaker-release"
 CONFIG_BUCKET="halconfig"