Skip to content

Commit

Permalink
Add 4.4.24 candidate and publish to ecr.
Browse files Browse the repository at this point in the history
  • Loading branch information
hpidcock committed Aug 25, 2023
1 parent b2ee43b commit f73a5fc
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 7 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,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
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ RUN cp -R /squashfs-root/bin/* /bin \
&& rm -Rf /squashfs-root \
&& apt-get update \
&& apt-get install -y libsqlite3-0 libgssapi-krb5-2 \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& groupadd --gid 170 juju \
&& useradd --home-dir /var/lib/juju --shell /usr/sbin/nologin --no-create-home --uid 170 --gid 170 juju

ENTRYPOINT [ /bin/mongod ]
24 changes: 21 additions & 3 deletions images.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
images:
juju-db-4.4:
registry_paths:
- jujusolutions/juju-db
- docker.io/jujusolutions/juju-db
- public.ecr.aws/juju/juju-db
tags:
- 4.4
- 4.4.18
build_args:
- BASE_IMAGE=ubuntu:20.04
- BASE_IMAGE=public.ecr.aws/ubuntu/ubuntu:20.04
- SNAP_RISK=stable
- SNAP_TRACK=4.4
- SNAP_VERSION=4.4.18
Expand All @@ -15,4 +16,21 @@ images:
- linux/amd64
- linux/ppc64le
- linux/s390x
juju_test_channel: 3.0/stable
juju_test_channel: 3.1/stable
juju-db-4.4-next:
registry_paths:
- docker.io/jujusolutions/juju-db
- public.ecr.aws/juju/juju-db
tags:
- 4.4.24
build_args:
- BASE_IMAGE=public.ecr.aws/ubuntu/ubuntu:20.04
- SNAP_RISK=candidate
- SNAP_TRACK=4.4
- SNAP_VERSION=4.4.24
platforms:
- linux/arm64
- linux/amd64
- linux/ppc64le
- linux/s390x
juju_test_channel: 3.1/stable
6 changes: 3 additions & 3 deletions make_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ build_image() {
fi

echo "Building ${image} for build args \"$build_args\" and platforms \"$platforms\""
echo ${cmd_platforms}
docker buildx build ${cmd_platforms} ${cmd_build_args} \
-f "$dockerfile" . ${cmd_tags} -o "$output" --progress=auto
BUILDX_NO_DEFAULT_ATTESTATIONS=true DOCKER_BUILDKIT=1 docker buildx build ${cmd_platforms} ${cmd_build_args} \
-f "$dockerfile" . ${cmd_tags} -o "$output" --progress=auto \
--provenance=false
}

microk8s_image_update() {
Expand Down

0 comments on commit f73a5fc

Please sign in to comment.