rebase to fedora 35

This commit is contained in:
thelamer 2022-02-12 22:39:21 -08:00
parent 5a1a6ac7e6
commit 8d42ec7ae8
3 changed files with 18 additions and 15 deletions

View File

@ -1,6 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-fedora:34 as buildstage
FROM ghcr.io/linuxserver/baseimage-fedora:35 as buildstage
ARG XRDP_PULSE_VERSION=v0.5
ARG XRDP_PULSE_VERSION=v0.6
RUN \
echo "**** install build deps ****" && \
@ -9,6 +9,7 @@ RUN \
dnf install -y \
'dnf-command(builddep)' \
'dnf-command(download)' \
libtool \
rpmdevtools \
wget \
yum-utils && \
@ -27,13 +28,13 @@ RUN \
pulseaudio*.src.rpm
RUN \
echo "**** run pulseaudio config ****" && \
echo "**** run pulseaudio meson build ****" && \
VERSION=$(ls -1 /root/rpmbuild/SOURCES/*.tar.xz | \
awk -F '(pulseaudio-|.tar.xz)' '/pulseaudio-/ {print $2; exit}') && \
cd ~/rpmbuild/SOURCES/ && \
tar -xf pulseaudio-${VERSION}.tar.xz && \
cd pulseaudio-${VERSION} && \
./configure
meson build
RUN \
echo "**** build pulseaudio xrdp module ****" && \
@ -56,7 +57,7 @@ RUN \
FROM ghcr.io/linuxserver/docker-compose:amd64-latest as compose
# runtime stage
FROM ghcr.io/linuxserver/baseimage-fedora:34
FROM ghcr.io/linuxserver/baseimage-fedora:35
# set version label
ARG BUILD_DATE

View File

@ -1,6 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-34 as buildstage
FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-35 as buildstage
ARG XRDP_PULSE_VERSION=v0.5
ARG XRDP_PULSE_VERSION=v0.6
RUN \
echo "**** install build deps ****" && \
@ -9,6 +9,7 @@ RUN \
dnf install -y \
'dnf-command(builddep)' \
'dnf-command(download)' \
libtool \
rpmdevtools \
wget \
yum-utils && \
@ -27,13 +28,13 @@ RUN \
pulseaudio*.src.rpm
RUN \
echo "**** run pulseaudio config ****" && \
echo "**** run pulseaudio meson build ****" && \
VERSION=$(ls -1 /root/rpmbuild/SOURCES/*.tar.xz | \
awk -F '(pulseaudio-|.tar.xz)' '/pulseaudio-/ {print $2; exit}') && \
cd ~/rpmbuild/SOURCES/ && \
tar -xf pulseaudio-${VERSION}.tar.xz && \
cd pulseaudio-${VERSION} && \
./configure
meson build
RUN \
echo "**** build pulseaudio xrdp module ****" && \
@ -56,7 +57,7 @@ RUN \
FROM ghcr.io/linuxserver/docker-compose:arm64v8-latest as compose
# runtime stage
FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-34
FROM ghcr.io/linuxserver/baseimage-fedora:arm64v8-35
# set version label
ARG BUILD_DATE

View File

@ -1,6 +1,6 @@
FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-34 as buildstage
FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-35 as buildstage
ARG XRDP_PULSE_VERSION=v0.5
ARG XRDP_PULSE_VERSION=v0.6
RUN \
echo "**** install build deps ****" && \
@ -9,6 +9,7 @@ RUN \
dnf install -y \
'dnf-command(builddep)' \
'dnf-command(download)' \
libtool \
rpmdevtools \
wget \
yum-utils && \
@ -27,13 +28,13 @@ RUN \
pulseaudio*.src.rpm
RUN \
echo "**** run pulseaudio config ****" && \
echo "**** run pulseaudio meson build ****" && \
VERSION=$(ls -1 /root/rpmbuild/SOURCES/*.tar.xz | \
awk -F '(pulseaudio-|.tar.xz)' '/pulseaudio-/ {print $2; exit}') && \
cd ~/rpmbuild/SOURCES/ && \
tar -xf pulseaudio-${VERSION}.tar.xz && \
cd pulseaudio-${VERSION} && \
./configure
meson build
RUN \
echo "**** build pulseaudio xrdp module ****" && \
@ -56,7 +57,7 @@ RUN \
FROM ghcr.io/linuxserver/docker-compose:arm32v7-latest as compose
# runtime stage
FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-34
FROM ghcr.io/linuxserver/baseimage-fedora:arm32v7-35
# set version label
ARG BUILD_DATE