From 23e64f23a84d1518f3bc892de75f6321e2314297 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 10:40:11 -0500 Subject: [PATCH] Add additional distros --- .../workflows/pull-requests_build-check.yml | 9 +++------ appveyor.yml | 4 ++-- scripts/Dockerfile-Fedora_33 | 13 +++++++++++++ scripts/Dockerfile-Fedora_35 | 14 ++++++++++++++ ...Dockerfile-2004 => Dockerfile-Ubuntu_18_04} | 2 +- scripts/Dockerfile-Ubuntu_20_04 | 18 ++++++++++++++++++ ...Dockerfile-2104 => Dockerfile-Ubuntu_21_04} | 2 +- scripts/Dockerfile-Ubuntu_21_10 | 13 +++++++++++++ 8 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 scripts/Dockerfile-Fedora_33 create mode 100644 scripts/Dockerfile-Fedora_35 rename scripts/{Dockerfile-2004 => Dockerfile-Ubuntu_18_04} (95%) create mode 100644 scripts/Dockerfile-Ubuntu_20_04 rename scripts/{Dockerfile-2104 => Dockerfile-Ubuntu_21_04} (92%) create mode 100644 scripts/Dockerfile-Ubuntu_21_10 diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index 4e870034..3eb511ac 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -89,8 +89,9 @@ jobs: name: deb runs-on: ubuntu-20.04 strategy: + fail-fast: false matrix: - distro: [ 2004, 2104, debian ] + distro: [ debian, Fedora_33, Fedora_35, Ubuntu_18_04, Ubuntu_20_04, Ubuntu_21_04, Ubuntu_21_10 ] steps: - name: Checkout @@ -154,13 +155,9 @@ jobs: mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin set BOOST_ROOT=C:\boost - dir C:\boost\boost - echo ----------- set BOOST_INCLUDEDIR=C:\boost set BOOST_LIBRARYDIR=C:\boost\lib - dir C:\boost\boost\lib - echo ----------- - cmake -DBoost_USE_STATIC_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. mingw32-make -j2 - name: Package Windows run: | diff --git a/appveyor.yml b/appveyor.yml index 7a418aaa..40d6b807 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,9 @@ services: environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - DOCKERFILE: Dockerfile-2004 + DOCKERFILE: Dockerfile-Ubuntu_20_04 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 - DOCKERFILE: Dockerfile-2104 + DOCKERFILE: Dockerfile-Ubuntu_21_04 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004 DOCKERFILE: Dockerfile-debian - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 diff --git a/scripts/Dockerfile-Fedora_33 b/scripts/Dockerfile-Fedora_33 new file mode 100644 index 00000000..48507f64 --- /dev/null +++ b/scripts/Dockerfile-Fedora_33 @@ -0,0 +1,13 @@ +FROM fedora:33 AS sunshine-fedora_33 + +ARG DEBIAN_FRONTEND=noninteractive +ARG TZ="Europe/London" + +RUN dnf group install "Development Tools" \ + dnf install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm \ + dnf install -y openssl-devel ffmpeg-devel boost-devel boost-static.x86_64 pulseaudio-libs-devel opus-devel libXtst-devel libX11-devel libXfixes-devel libevdev-devel libxcb-devel cmake + +COPY build-private.sh /root/build.sh + + +ENTRYPOINT ["/root/build.sh"] diff --git a/scripts/Dockerfile-Fedora_35 b/scripts/Dockerfile-Fedora_35 new file mode 100644 index 00000000..c311cd65 --- /dev/null +++ b/scripts/Dockerfile-Fedora_35 @@ -0,0 +1,14 @@ +FROM fedora:33 AS sunshine-fedora_33 + +ARG DEBIAN_FRONTEND=noninteractive +ARG TZ="Europe/London" + +RUN dnf group install "Development Tools" \ + dnf install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm \ + dnf install -y openssl-devel ffmpeg-devel boost-devel boost-static.x86_64 pulseaudio-libs-devel opus-devel libXtst-devel libX11-devel libXfixes-devel libevdev-devel libxcb-devel cmake \ + dnf install libXcursor-devel libXrandr-devel libXinerama-devel libXi-devel mesa-libGL-devel + +COPY build-private.sh /root/build.sh + + +ENTRYPOINT ["/root/build.sh"] diff --git a/scripts/Dockerfile-2004 b/scripts/Dockerfile-Ubuntu_18_04 similarity index 95% rename from scripts/Dockerfile-2004 rename to scripts/Dockerfile-Ubuntu_18_04 index fe4dc326..b3d44bbe 100644 --- a/scripts/Dockerfile-2004 +++ b/scripts/Dockerfile-Ubuntu_18_04 @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 AS sunshine-2004 +FROM ubuntu:18.04 AS sunshine-ubuntu_18_04 ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" diff --git a/scripts/Dockerfile-Ubuntu_20_04 b/scripts/Dockerfile-Ubuntu_20_04 new file mode 100644 index 00000000..ea69f455 --- /dev/null +++ b/scripts/Dockerfile-Ubuntu_20_04 @@ -0,0 +1,18 @@ +FROM ubuntu:20.04 AS sunshine-ubuntu_20_04 + +ARG DEBIAN_FRONTEND=noninteractive +ARG TZ="Europe/London" + +RUN apt-get update -y && \ + apt-get install -y \ + git wget gcc-10 g++-10 build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libdrm-dev libcap-dev libwayland-dev + +RUN cp /usr/bin/gcc-10 /usr/bin/gcc && cp /usr/bin/g++-10 /usr/bin/gcc-10 + +RUN wget https://developer.download.nvidia.com/compute/cuda/11.4.2/local_installers/cuda_11.4.2_470.57.02_linux.run --progress=bar:force:noscroll -q --show-progress -O /root/cuda.run && chmod a+x /root/cuda.run +RUN /root/cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-man-page --no-drm && rm /root/cuda.run + +COPY build-private.sh /root/build.sh + + +ENTRYPOINT ["/root/build.sh"] diff --git a/scripts/Dockerfile-2104 b/scripts/Dockerfile-Ubuntu_21_04 similarity index 92% rename from scripts/Dockerfile-2104 rename to scripts/Dockerfile-Ubuntu_21_04 index b8174a36..83c17483 100644 --- a/scripts/Dockerfile-2104 +++ b/scripts/Dockerfile-Ubuntu_21_04 @@ -1,4 +1,4 @@ -FROM ubuntu:21.04 AS sunshine-2104 +FROM ubuntu:21.04 AS sunshine-ubuntu_21_04 ARG DEBIAN_FRONTEND=noninteractive ARG TZ="Europe/London" diff --git a/scripts/Dockerfile-Ubuntu_21_10 b/scripts/Dockerfile-Ubuntu_21_10 new file mode 100644 index 00000000..a7f65f3b --- /dev/null +++ b/scripts/Dockerfile-Ubuntu_21_10 @@ -0,0 +1,13 @@ +FROM ubuntu:21.10 AS sunshine-ubuntu_21_10 + +ARG DEBIAN_FRONTEND=noninteractive +ARG TZ="Europe/London" + +RUN apt-get update -y && \ + apt-get install -y \ + git build-essential cmake libssl-dev libavdevice-dev libboost-thread-dev libboost-filesystem-dev libboost-log-dev libpulse-dev libopus-dev libxtst-dev libx11-dev libxrandr-dev libxfixes-dev libevdev-dev libxcb1-dev libxcb-shm0-dev libxcb-xfixes0-dev libdrm-dev libcap-dev libwayland-dev nvidia-cuda-dev nvidia-cuda-toolkit + +COPY build-private.sh /root/build.sh + + +ENTRYPOINT ["/root/build.sh"]