From 906870d36f2a8e6a0c297ee6232dd8307f749f3b Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sun, 19 Dec 2021 15:23:11 -0500 Subject: [PATCH] Back to single line install command -Testing, dockerfiles fail when packages split into multiple lines --- scripts/Dockerfile-fedora_33 | 15 ++------------- scripts/Dockerfile-fedora_35 | 20 ++------------------ 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/scripts/Dockerfile-fedora_33 b/scripts/Dockerfile-fedora_33 index af5a40be..4e2c04de 100644 --- a/scripts/Dockerfile-fedora_33 +++ b/scripts/Dockerfile-fedora_33 @@ -2,19 +2,8 @@ FROM fedora:33 AS sunshine-fedora_33 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ - dnf -y 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 \ - boost-devel \ - boost-static.x86_64 \ - cmake \ - ffmpeg-devel \ - libevdev-devel \ - libxcb-devel \ - libX11-devel \ - libXfixes-devel \ - libXtst-devel \ - openssl-devel \ - opus-devel \ - pulseaudio-libs-devel \ + dnf -y 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 -y install boost-devel boost-static.x86_64 cmake ffmpeg-devel libevdev-devel libxcb-devel libX11-devel libXfixes-devel libXtst-devel openssl-devel opus-devel pulseaudio-libs-devel \ && dnf clean all \ && rm -rf /var/cache/yum diff --git a/scripts/Dockerfile-fedora_35 b/scripts/Dockerfile-fedora_35 index 6596f561..cec2c960 100644 --- a/scripts/Dockerfile-fedora_35 +++ b/scripts/Dockerfile-fedora_35 @@ -2,24 +2,8 @@ FROM fedora:33 AS sunshine-fedora_33 RUN dnf -y update && \ dnf -y group install "Development Tools" && \ - dnf -y 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 \ - boost-devel \ - boost-static.x86_64 \ - cmake \ - ffmpeg-devel \ - libevdev-devel \ - libxcb-devel \ - libX11-devel \ - libXcursor-devel \ - libXfixes-devel \ - libXinerama-devel \ - libXi-devel \ - libXrandr-devel \ - libXtst-devel \ - mesa-libGL-devel \ - openssl-devel \ - opus-devel \ - pulseaudio-libs-devel \ + dnf -y 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 -y install boost-devel boost-static.x86_64 cmake ffmpeg-devel libevdev-devel libxcb-devel libX11-devel libXcursor-devel libXfixes-devel libXinerama-devel libXi-devel libXrandr-devel libXtst-devel mesa-libGL-devel openssl-devel opus-devel pulseaudio-libs-devel \ && dnf clean all \ && rm -rf /var/cache/yum