From 56473ae8b8666e27f294e97a5a651d47d75cea40 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Thu, 4 Apr 2024 23:12:17 -0400 Subject: [PATCH] fix(docker): fix arm64 builds (#2368) --- docker/fedora-38.dockerfile | 4 +--- docker/fedora-39.dockerfile | 4 +--- docker/ubuntu-24.04.dockerfile | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/docker/fedora-38.dockerfile b/docker/fedora-38.dockerfile index 50d9fd66acb..93a13b813b0 100644 --- a/docker/fedora-38.dockerfile +++ b/docker/fedora-38.dockerfile @@ -32,11 +32,9 @@ dnf -y group install "Development Tools" dnf -y install \ boost-devel-1.78.0* \ cmake-3.27.* \ - doxygen \ gcc-13.2.* \ gcc-c++-13.2.* \ git \ - graphviz \ libappindicator-gtk3-devel \ libcap-devel \ libcurl-devel \ @@ -60,7 +58,6 @@ dnf -y install \ openssl-devel \ opus-devel \ pulseaudio-libs-devel \ - python3.10 \ rpm-build \ wget \ which \ @@ -110,6 +107,7 @@ cmake \ -DBUILD_WERROR=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DTESTS_ENABLE_PYTHON_TESTS=OFF \ -DSUNSHINE_ASSETS_DIR=share/sunshine \ -DSUNSHINE_EXECUTABLE_PATH=/usr/bin/sunshine \ -DSUNSHINE_ENABLE_WAYLAND=ON \ diff --git a/docker/fedora-39.dockerfile b/docker/fedora-39.dockerfile index eff8194877a..56204cb7c9d 100644 --- a/docker/fedora-39.dockerfile +++ b/docker/fedora-39.dockerfile @@ -32,11 +32,9 @@ dnf -y group install "Development Tools" dnf -y install \ boost-devel-1.81.0* \ cmake-3.27.* \ - doxygen \ gcc-13.2.* \ gcc-c++-13.2.* \ git \ - graphviz \ libappindicator-gtk3-devel \ libcap-devel \ libcurl-devel \ @@ -60,7 +58,6 @@ dnf -y install \ openssl-devel \ opus-devel \ pulseaudio-libs-devel \ - python3.11 \ rpm-build \ wget \ which \ @@ -117,6 +114,7 @@ cmake \ -DBUILD_WERROR=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DTESTS_ENABLE_PYTHON_TESTS=OFF \ -DSUNSHINE_ASSETS_DIR=share/sunshine \ -DSUNSHINE_EXECUTABLE_PATH=/usr/bin/sunshine \ -DSUNSHINE_ENABLE_WAYLAND=ON \ diff --git a/docker/ubuntu-24.04.dockerfile b/docker/ubuntu-24.04.dockerfile index 4de34b8c65e..e053fdc4011 100644 --- a/docker/ubuntu-24.04.dockerfile +++ b/docker/ubuntu-24.04.dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.4 # artifacts: true -# platforms: linux/amd64,linux/arm64/v8 +# platforms: linux/amd64 # platforms_pr: linux/amd64 # no-cache-filters: sunshine-base,artifacts,sunshine ARG BASE=ubuntu