Skip to content

Commit

Permalink
Fix Docker container import to be Artifact Registry (#197)
Browse files Browse the repository at this point in the history
  • Loading branch information
sethvargo authored Aug 17, 2022
1 parent 17f05cf commit 83148e3
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/appengineflex/node/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/appengineflex/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/appengineflex/ruby/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/cloudbuild/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/cloudrun/node/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/cloudrun/python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/cloudrun/ruby/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/kubernetes/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 83148e3

Please sign in to comment.