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 @@ -250,7 +250,6 @@ jobs:
fail-fast: false
matrix:
distro:
- focal
- jammy

env:
Expand Down
2 changes: 1 addition & 1 deletion 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, jammy and noble based amd64 distro are suported.
Currently only ubuntu 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 Down
2 changes: 0 additions & 2 deletions docs/custom-registries.md
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,6 @@ Samples:
```txt
https://github.com/containerbase/node-prebuild/releases/download/18.12.0/node-18.12.0-jammy-x86_x64.tar.xz.sha512
https://github.com/containerbase/node-prebuild/releases/download/18.12.0/node-18.12.0-jammy-aarch64.tar.xz
https://github.com/containerbase/node-prebuild/releases/download/18.12.0/node-18.12.0-focal-x86_x64.tar.xz.sha512
https://github.com/containerbase/node-prebuild/releases/download/18.12.0/node-18.12.0-focal-aarch64.tar.xz
https://nodejs.org/dist/v20.0.0/SHASUMS256.txt
https://nodejs.org/dist/v20.0.0/node-v20.0.0-linux-x64.tar.xz
https://nodejs.org/dist/v20.0.0/node-v20.0.0-linux-arm64.tar.xz
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
},
"packageManager": "pnpm@10.28.0",
"engines": {
"node": "^20.9.0 || ^22.11.0 || >=24.10.0",
"node": "^22.11.0 || >=24.10.0",
"pnpm": "^10.0.0"
},
"pnpm": {
Expand Down
11 changes: 0 additions & 11 deletions src/cli/tools/dotnet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,6 @@ export class DotnetPrepareService extends BasePrepareService {
const distro = await getDistro();

switch (distro.versionCode) {
case 'focal':
await this.aptSvc.install(
'libc6',
'libgcc1',
'libgssapi-krb5-2',
'libicu66',
'libssl1.1',
'libstdc++6',
'zlib1g',
);
break;
case 'jammy':
await this.aptSvc.install(
'libc6',
Expand Down
12 changes: 0 additions & 12 deletions src/cli/tools/php/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,6 @@ export class PhpPrepareService extends BasePrepareService {
const distro = await getDistro();

switch (distro.versionCode) {
case 'focal':
await this.aptSvc.install(
'libjpeg-turbo8',
'libmcrypt4',
'libonig5',
'libpng16-16',
'libtidy5deb1',
'libxslt1.1',
'libzip5',
);
break;

case 'jammy':
case 'noble':
await this.aptSvc.install(
Expand Down
2 changes: 0 additions & 2 deletions src/cli/tools/python/conan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ function getArchitecture(arch: string): string {

function getCompilerVersion(distro: Distro): string {
switch (distro.versionCode) {
case 'focal':
return '9';
case 'jammy':
return '11';
case 'noble':
Expand Down
3 changes: 1 addition & 2 deletions src/cli/utils/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@ export async function validateSystem(): Promise<void> {
const d = await (distro ??= readDistro());
switch (d.versionCode) {
/* v8 ignore next -- hard to test */
case 'focal':
case 'jammy':
case 'noble':
break;
default:
logger.fatal(
{ distro: d },
`Unsupported distro: ${d.versionCode}! Please use Ubuntu 'focal', 'jammy' or 'noble'.`,
`Unsupported distro: ${d.versionCode}! Please use Ubuntu 'jammy' or 'noble'.`,
);
process.exit(1);
}
Expand Down
3 changes: 1 addition & 2 deletions src/usr/local/containerbase/tools/v2/erlang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ function check_tool_requirements () {
local version_codename
version_codename="$(get_distro)"
case "${version_codename}" in
"focal");;
"jammy");;
"noble");;
*)
echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use ubuntu 'focal' or 'jammy'." >&2
echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use ubuntu 'jammy' or 'noble'." >&2
exit 1
;;
esac
Expand Down
3 changes: 1 addition & 2 deletions src/usr/local/containerbase/tools/v2/powershell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ function prepare_tool() {

version_codename="$(get_distro)"
case "${version_codename}" in
"focal") apt_install libc6 libgcc1 libgssapi-krb5-2 libicu66 libssl1.1 libstdc++6 zlib1g;;
"jammy") apt_install libc6 libgcc1 libgssapi-krb5-2 libicu70 libssl3 libstdc++6 zlib1g;;
"noble") apt_install libc6 libgcc1 libgssapi-krb5-2 libicu74 libssl3 libstdc++6 zlib1g;;
*)
echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use ubuntu 'focal' or 'jammy'." >&2
echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use ubuntu 'jammy' or 'noble'." >&2
exit 1
;;
esac
Expand Down
3 changes: 1 addition & 2 deletions src/usr/local/containerbase/tools/v2/python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ function prepare_tool() {

version_codename="$(get_distro)"
case "${version_codename}" in
"focal");;
"jammy");;
"noble");;
*)
echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use ubuntu 'focal' or 'jammy'." >&2
echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use ubuntu 'jammy' or 'noble'." >&2
exit 1
;;
esac
Expand Down
3 changes: 1 addition & 2 deletions src/usr/local/containerbase/tools/v2/ruby.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ function prepare_tool() {

version_codename="$(get_distro)"
case "${version_codename}" in
"focal");;
"jammy");;
"noble");;
*)
echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use ubuntu 'focal' or 'jammy'." >&2
echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use ubuntu 'jammy' or 'noble'." >&2
exit 1
;;
esac
Expand Down
20 changes: 1 addition & 19 deletions src/usr/local/containerbase/tools/v2/swift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,6 @@ function prepare_tool() {

version_codename="$(get_distro)"
case "${version_codename}" in
"focal")
apt_install \
binutils \
gnupg2 \
libc6-dev \
libcurl4 \
libedit2 \
libgcc-9-dev \
libpython2.7 \
libsqlite3-0 \
libstdc++-9-dev \
libxml2 \
libz3-dev \
pkg-config \
tzdata \
uuid-dev \
zlib1g-dev \
;;
"jammy")
apt_install \
binutils \
Expand Down Expand Up @@ -62,7 +44,7 @@ function prepare_tool() {
zlib1g-dev \
;;
*)
echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use ubuntu 'focal' or 'jammy'." >&2
echo "Tool '${TOOL_NAME}' not supported on: ${version_codename}! Please use ubuntu 'jammy' or 'noble'." >&2
exit 1
;;
esac
Expand Down
3 changes: 1 addition & 2 deletions src/usr/local/containerbase/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,10 @@ function require_arch () {

function require_distro () {
case "$DISTRO_CODENAME" in
"focal") ;; #supported
"jammy") ;; #supported
"noble") ;; #supported
*)
echo "Distro not supported: ${DISTRO_CODENAME}! Please use ubuntu 'focal', 'jammy' or 'noble'." >&2
echo "Distro not supported: ${DISTRO_CODENAME}! Please use ubuntu 'jammy' or 'noble'." >&2
exit 1
;;
esac
Expand Down
1 change: 0 additions & 1 deletion test/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ ARG BASE_IMAGE=latest
#--------------------------------------
# Images
#--------------------------------------
FROM ghcr.io/containerbase/ubuntu:20.04 AS focal
FROM ghcr.io/containerbase/ubuntu:22.04 AS jammy
FROM ghcr.io/containerbase/ubuntu:24.04 AS noble

Expand Down
1 change: 0 additions & 1 deletion test/Dockerfile.distro
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ ARG BASE_IMAGE=latest
#--------------------------------------
# Images
#--------------------------------------
FROM ghcr.io/containerbase/ubuntu:20.04 AS focal
FROM ghcr.io/containerbase/ubuntu:22.04 AS jammy
FROM ghcr.io/containerbase/ubuntu:24.04 AS noble

Expand Down
2 changes: 1 addition & 1 deletion tools/esbuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const esbuildPluginPino = __require('esbuild-plugin-pino');

shell.config.fatal = true;

const nodeVersion = 22;
const nodeVersion = 24;
const version = process.env.CONTAINERBASE_VERSION ?? '0.0.0-PLACEHOLDER';

shell.rm('-rf', 'dist/docker');
Expand Down
Loading