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

feat: add noble support #17

Merged
merged 1 commit into from
Jun 12, 2024
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
28 changes: 28 additions & 0 deletions Dockerfile-ubuntu-noble
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Copyright 2020 Canonical Ltd.
# Licensed under the AGPLv3, see LICENCE file for details.

ARG BASE_IMAGE
FROM $BASE_IMAGE

# Add the juju and sjuju user for rootless agents.
# 170 and 171 uid/gid is sourced from juju/juju
RUN groupadd --gid 170 juju
RUN useradd --uid 170 --gid 170 --no-create-home --shell /usr/bin/bash juju
RUN groupadd --gid 171 sjuju
RUN useradd --uid 171 --gid 171 --no-create-home --shell /usr/bin/bash sjuju
RUN mkdir -p /etc/sudoers.d && echo "sjuju ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/sjuju

RUN apt-get update \
&& apt-get install -y --no-install-recommends \
sudo \
python3-yaml \
python3-pip \
python3-setuptools \
# for debug-hooks.
tmux byobu \
curl \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /root/.cache

ENTRYPOINT ["sh", "-c"]

23 changes: 22 additions & 1 deletion images.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
images:
# LTS
ubuntu-24-04:
dockerfile: Dockerfile-ubuntu-noble
context: ubuntu-context
registry_paths:
- docker.io/jujusolutions/charm-base
- public.ecr.aws/juju/charm-base
- ghcr.io/juju/charm-base
tags:
- ubuntu-24.04
- latest
platforms:
- linux/arm64
- linux/amd64
- linux/ppc64le
- linux/s390x
build_args:
- "BASE_IMAGE=public.ecr.aws/ubuntu/ubuntu:24.04"
juju_test_channel: 3.5/stable
microk8s_test_channel: 1.30-strict/stable
series: noble

# LTS
ubuntu-22-04:
dockerfile: Dockerfile-ubuntu
Expand All @@ -9,7 +31,6 @@ images:
- ghcr.io/juju/charm-base
tags:
- ubuntu-22.04
- latest
platforms:
- linux/arm64
- linux/amd64
Expand Down
4 changes: 4 additions & 0 deletions test-charm/manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
bases:
- name: ubuntu
channel: 24.04/stable
architectures:
- amd64
- name: ubuntu
channel: 22.04/stable
architectures:
Expand Down
Loading