From 057a4d4f868ec0cf3e0eff09baab35939b78bf63 Mon Sep 17 00:00:00 2001 From: Cezar Craciunoiu Date: Thu, 30 May 2024 13:52:52 +0300 Subject: [PATCH 1/5] build(buildenvs): Bump 'debian' to latest version Signed-off-by: Cezar Craciunoiu --- buildenvs/base.Dockerfile | 2 +- buildenvs/github-action.Dockerfile | 2 +- buildenvs/myself.Dockerfile | 2 +- buildenvs/qemu.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildenvs/base.Dockerfile b/buildenvs/base.Dockerfile index 40cbb0abd..5fefd66cc 100644 --- a/buildenvs/base.Dockerfile +++ b/buildenvs/base.Dockerfile @@ -2,7 +2,7 @@ # Copyright (c) 2022, NEC Europe Ltd., Unikraft GmbH, and The KraftKit Authors. # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file except in compliance with the License. -ARG DEBIAN_VERSION=bookworm-20230725 +ARG DEBIAN_VERSION=bookworm-20240513 ARG KRAFTKIT_VERSION=latest ARG QEMU_VERSION=8.2.0 ARG REGISTRY=kraftkit.sh diff --git a/buildenvs/github-action.Dockerfile b/buildenvs/github-action.Dockerfile index 5da8aa841..b75aff0d8 100644 --- a/buildenvs/github-action.Dockerfile +++ b/buildenvs/github-action.Dockerfile @@ -3,7 +3,7 @@ # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file except in compliance with the License. ARG GO_VERSION=1.22.0 -ARG DEBIAN_VERSION=bookworm-20230725 +ARG DEBIAN_VERSION=bookworm-20240513 ARG KRAFTKIT_VERSION=latest ARG QEMU_VERSION=8.2.0 ARG REGISTRY=kraftkit.sh diff --git a/buildenvs/myself.Dockerfile b/buildenvs/myself.Dockerfile index b2feefbeb..7b46c5a87 100644 --- a/buildenvs/myself.Dockerfile +++ b/buildenvs/myself.Dockerfile @@ -5,7 +5,7 @@ ARG GO_VERSION=1.22.0 -FROM golang:${GO_VERSION}-bullseye AS kraftkit-full +FROM golang:${GO_VERSION}-bookworm AS kraftkit-full # Install build dependencies RUN set -xe; \ diff --git a/buildenvs/qemu.Dockerfile b/buildenvs/qemu.Dockerfile index a1e9d41b4..87478df1d 100644 --- a/buildenvs/qemu.Dockerfile +++ b/buildenvs/qemu.Dockerfile @@ -3,7 +3,7 @@ # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file except in compliance with the License. -ARG DEBIAN_VERSION=bookworm-20230725 +ARG DEBIAN_VERSION=bookworm-20240513 FROM debian:${DEBIAN_VERSION} AS qemu-build From 44d87b329694bef3bf726ce12b6981b5cff385e7 Mon Sep 17 00:00:00 2001 From: Cezar Craciunoiu Date: Thu, 30 May 2024 13:54:31 +0300 Subject: [PATCH 2/5] build: Bump 'qemu' to latest 8 version Signed-off-by: Cezar Craciunoiu --- .github/workflows/buildenvs.yaml | 2 +- buildenvs/Makefile | 6 +++--- buildenvs/base.Dockerfile | 2 +- buildenvs/github-action.Dockerfile | 2 +- buildenvs/qemu.Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/buildenvs.yaml b/.github/workflows/buildenvs.yaml index 8dd5e677e..a7f25308b 100644 --- a/.github/workflows/buildenvs.yaml +++ b/.github/workflows/buildenvs.yaml @@ -22,7 +22,7 @@ jobs: strategy: matrix: include: - - QEMU_VERSION: 8.2.0 + - QEMU_VERSION: 8.2.4 steps: - name: Get changed files diff --git a/buildenvs/Makefile b/buildenvs/Makefile index 822857c9f..3194d259e 100644 --- a/buildenvs/Makefile +++ b/buildenvs/Makefile @@ -23,7 +23,7 @@ PLATFORM ?= linux/x86_64 WITH_CACHE ?= y .PHONY: qemu -qemu: QEMU_VERSION ?= 8.2.0 +qemu: QEMU_VERSION ?= 8.2.4 qemu: MAKE_NPROC ?= $(shell nproc) qemu: ENVIRONMENT ?= qemu qemu: IMAGE ?= $(REGISTRY)/qemu:$(QEMU_VERSION) @@ -71,7 +71,7 @@ base: ENVIRONMENT ?= base base: GO_VERSION ?= 1.22.0 base: IMAGE ?= $(REGISTRY)/base:$(IMAGE_TAG) base: KRAFTKIT_VERSION ?= latest -base: QEMU_VERSION ?= 8.2.0 +base: QEMU_VERSION ?= 8.2.4 ifeq ($(WITH_CACHE),y) base: _WITH_CACHE := --cache-from $(IMAGE) else @@ -93,7 +93,7 @@ base-golang: ENVIRONMENT ?= base-golang base-golang: GO_VERSION ?= 1.22.0 base-golang: IMAGE ?= $(REGISTRY)/base-golang:$(IMAGE_TAG) base-golang: KRAFTKIT_VERSION ?= latest -base-golang: QEMU_VERSION ?= 8.2.0 +base-golang: QEMU_VERSION ?= 8.2.4 ifeq ($(WITH_CACHE),y) base-golang: _WITH_CACHE := --cache-from $(IMAGE) else diff --git a/buildenvs/base.Dockerfile b/buildenvs/base.Dockerfile index 5fefd66cc..809ecf2d1 100644 --- a/buildenvs/base.Dockerfile +++ b/buildenvs/base.Dockerfile @@ -4,7 +4,7 @@ # You may not use this file except in compliance with the License. ARG DEBIAN_VERSION=bookworm-20240513 ARG KRAFTKIT_VERSION=latest -ARG QEMU_VERSION=8.2.0 +ARG QEMU_VERSION=8.2.4 ARG REGISTRY=kraftkit.sh FROM ${REGISTRY}/qemu:${QEMU_VERSION} AS qemu diff --git a/buildenvs/github-action.Dockerfile b/buildenvs/github-action.Dockerfile index b75aff0d8..533174b24 100644 --- a/buildenvs/github-action.Dockerfile +++ b/buildenvs/github-action.Dockerfile @@ -5,7 +5,7 @@ ARG GO_VERSION=1.22.0 ARG DEBIAN_VERSION=bookworm-20240513 ARG KRAFTKIT_VERSION=latest -ARG QEMU_VERSION=8.2.0 +ARG QEMU_VERSION=8.2.4 ARG REGISTRY=kraftkit.sh FROM golang:${GO_VERSION}-bullseye AS build diff --git a/buildenvs/qemu.Dockerfile b/buildenvs/qemu.Dockerfile index 87478df1d..ecba7211e 100644 --- a/buildenvs/qemu.Dockerfile +++ b/buildenvs/qemu.Dockerfile @@ -7,7 +7,7 @@ ARG DEBIAN_VERSION=bookworm-20240513 FROM debian:${DEBIAN_VERSION} AS qemu-build -ARG QEMU_VERSION=8.2.0 +ARG QEMU_VERSION=8.2.4 ARG WITH_XEN=disable ARG WITH_KVM=enable From 59d3fccd4a063c8bf571ba970af59eeb9c1748a3 Mon Sep 17 00:00:00 2001 From: Cezar Craciunoiu Date: Thu, 30 May 2024 13:56:47 +0300 Subject: [PATCH 3/5] build: Bump 'golang' to latest 1.22 patch Signed-off-by: Cezar Craciunoiu --- .github/workflows/check-static.yaml | 2 +- .github/workflows/tests-stable.yaml | 6 +++--- .github/workflows/tests.yaml | 6 +++--- .github/workflows/tools-go-generate-qemu-device.yaml | 4 ++-- .github/workflows/tools-protoc-gen-go-netconn.yaml | 4 ++-- buildenvs/Makefile | 8 ++++---- buildenvs/base-golang.Dockerfile | 2 +- buildenvs/github-action.Dockerfile | 2 +- buildenvs/myself.Dockerfile | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/check-static.yaml b/.github/workflows/check-static.yaml index 073384e6d..16d775f3a 100644 --- a/.github/workflows/check-static.yaml +++ b/.github/workflows/check-static.yaml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set Go variables diff --git a/.github/workflows/tests-stable.yaml b/.github/workflows/tests-stable.yaml index 161ebd0ee..ac42af927 100644 --- a/.github/workflows/tests-stable.yaml +++ b/.github/workflows/tests-stable.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set Go variables @@ -59,7 +59,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set Go variables @@ -110,7 +110,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set Go variables diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 3d1fa010d..dabaf5373 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -25,7 +25,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set Go variables @@ -67,7 +67,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set Go variables @@ -120,7 +120,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set Go variables diff --git a/.github/workflows/tools-go-generate-qemu-device.yaml b/.github/workflows/tools-go-generate-qemu-device.yaml index e9e56ac39..379b1f316 100644 --- a/.github/workflows/tools-go-generate-qemu-device.yaml +++ b/.github/workflows/tools-go-generate-qemu-device.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set go.mod variable @@ -48,7 +48,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set Go variables diff --git a/.github/workflows/tools-protoc-gen-go-netconn.yaml b/.github/workflows/tools-protoc-gen-go-netconn.yaml index 9bb98b151..d02d660c0 100644 --- a/.github/workflows/tools-protoc-gen-go-netconn.yaml +++ b/.github/workflows/tools-protoc-gen-go-netconn.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set go.mod variable @@ -48,7 +48,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: 1.22.0 + go-version: 1.22.3 cache: false - name: Set Go variables diff --git a/buildenvs/Makefile b/buildenvs/Makefile index 3194d259e..5d2497a3c 100644 --- a/buildenvs/Makefile +++ b/buildenvs/Makefile @@ -43,7 +43,7 @@ qemu: $(DOCKER_BUILD_EXTRA) $(WORKDIR) .PHONY: myself -myself: GO_VERSION ?= 1.22.0 +myself: GO_VERSION ?= 1.22.3 myself: ENVIRONMENT ?= myself myself: IMAGE ?= $(REGISTRY)/myself:$(IMAGE_TAG) myself: TARGET ?= kraftkit @@ -68,7 +68,7 @@ myself-full: .PHONY: base base: ENVIRONMENT ?= base -base: GO_VERSION ?= 1.22.0 +base: GO_VERSION ?= 1.22.3 base: IMAGE ?= $(REGISTRY)/base:$(IMAGE_TAG) base: KRAFTKIT_VERSION ?= latest base: QEMU_VERSION ?= 8.2.4 @@ -90,7 +90,7 @@ base: .PHONY: base-golang base-golang: ENVIRONMENT ?= base-golang -base-golang: GO_VERSION ?= 1.22.0 +base-golang: GO_VERSION ?= 1.22.3 base-golang: IMAGE ?= $(REGISTRY)/base-golang:$(IMAGE_TAG) base-golang: KRAFTKIT_VERSION ?= latest base-golang: QEMU_VERSION ?= 8.2.4 @@ -113,7 +113,7 @@ base-golang: .PHONY: github-action github-action: ENVIRONMENT ?= github-action -github-action: GO_VERSION ?= 1.22.0 +github-action: GO_VERSION ?= 1.22.3 github-action: IMAGE ?= $(REGISTRY)/github-action:$(IMAGE_TAG) github-action: KRAFTKIT_VERSION ?= latest ifeq ($(WITH_CACHE),y) diff --git a/buildenvs/base-golang.Dockerfile b/buildenvs/base-golang.Dockerfile index a32abaad0..5767ca687 100644 --- a/buildenvs/base-golang.Dockerfile +++ b/buildenvs/base-golang.Dockerfile @@ -3,7 +3,7 @@ # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file except in compliance with the License. ARG REGISTRY=kraftkit.sh -ARG GO_VERSION=1.22.0 +ARG GO_VERSION=1.22.3 FROM golang:${GO_VERSION}-bookworm AS golang FROM ${REGISTRY}/base:latest diff --git a/buildenvs/github-action.Dockerfile b/buildenvs/github-action.Dockerfile index 533174b24..8ae787ee3 100644 --- a/buildenvs/github-action.Dockerfile +++ b/buildenvs/github-action.Dockerfile @@ -2,7 +2,7 @@ # Copyright (c) 2022, Unikraft GmbH and The KraftKit Authors. # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file except in compliance with the License. -ARG GO_VERSION=1.22.0 +ARG GO_VERSION=1.22.3 ARG DEBIAN_VERSION=bookworm-20240513 ARG KRAFTKIT_VERSION=latest ARG QEMU_VERSION=8.2.4 diff --git a/buildenvs/myself.Dockerfile b/buildenvs/myself.Dockerfile index 7b46c5a87..f68142e00 100644 --- a/buildenvs/myself.Dockerfile +++ b/buildenvs/myself.Dockerfile @@ -3,7 +3,7 @@ # Licensed under the BSD-3-Clause License (the "License"). # You may not use this file except in compliance with the License. -ARG GO_VERSION=1.22.0 +ARG GO_VERSION=1.22.3 FROM golang:${GO_VERSION}-bookworm AS kraftkit-full @@ -34,7 +34,7 @@ RUN set -xe; \ WORKDIR /go/src/kraftkit.sh -COPY --from=ghcr.io/goreleaser/goreleaser-cross:v1.22.0 /usr/bin/goreleaser /usr/bin/ +COPY --from=ghcr.io/goreleaser/goreleaser-cross:v1.22.3 /usr/bin/goreleaser /usr/bin/ ENV DOCKER= ENV GOROOT=/usr/local/go From 3886eaea4cdbfb6793ebc548e762703408b947d3 Mon Sep 17 00:00:00 2001 From: Cezar Craciunoiu Date: Thu, 30 May 2024 14:05:23 +0300 Subject: [PATCH 4/5] feat(workflows): Deprecate 'ubuntu-20.04' and 'macos-11' Signed-off-by: Cezar Craciunoiu --- .github/workflows/tests-stable.yaml | 6 +++--- .github/workflows/tests.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests-stable.yaml b/.github/workflows/tests-stable.yaml index ac42af927..2666a37f3 100644 --- a/.github/workflows/tests-stable.yaml +++ b/.github/workflows/tests-stable.yaml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, ubuntu-20.04, macos-11, macos-12, mac-m2-14] + os: [ubuntu-24.04, ubuntu-22.04, macos-12, macos-13, macos-14, mac-m2-14] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -47,7 +47,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04, ubuntu-20.04] + os: [ubuntu-24.04, ubuntu-22.04] runs-on: ${{ matrix.os }} steps: @@ -98,7 +98,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04] + os: [ubuntu-24.04] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index dabaf5373..0cc8070db 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04] + os: [ubuntu-24.04] runs-on: ${{ matrix.os }} @@ -54,7 +54,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04] + os: [ubuntu-24.04] runs-on: ${{ matrix.os }} @@ -107,7 +107,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-22.04] + os: [ubuntu-24.04] runs-on: ${{ matrix.os }} From 86237753fc28d8e002428f2112f7868eb7bd9828 Mon Sep 17 00:00:00 2001 From: Cezar Craciunoiu Date: Thu, 30 May 2024 14:33:17 +0300 Subject: [PATCH 5/5] fix(buildenvs): Add new missing dependency to qemu Signed-off-by: Cezar Craciunoiu --- buildenvs/qemu.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/buildenvs/qemu.Dockerfile b/buildenvs/qemu.Dockerfile index ecba7211e..338aab414 100644 --- a/buildenvs/qemu.Dockerfile +++ b/buildenvs/qemu.Dockerfile @@ -26,6 +26,7 @@ RUN set -ex; \ bison \ build-essential \ curl \ + git \ flex \ libaio-dev \ libattr1-dev \