From 1e888fbb77b1be0d640ac95dd0df40168b066b20 Mon Sep 17 00:00:00 2001 From: Daniel Barnes Date: Thu, 25 Aug 2022 07:11:56 -0700 Subject: [PATCH] add gcr/gcp docker helper (#646) * add gcr/gcp docker helper * Update environment/setup.sh Co-authored-by: Helio Machado <0x2b3bfa0+git@googlemail.com> * Update golden files, cleanup whitespace. Co-authored-by: Helio Machado <0x2b3bfa0+git@googlemail.com> Co-authored-by: Domas Monkus --- environment/setup.sh | 5 ++++- iterative/testdata/script_template_cloud_aws.golden | 5 ++++- iterative/testdata/script_template_cloud_azure.golden | 5 ++++- iterative/testdata/script_template_cloud_gcp.golden | 5 ++++- iterative/testdata/script_template_cloud_invalid.golden | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/environment/setup.sh b/environment/setup.sh index 260f2d2e..9fa141ea 100644 --- a/environment/setup.sh +++ b/environment/setup.sh @@ -7,7 +7,7 @@ echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assume sudo apt remove unattended-upgrades systemctl disable apt-daily-upgrade.service - + FILE=/var/log/cml_stack.log if [ ! -f "$FILE" ]; then sudo add-apt-repository universe -y @@ -21,6 +21,9 @@ if [ ! -f "$FILE" ]; then sudo curl --max-time 10 --output /usr/bin/docker-credential-ecr-login https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.5.0/linux-amd64/docker-credential-ecr-login sudo chmod a+x /usr/bin/docker-credential-ecr-login + curl --max-time 10 --location https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.5/docker-credential-gcr_linux_amd64-2.1.5.tar.gz | sudo tar xz docker-credential-gcr + sudo mv docker-credential-gcr /usr/bin/docker-credential-gcr + curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add - sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" sudo apt update && sudo apt-get install -y terraform diff --git a/iterative/testdata/script_template_cloud_aws.golden b/iterative/testdata/script_template_cloud_aws.golden index 1ccbba08..783034e0 100644 --- a/iterative/testdata/script_template_cloud_aws.golden +++ b/iterative/testdata/script_template_cloud_aws.golden @@ -8,7 +8,7 @@ echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assume sudo apt remove unattended-upgrades systemctl disable apt-daily-upgrade.service - + FILE=/var/log/cml_stack.log if [ ! -f "$FILE" ]; then sudo add-apt-repository universe -y @@ -22,6 +22,9 @@ if [ ! -f "$FILE" ]; then sudo curl --max-time 10 --output /usr/bin/docker-credential-ecr-login https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.5.0/linux-amd64/docker-credential-ecr-login sudo chmod a+x /usr/bin/docker-credential-ecr-login + curl --max-time 10 --location https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.5/docker-credential-gcr_linux_amd64-2.1.5.tar.gz | sudo tar xz docker-credential-gcr + sudo mv docker-credential-gcr /usr/bin/docker-credential-gcr + curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add - sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" sudo apt update && sudo apt-get install -y terraform diff --git a/iterative/testdata/script_template_cloud_azure.golden b/iterative/testdata/script_template_cloud_azure.golden index 3867f45e..0cbee5e7 100644 --- a/iterative/testdata/script_template_cloud_azure.golden +++ b/iterative/testdata/script_template_cloud_azure.golden @@ -8,7 +8,7 @@ echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assume sudo apt remove unattended-upgrades systemctl disable apt-daily-upgrade.service - + FILE=/var/log/cml_stack.log if [ ! -f "$FILE" ]; then sudo add-apt-repository universe -y @@ -22,6 +22,9 @@ if [ ! -f "$FILE" ]; then sudo curl --max-time 10 --output /usr/bin/docker-credential-ecr-login https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.5.0/linux-amd64/docker-credential-ecr-login sudo chmod a+x /usr/bin/docker-credential-ecr-login + curl --max-time 10 --location https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.5/docker-credential-gcr_linux_amd64-2.1.5.tar.gz | sudo tar xz docker-credential-gcr + sudo mv docker-credential-gcr /usr/bin/docker-credential-gcr + curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add - sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" sudo apt update && sudo apt-get install -y terraform diff --git a/iterative/testdata/script_template_cloud_gcp.golden b/iterative/testdata/script_template_cloud_gcp.golden index c0c7be38..487dcd51 100644 --- a/iterative/testdata/script_template_cloud_gcp.golden +++ b/iterative/testdata/script_template_cloud_gcp.golden @@ -8,7 +8,7 @@ echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assume sudo apt remove unattended-upgrades systemctl disable apt-daily-upgrade.service - + FILE=/var/log/cml_stack.log if [ ! -f "$FILE" ]; then sudo add-apt-repository universe -y @@ -22,6 +22,9 @@ if [ ! -f "$FILE" ]; then sudo curl --max-time 10 --output /usr/bin/docker-credential-ecr-login https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.5.0/linux-amd64/docker-credential-ecr-login sudo chmod a+x /usr/bin/docker-credential-ecr-login + curl --max-time 10 --location https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.5/docker-credential-gcr_linux_amd64-2.1.5.tar.gz | sudo tar xz docker-credential-gcr + sudo mv docker-credential-gcr /usr/bin/docker-credential-gcr + curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add - sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" sudo apt update && sudo apt-get install -y terraform diff --git a/iterative/testdata/script_template_cloud_invalid.golden b/iterative/testdata/script_template_cloud_invalid.golden index a780dc2e..a40c1bb9 100644 --- a/iterative/testdata/script_template_cloud_invalid.golden +++ b/iterative/testdata/script_template_cloud_invalid.golden @@ -8,7 +8,7 @@ echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assume sudo apt remove unattended-upgrades systemctl disable apt-daily-upgrade.service - + FILE=/var/log/cml_stack.log if [ ! -f "$FILE" ]; then sudo add-apt-repository universe -y @@ -22,6 +22,9 @@ if [ ! -f "$FILE" ]; then sudo curl --max-time 10 --output /usr/bin/docker-credential-ecr-login https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.5.0/linux-amd64/docker-credential-ecr-login sudo chmod a+x /usr/bin/docker-credential-ecr-login + curl --max-time 10 --location https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.5/docker-credential-gcr_linux_amd64-2.1.5.tar.gz | sudo tar xz docker-credential-gcr + sudo mv docker-credential-gcr /usr/bin/docker-credential-gcr + curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add - sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" sudo apt update && sudo apt-get install -y terraform