From 83148e3346278767b972b2fb9b9504979e607f6e Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Tue, 16 Aug 2022 20:08:34 -0400 Subject: [PATCH] Fix Docker container import to be Artifact Registry (#197) --- README.md | 2 +- examples/appengineflex/node/Dockerfile | 2 +- examples/appengineflex/python/Dockerfile | 2 +- examples/appengineflex/ruby/Dockerfile | 2 +- examples/cloudbuild/cloudbuild.yaml | 2 +- examples/cloudrun/node/Dockerfile | 2 +- examples/cloudrun/python/Dockerfile | 2 +- examples/cloudrun/ruby/Dockerfile | 2 +- examples/kubernetes/main.go | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index aa1b2719..69143e82 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ stored in [Cloud Storage][cloud-storage]. An interoperable layer also exists wit - Install a pre-compiled binary for your operating system from the [latest releases](releases). - - Use an [official Docker container](ghcr.io/GoogleCloudPlatform/berglas): + - Use an [official Docker container](us-docker.pkg.dev/berglas/berglas/berglas): ```text docker run -it us-docker.pkg.dev/berglas/berglas/berglas diff --git a/examples/appengineflex/node/Dockerfile b/examples/appengineflex/node/Dockerfile index c3990d96..94fb6648 100644 --- a/examples/appengineflex/node/Dockerfile +++ b/examples/appengineflex/node/Dockerfile @@ -23,6 +23,6 @@ COPY package.json package*.json ./ RUN npm install --only=production COPY . ./ -COPY --from=ghcr.io/GoogleCloudPlatform/berglas:latest /bin/berglas /bin/berglas +COPY --from=us-docker.pkg.dev/berglas/berglas/berglas:latest /bin/berglas /bin/berglas ENTRYPOINT exec /bin/berglas exec -- npm start diff --git a/examples/appengineflex/python/Dockerfile b/examples/appengineflex/python/Dockerfile index 6074f080..24bc30b3 100644 --- a/examples/appengineflex/python/Dockerfile +++ b/examples/appengineflex/python/Dockerfile @@ -26,6 +26,6 @@ COPY requirements.txt ./ RUN pip install -r requirements.txt COPY . ./ -COPY --from=ghcr.io/GoogleCloudPlatform/berglas:latest /bin/berglas /bin/berglas +COPY --from=us-docker.pkg.dev/berglas/berglas/berglas:latest /bin/berglas /bin/berglas ENTRYPOINT exec /bin/berglas exec -- gunicorn --bind 0.0.0.0:${PORT} --workers 1 --threads 8 app:app diff --git a/examples/appengineflex/ruby/Dockerfile b/examples/appengineflex/ruby/Dockerfile index 055626d2..3fd54a74 100644 --- a/examples/appengineflex/ruby/Dockerfile +++ b/examples/appengineflex/ruby/Dockerfile @@ -31,6 +31,6 @@ RUN bundle install \ --quiet COPY . ./ -COPY --from=ghcr.io/GoogleCloudPlatform/berglas:latest /bin/berglas /bin/berglas +COPY --from=us-docker.pkg.dev/berglas/berglas/berglas:latest /bin/berglas /bin/berglas ENTRYPOINT exec /bin/berglas exec -- ./bin/bundle exec ruby app.rb diff --git a/examples/cloudbuild/cloudbuild.yaml b/examples/cloudbuild/cloudbuild.yaml index 11610621..248d5301 100644 --- a/examples/cloudbuild/cloudbuild.yaml +++ b/examples/cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ steps: - id: berglas - name: ghcr.io/GoogleCloudPlatform/berglas + name: us-docker.pkg.dev/berglas/berglas/berglas env: - API_KEY=berglas://${_BUCKET_ID}/api-key?destination=/secrets/api-key - TLS_KEY=berglas://${_BUCKET_ID}/tls-key?destination=/secrets/tls-key diff --git a/examples/cloudrun/node/Dockerfile b/examples/cloudrun/node/Dockerfile index c3990d96..94fb6648 100644 --- a/examples/cloudrun/node/Dockerfile +++ b/examples/cloudrun/node/Dockerfile @@ -23,6 +23,6 @@ COPY package.json package*.json ./ RUN npm install --only=production COPY . ./ -COPY --from=ghcr.io/GoogleCloudPlatform/berglas:latest /bin/berglas /bin/berglas +COPY --from=us-docker.pkg.dev/berglas/berglas/berglas:latest /bin/berglas /bin/berglas ENTRYPOINT exec /bin/berglas exec -- npm start diff --git a/examples/cloudrun/python/Dockerfile b/examples/cloudrun/python/Dockerfile index 6074f080..24bc30b3 100644 --- a/examples/cloudrun/python/Dockerfile +++ b/examples/cloudrun/python/Dockerfile @@ -26,6 +26,6 @@ COPY requirements.txt ./ RUN pip install -r requirements.txt COPY . ./ -COPY --from=ghcr.io/GoogleCloudPlatform/berglas:latest /bin/berglas /bin/berglas +COPY --from=us-docker.pkg.dev/berglas/berglas/berglas:latest /bin/berglas /bin/berglas ENTRYPOINT exec /bin/berglas exec -- gunicorn --bind 0.0.0.0:${PORT} --workers 1 --threads 8 app:app diff --git a/examples/cloudrun/ruby/Dockerfile b/examples/cloudrun/ruby/Dockerfile index 055626d2..3fd54a74 100644 --- a/examples/cloudrun/ruby/Dockerfile +++ b/examples/cloudrun/ruby/Dockerfile @@ -31,6 +31,6 @@ RUN bundle install \ --quiet COPY . ./ -COPY --from=ghcr.io/GoogleCloudPlatform/berglas:latest /bin/berglas /bin/berglas +COPY --from=us-docker.pkg.dev/berglas/berglas/berglas:latest /bin/berglas /bin/berglas ENTRYPOINT exec /bin/berglas exec -- ./bin/bundle exec ruby app.rb diff --git a/examples/kubernetes/main.go b/examples/kubernetes/main.go index 23ec3ef0..640744f3 100644 --- a/examples/kubernetes/main.go +++ b/examples/kubernetes/main.go @@ -24,7 +24,7 @@ import ( const ( // berglasContainer is the default berglas container from which to pull the // berglas binary. - berglasContainer = "ghcr.io/GoogleCloudPlatform/berglas:latest" + berglasContainer = "us-docker.pkg.dev/berglas/berglas/berglas:latest" // binVolumeName is the name of the volume where the berglas binary is stored. binVolumeName = "berglas-bin"