From a19458f703eefdd382dd61ed453f798d85236853 Mon Sep 17 00:00:00 2001 From: simonfelding <45149055+simonfelding@users.noreply.github.com> Date: Sat, 15 Feb 2025 17:07:15 +0100 Subject: [PATCH] fix builds by switching base layer to debian:sid-slim tested locally, works fine. debian has supported riscv64 in the sid image for some time. this is the same thing the carlosedp/golang image did. this also fixes the bug with the wrong glibc version, as the build container now uses the same glibc version as the final container. --- build/Dockerfile | 7 +++---- deb/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 1971c40..b2f01f4 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,15 +1,14 @@ -# Use carlosedp/golang for riscv64 support -FROM carlosedp/golang:1.18 AS build +FROM debian:sid-slim AS build # Install dependencies -RUN apt-get update && apt-get install -y git build-essential libsecret-1-dev +RUN apt-get update && apt-get install -y git golang build-essential libsecret-1-dev # Build WORKDIR /build/ COPY build.sh VERSION /build/ RUN bash build.sh -FROM ubuntu:jammy +FROM debian:sid-slim LABEL maintainer="Xiaonan Shen " EXPOSE 25/tcp diff --git a/deb/Dockerfile b/deb/Dockerfile index 8aa8bc7..ddebcac 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy +FROM debian:sid-slim LABEL maintainer="Xiaonan Shen " EXPOSE 25/tcp