From 1e94b831dd26df0ff7f05a7833415926957169ef Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Fri, 31 Oct 2025 14:43:58 +0800 Subject: [PATCH 1/3] toolchain: Upgrade rust toolchain from 1.85.0 to 1.91.0 --- aarch64/Dockerfile | 2 +- bionic/Dockerfile | 2 +- centos-7/Dockerfile | 2 +- gen-dockerfiles | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile index 0806cf1..379be28 100644 --- a/aarch64/Dockerfile +++ b/aarch64/Dockerfile @@ -28,7 +28,7 @@ RUN set -eux; \ echo "${RUSTUP_SHA256} *rustup-init" | sha256sum -c -; \ chmod +x rustup-init -ENV RUST_VERSION=1.85.0 +ENV RUST_VERSION=1.91.0 RUN set -eux; \ ./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \ diff --git a/bionic/Dockerfile b/bionic/Dockerfile index ed75c0b..b3b5619 100644 --- a/bionic/Dockerfile +++ b/bionic/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ echo "${RUSTUP_SHA256} *rustup-init" | sha256sum -c -; \ chmod +x rustup-init -ENV RUST_VERSION=1.85.0 +ENV RUST_VERSION=1.91.0 RUN set -eux; \ ./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \ diff --git a/centos-7/Dockerfile b/centos-7/Dockerfile index 61765ac..3d9d87c 100644 --- a/centos-7/Dockerfile +++ b/centos-7/Dockerfile @@ -27,7 +27,7 @@ RUN set -eux; \ echo "${RUSTUP_SHA256} *rustup-init" | sha256sum -c -; \ chmod +x rustup-init -ENV RUST_VERSION=1.85.0 +ENV RUST_VERSION=1.91.0 RUN set -eux; \ ./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION; \ diff --git a/gen-dockerfiles b/gen-dockerfiles index a391855..cb6af56 100755 --- a/gen-dockerfiles +++ b/gen-dockerfiles @@ -3,7 +3,7 @@ import os from urllib import request -RUST_VERSION = '1.85.0' +RUST_VERSION = '1.91.0' RUSTUP_VERSION = '1.27.1' DISTRIBUTIONS = { From d6da4674cc82fdd0dc5b5c19090cb61679533b17 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Mon, 3 Nov 2025 15:29:14 +0800 Subject: [PATCH 2/3] Upgrade aarch64 docker base to ubuntu:22.04 --- aarch64/Dockerfile | 2 +- templates/aarch64.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile index 379be28..735d286 100644 --- a/aarch64/Dockerfile +++ b/aarch64/Dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/ubuntu:20.04 +FROM arm64v8/ubuntu:22.04 RUN set -eux; \ apt-get update; \ diff --git a/templates/aarch64.Dockerfile b/templates/aarch64.Dockerfile index 5d47949..09e9953 100644 --- a/templates/aarch64.Dockerfile +++ b/templates/aarch64.Dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/ubuntu:20.04 +FROM arm64v8/ubuntu:22.04 RUN set -eux; \ apt-get update; \ From f30c1b03184120c9e6c58de4730f03ab126bf559 Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Mon, 3 Nov 2025 15:41:07 +0800 Subject: [PATCH 3/3] Upgrade ubuntu:bionic to ubuntu:focal, since bionic reached EOL support --- .github/workflows/docker.yml | 6 ++--- Makefile | 26 +++++++++---------- {bionic => focal}/Dockerfile | 2 +- gen-dockerfiles | 2 +- .../{bionic.Dockerfile => focal.Dockerfile} | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) rename {bionic => focal}/Dockerfile (98%) rename templates/{bionic.Dockerfile => focal.Dockerfile} (98%) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index decd836..d2909bc 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -17,7 +17,7 @@ jobs: include: - distro: centos-7 platform: linux/amd64 - - distro: bionic + - distro: focal platform: linux/amd64 - distro: aarch64 platform: linux/arm64 @@ -59,7 +59,7 @@ jobs: include: - distro: centos-7 platform: linux/amd64 - - distro: bionic + - distro: focal platform: linux/amd64 - distro: aarch64 platform: linux/arm64 @@ -95,7 +95,7 @@ jobs: include: - distro: centos-7 platform: linux/amd64 - - distro: bionic + - distro: focal platform: linux/amd64 - distro: aarch64 platform: linux/arm64 diff --git a/Makefile b/Makefile index e81fce3..ca31d71 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ GHCR_REPO := ghcr.io/nervosnetwork/ckb-docker-builder RUST_VERSION := rust-$(shell sed -n "s/RUST_VERSION\s*=\s*'\(.*\)'$$/\1/p" gen-dockerfiles) IMAGE_VERSION := ${RUST_VERSION} -bionic/Dockerfile: gen-dockerfiles templates/bionic.Dockerfile +focal/Dockerfile: gen-dockerfiles templates/focal.Dockerfile python3 gen-dockerfiles centos-7/Dockerfile: gen-dockerfiles templates/centos-7.Dockerfile @@ -12,10 +12,10 @@ centos-7/Dockerfile: gen-dockerfiles templates/centos-7.Dockerfile aarch64/Dockerfile: gen-dockerfiles templates/aarch64.Dockerfile python3 gen-dockerfiles -build-all: build-bionic build-centos-7 build-aarch64 +build-all: build-focal build-centos-7 build-aarch64 -build-bionic: bionic/Dockerfile - docker build -f bionic/Dockerfile --tag ${DOCKERHUB_REPO}:bionic-${IMAGE_VERSION} . +build-focal: focal/Dockerfile + docker build -f focal/Dockerfile --tag ${DOCKERHUB_REPO}:focal-${IMAGE_VERSION} . build-centos-7: centos-7/Dockerfile docker build -f centos-7/Dockerfile --tag ${DOCKERHUB_REPO}:centos-7-${IMAGE_VERSION} . @@ -23,11 +23,11 @@ build-centos-7: centos-7/Dockerfile build-aarch64: aarch64/Dockerfile docker build -f aarch64/Dockerfile --tag ${DOCKERHUB_REPO}:aarch64-${IMAGE_VERSION} . -.PHONY: build-all build-bionic build-centos-7 build-aarch64 -push-all: push-bionic push-centos-7 push-aarch64 +.PHONY: build-all build-focal build-centos-7 build-aarch64 +push-all: push-focal push-centos-7 push-aarch64 -push-bionic: build-bionic - docker push ${DOCKERHUB_REPO}:bionic-${IMAGE_VERSION} +push-focal: build-focal + docker push ${DOCKERHUB_REPO}:focal-${IMAGE_VERSION} push-centos-7: build-centos-7 docker push ${DOCKERHUB_REPO}:centos-7-${IMAGE_VERSION} @@ -35,17 +35,17 @@ push-centos-7: build-centos-7 push-aarch64: build-aarch64 docker push ${DOCKERHUB_REPO}:aarch64-${IMAGE_VERSION} -.PHONY: push-all push-bionic push-centos-7 push-aarch64 +.PHONY: push-all push-focal push-centos-7 push-aarch64 -test-all: test-bionic test-centos-7 +test-all: test-focal test-centos-7 sync-ckb: if [ -d ckb ]; then git -C ckb pull; else git clone --depth 1 https://github.com/nervosnetwork/ckb.git; fi -test-bionic: sync-ckb - docker run --rm -it -w /ckb -v "$$(pwd)/ckb:/ckb" ${DOCKERHUB_REPO}:bionic-${IMAGE_VERSION} make prod +test-focal: sync-ckb + docker run --rm -it -w /ckb -v "$$(pwd)/ckb:/ckb" ${DOCKERHUB_REPO}:focal-${IMAGE_VERSION} make prod test-centos-7: sync-ckb docker run --rm -it -w /ckb -v "$$(pwd)/ckb:/ckb" ${DOCKERHUB_REPO}:centos-7-${IMAGE_VERSION} make prod -.PHONY: test-all test-bionic test-centos-7 sync-ckb +.PHONY: test-all test-focal test-centos-7 sync-ckb diff --git a/bionic/Dockerfile b/focal/Dockerfile similarity index 98% rename from bionic/Dockerfile rename to focal/Dockerfile index b3b5619..89ee8c7 100644 --- a/bionic/Dockerfile +++ b/focal/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:focal RUN set -eux; \ apt-get update; \ diff --git a/gen-dockerfiles b/gen-dockerfiles index cb6af56..d8908bd 100755 --- a/gen-dockerfiles +++ b/gen-dockerfiles @@ -8,7 +8,7 @@ RUSTUP_VERSION = '1.27.1' DISTRIBUTIONS = { # Ubuntu - 'bionic': 'x86_64-unknown-linux-gnu', + 'focal': 'x86_64-unknown-linux-gnu', # CentOS 'centos-7': 'x86_64-unknown-linux-gnu', # Arch64 diff --git a/templates/bionic.Dockerfile b/templates/focal.Dockerfile similarity index 98% rename from templates/bionic.Dockerfile rename to templates/focal.Dockerfile index fd03b21..b0cae4d 100644 --- a/templates/bionic.Dockerfile +++ b/templates/focal.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:focal RUN set -eux; \ apt-get update; \