build: use fedora 38 containers for builds

jasonish · Aug 11, 2023 · 51eee2e · 51eee2e
1 parent 6c499fc
commit 51eee2e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build-dist.sh b/build-dist.sh
@@ -83,7 +83,7 @@ cross_run x86_64-unknown-linux-musl ./packaging/build-rpm.sh amd64
 
 cross_run x86_64-unknown-linux-musl ./packaging/build-deb.sh amd64
 cross_run aarch64-unknown-linux-musl ./packaging/build-deb.sh arm64
-cross_run aarch64-unknown-linux-musl ./packaging/build-deb.sh arm
+cross_run arm-unknown-linux-musleabihf ./packaging/build-deb.sh arm
 
 if [[ "${skip_windows}" != "yes" ]]; then
     cross_run x86_64-pc-windows-gnu make dist

diff --git a/docker/builder/Dockerfile.cross b/docker/builder/Dockerfile.cross
@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:38
 
 RUN dnf -y install \
         curl \
@@ -19,7 +19,7 @@ RUN dnf -y install \
         ruby-devel \
         rubygem-ffi \
         ruby-devel
-RUN gem install --no-document --bindir=/usr/local/bin fpm -v 1.14.0
+RUN gem install --no-document --bindir=/usr/local/bin fpm -v 1.15.1
 
 ARG REAL_UID=1000
 ARG REAL_GID=1000

diff --git a/docker/builder/Dockerfile.macos b/docker/builder/Dockerfile.macos
@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:38
 
 RUN dnf -y install \
     	make \