Skip to content

Commit 093a9d6

Browse files
authored
use ubuntu 22.04 LTS (#1450)
Co-authored-by: Allan Rasmussen <[email protected]>
1 parent f6907f9 commit 093a9d6

File tree

8 files changed

+10
-9
lines changed

8 files changed

+10
-9
lines changed

.github/workflows/build-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
build:
129129
needs: [fourmolu, rustfmt]
130130
# Use fixed OS version because we install packages on the system.
131-
runs-on: ubuntu-24.04
131+
runs-on: ubuntu-22.04
132132
if: ${{ !github.event.pull_request.draft }}
133133

134134
strategy:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
- '*.*.*-*-alpha'
2121

2222
env:
23-
UBUNTU_VERSION: '24.04'
23+
UBUNTU_VERSION: '22.04'
2424
STATIC_LIBRARIES_IMAGE_TAG: 'rust-1.82_ghc-9.10.2'
2525
RUST_VERSION: '1.82'
2626
STACK_VERSION: '3.7.1'

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
## 9.0.7
66

7-
- Docker base images upgraded from Ubuntu 20.04 to 24.04
7+
- Ubuntu 20.04 LTS is no longer supported for running the node. Minimum supported version is 22.04 LTS.
8+
The Docker base images have been upgraded accordingly from Ubuntu 20.04 to 22.04
89
- Node Docker image is now signed with Sigstore Cosign
910
- Add P8 -> P9 update.
1011
- Update GHC version to 9.10.2 (lts-24.0).

collector-backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ WORKDIR /build
55
COPY . .
66
RUN cargo build --release
77

8-
FROM ubuntu:24.04
8+
FROM ubuntu:22.04
99
COPY --from=build /build/target/release/node-collector-backend /node-collector-backend
1010
ENTRYPOINT ["/node-collector-backend"]

scripts/distribution/docker/build-distribution-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
set -euxo pipefail
2525

2626
# Build the image and tag it as static-node-binaries
27-
GHC_VERSION="${ghc_version}" UBUNTU_VERSION=24.04 STATIC_LIBRARIES_IMAGE_TAG="${static_libraries_image_tag}" STATIC_BINARIES_IMAGE_TAG="${static_binaries_image_tag:-latest}" ./scripts/static-binaries/build-static-binaries.sh
27+
GHC_VERSION="${ghc_version}" UBUNTU_VERSION=22.04 STATIC_LIBRARIES_IMAGE_TAG="${static_libraries_image_tag}" STATIC_BINARIES_IMAGE_TAG="${static_binaries_image_tag:-latest}" ./scripts/static-binaries/build-static-binaries.sh
2828

2929
# Then pack it all together with genesis
3030
DOCKER_BUILDKIT=1 docker build\

scripts/distribution/docker/builder.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
2828
RUN --mount=type=ssh git clone --depth 1 --branch "${genesis_ref}" [email protected]:Concordium/concordium-infra-genesis-data.git
2929
RUN mv "concordium-infra-genesis-data/${genesis_path}" /data
3030

31-
FROM ubuntu:24.04
31+
FROM ubuntu:22.04
3232

3333
# Which environment we are building the image for.
3434
# Currently it should be either

scripts/distribution/ubuntu-packages/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ The general strategy for building the package is as follows.
8282

8383
For example use the [../../static-binaries/build-static-binaries.sh](../../static-binaries/build-static-binaries.sh).
8484
```console
85-
$ UBUNTU_VERSION=24.04 STATIC_LIBRARIES_IMAGE_TAG=rust-1.82_ghc-9.10.2
85+
$ UBUNTU_VERSION=22.04 STATIC_LIBRARIES_IMAGE_TAG=rust-1.82_ghc-9.10.2
8686
STATIC_BINARIES_IMAGE_TAG=latest GHC_VERSION=9.10.2 EXTRA_FEATURES=collector ./scripts/static-binaries/build-static-binaries.sh
8787
```
8888

@@ -103,7 +103,7 @@ scripts are [./build-mainnet-deb.sh](./build-mainnet-deb.sh) and
103103
directory they are in as follows.
104104

105105
```console
106-
UBUNTU_VERSION=24.04 ./build-testnet-deb.sh
106+
UBUNTU_VERSION=22.04 ./build-testnet-deb.sh
107107
```
108108

109109
The script uses docker to build the binaries and the debian package. The output

scripts/static-binaries/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ specific package manager for installing dependencies (and possibly renaming depe
1010
## [build-static-binaries.sh](./build-static-binaries.sh)
1111
This is the main script that should be used. **It is intended to be run from
1212
the root of the repository.** The script supports the following environment variables
13-
- `UBUNTU_VERSION`, numeric tag, 24.04, 18.04
13+
- `UBUNTU_VERSION`, numeric tag, 22.04
1414
- `STATIC_LIBRARIES_IMAGE_TAG`, tag of the docker image used to build static
1515
libraries. `latest` should work, but otherwise see which tags are
1616
available on dockerhub.

0 commit comments

Comments
 (0)