feat: set base image to 24.04 lts (#4)

Author: troian

.env

@@ -1,5 +1,5 @@
 GIT_CHGLOG_VERSION=v0.15.0
 OSXCROSS_VERSION=v12.0.0
 DEBIAN_FRONTEND=noninteractive
-DPKG_ARCH="amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x"
-CROSSBUILD_ARCH="amd64 arm64 armel armhf mipsel ppc64el s390x"
+DPKG_ARCH="amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x riscv64"
+CROSSBUILD_ARCH="amd64 arm64 armel armhf i386 mipsel ppc64el s390x riscv64"

.github/workflows/release.yaml

@@ -1,3 +1,4 @@
+---
 name: release
 on:
   push:
@@ -9,30 +10,30 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
       - run: git fetch --prune --unshallow
       - name: Setup env
         uses: c-py/action-dotenv-to-setenv@v3
         with:
           env-file: .env
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Install cosign
         uses: sigstore/cosign-installer@main
       - uses: actions/setup-go@v3
         with:
           go-version: "${{ env.GO_VERSION }}"
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/goreleaser/goreleaser-cross-toolchains
           tags: |

Dockerfile

@@ -1,17 +1,22 @@
 ARG DEBIAN_FRONTEND=noninteractive
 ARG APT_MIRROR
-ARG OSXCROSS_VERSION
+ARG OSXCROSS_VERSION="v12.0.0"
 
 FROM ghcr.io/goreleaser/goreleaser-osxcross:$OSXCROSS_VERSION AS osxcross
 
-FROM debian:bullseye AS base
+FROM ubuntu:noble AS base
+
+ARG TARGETARCH
+COPY ubuntu.sources /etc/apt/sources.list.d/ubuntu.sources
 
 ARG TARGETARCH
 ARG DPKG_ARCH
 ARG CROSSBUILD_ARCH
-ARG OSXCROSS_PATH=/osxcross
+ARG OSX_CROSS_PATH=/usr/local/osxcross
 ARG MINGW_VERSION=20230130
-ARG MINGW_HOST="ubuntu-18.04"
+ARG MINGW_HOST="ubuntu-22.04"
+
+ENV DEBIAN_FRONTEND="noninteractive"
 
 LABEL maintainer="Artur Troian <troian dot ap at gmail dot com>"
 LABEL "org.opencontainers.image.source"="https://github.com/goreleaser/goreleaser-cross-toolchains"
@@ -32,7 +37,7 @@ RUN \
         autoconf \
         automake \
         bc \
-        python \
+        python3 \
         jq \
         binfmt-support \
         binutils-multiarch \
@@ -54,7 +59,7 @@ RUN \
         libarchive-tools \
         gdb \
         mingw-w64 \
-        ${crossbuild_pkgs}\
+        ${crossbuild_pkgs} \
  && apt -y autoremove \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* \
@@ -63,9 +68,10 @@ RUN \
  && rm -rf /usr/share/man/* \
     /usr/share/doc \
  && MINGW_ARCH=$(echo -n $TARGETARCH | sed -e 's/arm64/aarch64/g' | sed -e 's/amd64/x86_64/g') \
+ && cd /usr/local \
  && wget -qO - "https://github.com/mstorsjo/llvm-mingw/releases/download/${MINGW_VERSION}/llvm-mingw-${MINGW_VERSION}-ucrt-${MINGW_HOST}-${MINGW_ARCH}.tar.xz" | bsdtar -xf - \
  && ln -snf $(pwd)/llvm-mingw-${MINGW_VERSION}-ucrt-${MINGW_HOST}-${MINGW_ARCH} /llvm-mingw
 
-COPY --from=osxcross "${OSXCROSS_PATH}" "${OSXCROSS_PATH}"
+COPY --from=osxcross "${OSX_CROSS_PATH}" "${OSX_CROSS_PATH}"
 
-ENV PATH=${OSX_CROSS_PATH}/bin:$PATH
+ENV PATH=$PATH:"$OSX_CROSS_PATH/bin"

Makefile

@@ -1,35 +1,38 @@
 include .env
 
-REGISTRY           ?= ghcr.io
+REGISTRIES         ?= ghcr.io \
+docker.io
+
+SUBIMAGES          ?= arm64 \
+amd64
+
+TOOLS              := ./scripts/tools.sh
+
 TAG_VERSION        ?= $(shell git describe --tags --abbrev=0)
-IMAGE_NAME         := goreleaser/goreleaser-cross-toolchains:$(TAG_VERSION)
 
-ifneq ($(REGISTRY),)
-	IMAGE_NAME     := $(REGISTRY)/$(IMAGE_NAME)
-endif
+IMAGE_NAMES        := $(shell $(TOOLS) generate tags cross-toolchains $(TAG_VERSION) "$(REGISTRIES)")
 
 DOCKER_BUILD=docker build
 
-SUBIMAGES ?= amd64 \
-arm64
+SUBIMAGES ?= arm64 \
+amd64
 
 .PHONY: gen-changelog
 gen-changelog:
 	@echo "generating changelog to changelog"
 	./scripts/genchangelog.sh $(shell git describe --tags --abbrev=0) changelog.md
 
-.PHONY: toolchain-%
-toolchain-%:
-	@echo "building $(IMAGE_NAME)-$(@:toolchain-%=%)"
-	$(DOCKER_BUILD) --platform=linux/$(@:toolchain-%=%) -t $(IMAGE_NAME)-$(@:toolchain-%=%) \
+.PHONY: toolchains-%
+toolchains-%:
+	$(DOCKER_BUILD) --platform=linux/$* $(foreach IMAGE,$(IMAGE_NAMES), -t $(IMAGE)-$*) \
 		--build-arg DPKG_ARCH=$(DPKG_ARCH) \
 		--build-arg CROSSBUILD_ARCH=$(CROSSBUILD_ARCH) \
 		--build-arg OSXCROSS_VERSION="$(OSXCROSS_VERSION)" \
 		--build-arg DEBIAN_FRONTEND=$(DEBIAN_FRONTEND) \
 		-f Dockerfile .
 
 .PHONY: toolchains
-toolchains: $(patsubst %, toolchain-%,$(SUBIMAGES))
+toolchains: $(patsubst %, toolchains-%,$(SUBIMAGES))
 
 .PHONY: docker-push-%
 docker-push-%:
@@ -41,7 +44,9 @@ docker-push: $(patsubst %, docker-push-%,$(SUBIMAGES))
 .PHONY: manifest-create
 manifest-create:
 	@echo "creating manifest $(IMAGE_NAME)"
-	docker manifest create $(IMAGE_NAME) $(foreach arch,$(SUBIMAGES), --amend $(IMAGE_NAME)-$(arch))
+	docker manifest rm $(IMAGE_NAME) 2>/dev/null || true
+	docker manifest create $(IMAGE_NAME) \
+		$(foreach arch,$(SUBIMAGES), $(shell docker inspect $(IMAGE_NAME)-$(arch) | jq -r '.[].RepoDigests | .[0]'))
 
 .PHONY: manifest-push
 manifest-push:
@@ -55,3 +60,7 @@ tags:
 .PHONY: tag
 tag:
 	@echo $(TAG_VERSION)
+
+.PHONY: release
+release: toolchains docker-push manifest-create manifest-push
+