Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support ECR #13

Merged
merged 2 commits into from
Aug 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Login to ECR Public
uses: docker/login-action@v2
with:
registry: public.ecr.aws
username: ${{ secrets.RELEASE_ECR_ACCESS_KEY_ID }}
password: ${{ secrets.RELEASE_ECR_SECRET_ACCESS_KEY }}

- name: Push images
if: ${{ success() && github.ref == 'refs/heads/master' }}
run: |
Expand Down
17 changes: 10 additions & 7 deletions images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ images:
dockerfile: Dockerfile-ubuntu
context: ubuntu-context
registry_paths:
- jujusolutions/charm-base
- docker.io/jujusolutions/charm-base
- public.ecr.aws/juju/charm-base
tags:
- ubuntu-22.04
- latest
Expand All @@ -15,8 +16,8 @@ images:
- linux/s390x
- linux/riscv64
build_args:
- "BASE_IMAGE=ubuntu:22.04"
juju_test_channel: 3.0/stable
- "BASE_IMAGE=public.ecr.aws/ubuntu/ubuntu:22.04"
juju_test_channel: 3.1/stable
microk8s_test_channel: 1.25-strict/stable
series: jammy

Expand All @@ -25,7 +26,8 @@ images:
dockerfile: Dockerfile-ubuntu
context: ubuntu-context
registry_paths:
- jujusolutions/charm-base
- docker.io/jujusolutions/charm-base
- public.ecr.aws/juju/charm-base
tags:
- ubuntu-20.04
platforms:
Expand All @@ -35,7 +37,7 @@ images:
- linux/s390x
- linux/riscv64
build_args:
- "BASE_IMAGE=ubuntu:20.04"
- "BASE_IMAGE=public.ecr.aws/ubuntu/ubuntu:20.04"
juju_test_channel: 2.9/stable
microk8s_test_channel: 1.25/stable
series: focal
Expand All @@ -45,7 +47,8 @@ images:
dockerfile: Dockerfile-ubuntu
context: ubuntu-context
registry_paths:
- jujusolutions/charm-base
- docker.io/jujusolutions/charm-base
- public.ecr.aws/juju/charm-base
tags:
- ubuntu-18.04
platforms:
Expand All @@ -54,7 +57,7 @@ images:
- linux/ppc64le
- linux/s390x
build_args:
- "BASE_IMAGE=ubuntu:18.04"
- "BASE_IMAGE=public.ecr.aws/ubuntu/ubuntu:18.04"
juju_test_channel: 2.9/stable
microk8s_test_channel: 1.25/stable
series: bionic
Loading