Skip to content
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
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ jobs:
fail-fast: false
matrix:
distro:
- focal
- jammy
- noble

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ For other test images see the [`test`](./test/) folder.

#### Noble

To run the `noble` tests use the following command, it will run the test from [`test/Dockerfile.noble`](./test/Dockerfile.noble).
To run the `noble` tests use the following command, it will run the test from [`test/Dockerfile.distro`](./test/Dockerfile.distro).

```sh
TAG=noble docker buildx bake test-distro
```

#### Jammy

To run the `jammy` tests use the following command, it will run the test from [`test/Dockerfile.jammy`](./test/Dockerfile.jammy).
To run the `jammy` tests use the following command, it will run the test from [`test/Dockerfile.distro`](./test/Dockerfile.distro).

```sh
TAG=jammy docker buildx bake test-distro
Expand Down
8 changes: 4 additions & 4 deletions docs/custom-base-image.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Custom base image

The following sample can be used to create a `containerbase/base` based image which does not extend `containerbase/base` directly.
Currently only ubuntu focal and jammy based amd64 distro are suported.
Currently only ubuntu focal, jammy and noble based amd64 distro are suported.

You can also use our containerbase from GitHub container registry as `ghcr.io/containerbase/base`.
`containerbase/base` and `ghcr.io/containerbase/base` are exchangeble.
Expand All @@ -15,7 +15,7 @@ Use this template for using a custom base image with our default user named `ubu
# This containerbase is used for tool intallation and user/directory setup
FROM containerbase/base AS containerbase

FROM amd64/ubuntu:jammy AS base
FROM amd64/ubuntu:noble AS base

# Allows custom apt proxy usage
ARG APT_HTTP_PROXY
Expand Down Expand Up @@ -58,7 +58,7 @@ You can also customize username or userid by using this template.
# This containerbase is used for tool intallation and user/directory setup
FROM containerbase/base AS containerbase

FROM amd64/ubuntu:jammy AS base
FROM amd64/ubuntu:noble AS base

# The containerbase supports custom user
ARG USER_NAME=custom
Expand Down Expand Up @@ -107,7 +107,7 @@ The group must already exist.
# This containerbase is used for tool intallation and user/directory setup
FROM containerbase/base AS containerbase

FROM amd64/ubuntu:jammy AS base
FROM amd64/ubuntu:noble AS base

ARG USER_NAME=gitpod
ARG USER_ID=33333
Expand Down