From c6824223aa2d38b25180b2c9c9910bf9153041d7 Mon Sep 17 00:00:00 2001 From: HonkingGoose <34918129+HonkingGoose@users.noreply.github.com> Date: Mon, 29 Apr 2024 17:14:21 +0200 Subject: [PATCH] docs: update references to Ubuntu versions (#28701) Co-authored-by: Michael Kriese --- docs/usage/configuration-options.md | 2 +- docs/usage/docker.md | 6 +++--- docs/usage/examples/self-hosting.md | 5 ++++- lib/modules/manager/azure-pipelines/readme.md | 2 +- lib/modules/manager/github-actions/readme.md | 2 +- lib/modules/versioning/ubuntu/readme.md | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/usage/configuration-options.md b/docs/usage/configuration-options.md index e52762dabfcbf7..284fdeb33910af 100644 --- a/docs/usage/configuration-options.md +++ b/docs/usage/configuration-options.md @@ -770,7 +770,7 @@ As example the following configuration will update all three lines in the Docker ``` ```dockerfile title="Dockerfile" -FROM amd64/ubuntu:18.04 +FROM amd64/ubuntu:24.04 ENV GRADLE_VERSION=6.2 # gradle-version/gradle&versioning=maven ENV NODE_VERSION=10.19.0 # github-tags/nodejs/node&versioning=node ``` diff --git a/docs/usage/docker.md b/docs/usage/docker.md index 6631c9b330f849..028d5d81ee0b0a 100644 --- a/docs/usage/docker.md +++ b/docs/usage/docker.md @@ -121,13 +121,13 @@ For example: Renovate understands [Ubuntu release code names](https://wiki.ubuntu.com/Releases) and will offer upgrades to the latest LTS release. You must only use the _first_ term of the code name in _lowercase_. -So use `jammy` for the Jammy Jellyfish release. +So use `noble` for the Noble Numbat release. For example, Renovate will offer to upgrade the following `Dockerfile` layer: ```diff -- FROM ubuntu:focal -+ FROM ubuntu:jammy +- FROM ubuntu:jammy ++ FROM ubuntu:noble ``` ### Debian codenames diff --git a/docs/usage/examples/self-hosting.md b/docs/usage/examples/self-hosting.md index 1e457fc670e297..42d25404146694 100644 --- a/docs/usage/examples/self-hosting.md +++ b/docs/usage/examples/self-hosting.md @@ -416,7 +416,10 @@ This means Renovate can safely connect to systems using that certificate or cert Helper programs like Git and npm use the system trust store. For those programs to trust a self-signed certificate you must add it to the systems trust store. -On Ubuntu/Debian and many Linux-based systems, this can be done by copying the self-signed certificate (e.g. `self-signed-certificate.crt`) to `/usr/local/share/ca-certificates/` and running [`update-ca-certificates`](https://manpages.ubuntu.com/manpages/xenial/man8/update-ca-certificates.8.html) to update the system trust store afterwards. +On Ubuntu/Debian and many Linux-based systems, this can be done by: + +1. copying the self-signed certificate (e.g. `self-signed-certificate.crt`) to `/usr/local/share/ca-certificates/` +1. and running [`update-ca-certificates`](https://manpages.ubuntu.com/manpages/noble/man8/update-ca-certificates.8.html) to update the system trust store afterwards ### Renovate Docker image diff --git a/lib/modules/manager/azure-pipelines/readme.md b/lib/modules/manager/azure-pipelines/readme.md index aee00bea3e63ae..3536e8181f2527 100644 --- a/lib/modules/manager/azure-pipelines/readme.md +++ b/lib/modules/manager/azure-pipelines/readme.md @@ -42,7 +42,7 @@ resources: ref: refs/tags/v0.5.1 containers: - container: linux - image: ubuntu:16.04 + image: ubuntu:24.04 - container: python image: python:3.7@sha256:3870d35b962a943df72d948580fc66ceaaee1c4fbd205930f32e0f0760eb1077 diff --git a/lib/modules/manager/github-actions/readme.md b/lib/modules/manager/github-actions/readme.md index 57c47c22842c34..67857a0ab4fb74 100644 --- a/lib/modules/manager/github-actions/readme.md +++ b/lib/modules/manager/github-actions/readme.md @@ -40,7 +40,7 @@ name: build on: [push] env: - RUNNER: ubuntu-20.04 + RUNNER: ubuntu-22.04 jobs: build: diff --git a/lib/modules/versioning/ubuntu/readme.md b/lib/modules/versioning/ubuntu/readme.md index fd611b3b90ebdd..49dfba8663fb19 100644 --- a/lib/modules/versioning/ubuntu/readme.md +++ b/lib/modules/versioning/ubuntu/readme.md @@ -1,3 +1,3 @@ Ubuntu versioning is used for Ubuntu container images that are referenced by their release version or a codename. -Versions to which this scheme applies are e.g. `22.04`, `jammy` and `jammy-20220815`. +Versions to which this scheme applies are e.g. `24.04`, `noble` and `noble-20240423`.