Skip to content

Commit

Permalink
docker: enable ubuntu-18.04 image
Browse files Browse the repository at this point in the history
  • Loading branch information
ReenigneArcher committed Feb 20, 2023
1 parent 5a03497 commit c9797f8
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog

## [0.18.4] - 2023-02-16
### Added
- (Linux) Added Ubuntu 18.04 deb package
- (Docker) Added Ubuntu 18.04 docker image
### Fixed
- (Linux/AUR) Drop support of AUR package
- (Docker) General enhancements to docker images
Expand Down
1 change: 1 addition & 0 deletions DOCKER_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,6 @@ The architectures supported by these images are shown in the table below.
| debian-bullseye | ✅ | ✅ |
| fedora-36 | ✅ | ✅ |
| fedora-37 | ✅ | ✅ |
| ubuntu-18.04 | ✅ | ✅ |
| ubuntu-20.04 | ✅ | ✅ |
| ubuntu-22.04 | ✅ | ✅ |
2 changes: 1 addition & 1 deletion docker/archlinux.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# artifacts: true
# platforms: linux/amd64
# archlinux does not have an arm64 base image
# no-cache-filters: sunshine-base,artifacts,uploader,sunshine
# no-cache-filters: sunshine-base,artifacts,sunshine
ARG BASE=archlinux
ARG TAG=base-devel
FROM ${BASE}:${TAG} AS sunshine-base
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,16 @@ RUN <<_DEPS
set -e
apt-get update -y
apt-get install -y --no-install-recommends \
software-properties-common=0.96.24.32.18
software-properties-common=0.96.24.32.*
add-apt-repository ppa:ubuntu-toolchain-r/test
apt-get install -y --no-install-recommends \
autoconf=2.69* \
automake=1:1.15.1* \
autotools-dev=20180224* \
bison=2:3.0.4* \
build-essential=12.4* \
gcc-10=10.3.0* \
git=1:2.17.1* \
g++-10=10.3.0* \
libavdevice-dev=7:3.4.* \
libcap-dev=1:2.25* \
Expand All @@ -37,6 +41,7 @@ apt-get install -y --no-install-recommends \
libopus-dev=1.1.2* \
libpulse-dev=1:11.1* \
libssl1.0-dev=1.0.2* \
libtool=2.4.6* \
libva-dev=2.1.0* \
libvdpau-dev=1.1.1* \
libwayland-dev=1.16.0* \
Expand Down Expand Up @@ -77,14 +82,17 @@ _GCC_ALIAS
# libboost-regex1.71-dev=1.71.0* \
# libboost-thread1.71-dev=1.71.0* \
WORKDIR /build/tmp
RUN <<_INSTALL_BOOST
RUN <<_GET_BOOST
url="https://boostorg.jfrog.io/artifactory/main/release/1.74.0/source/boost_1_74_0.tar.bz2"
wget "${url}" --progress=bar:force:noscroll -q --show-progress -O ./boost.tar.bz2
tar --bzip2 -xf boost.tar.bz2 --directory /build
mv /build/boost_*/ /build/boost
ls -a /build/boost
cd /build/boost
./bootstrap.sh --with-libraries=system,thread,log,program_options && \
_GET_BOOST

WORKDIR /build/boost
RUN <<_INSTALL_BOOST
./bootstrap.sh --with-libraries=system,thread,log,program_options
./b2 install variant=release link=static,shared runtime-link=shared -j "$(nproc)"
_INSTALL_BOOST

Expand Down Expand Up @@ -132,8 +140,68 @@ chmod a+x ./cuda.run
rm ./cuda.run
_INSTALL_CUDA

# todo - install libmfx
# install libva from source, because the version in the ubuntu repository is too old
# https://github.com/intel/media-driver/wiki/Build-LibVa-and-LibVa-utils-from-source-code
# libva is required for libmfx
WORKDIR /build
# hadolint ignore=SC3010
RUN <<_GET_LIBVA
#!/bin/bash
set -e
if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then
git clone https://github.com/intel/libva.git
fi
_GET_LIBVA

WORKDIR /build/libva
# hadolint ignore=SC3010
RUN <<_INSTALL_LIBVA
#!/bin/bash
set -e
if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then
./autogen.sh --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu
make -j "$(nproc)"
make install
fi
_INSTALL_LIBVA

# install libmfx
# https://github.com/Intel-Media-SDK/MediaSDK
WORKDIR /build
# hadolint ignore=SC3010
RUN <<_GET_LIBMFX
#!/bin/bash
set -e
if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then
git clone https://github.com/Intel-Media-SDK/MediaSDK msdk
fi
_GET_LIBMFX

WORKDIR /build/msdk/build
# hadolint ignore=SC3010
RUN <<_INSTALL_LIBMFX
#!/bin/bash
set -e
if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then
cmake \
-DENABLE_OPENCL=ON \
-DENABLE_X11_DRI3=ON \
-DENABLE_WAYLAND=ON \
-DENABLE_ITT=OFF \
-DENABLE_TEXTLOG=OFF \
-DENABLE_STAT=OFF \
-DBUILD_ALL=OFF \
-DBUILD_RUNTIME=ON \
-DBUILD_SAMPLES=OFF \
-DBUILD_TESTS=OFF \
-DBUILD_TOOLS=OFF \
-DUSE_SYSTEM_GTEST=OFF \
-DMFX_ENABLE_KERNELS=ON \
..
make -j "$(nproc)"
make install
fi
_INSTALL_LIBMFX

# copy repository
WORKDIR /build/sunshine/
Expand Down
1 change: 1 addition & 0 deletions docs/source/about/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ CUDA is used for NVFBC capture.
sunshine-debian-bullseye-{arch}.deb 11.8.0 450.80.02 50;52;60;61;62;70;75;80;86;90;35
sunshine-fedora-36-{arch}.rpm 12.0.0 525.60.13 50;52;60;61;62;70;75;80;86;90
sunshine-fedora-37-{arch}.rpm 12.0.0 525.60.13 50;52;60;61;62;70;75;80;86;90
sunshine-ubuntu-18.04-{arch}.deb 11.8.0 450.80.02 50;52;60;61;62;70;75;80;86;90;35
sunshine-ubuntu-20.04-{arch}.deb 11.8.0 450.80.02 50;52;60;61;62;70;75;80;86;90;35
sunshine-ubuntu-22.04-{arch}.deb 11.8.0 450.80.02 50;52;60;61;62;70;75;80;86;90;35
=========================================== ============== ============== ================================
Expand Down

0 comments on commit c9797f8

Please sign in to comment.