From b1030b6601b7b7de45f9cd40b00b97272f29c3c9 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Tue, 11 Jan 2022 01:13:29 -0500 Subject: [PATCH] Move gen-deb to Dockerfiles --- scripts/Dockerfile-debian | 2 ++ scripts/Dockerfile-ubuntu_18_04 | 2 ++ scripts/Dockerfile-ubuntu_20_04 | 2 ++ scripts/Dockerfile-ubuntu_21_04 | 2 ++ scripts/Dockerfile-ubuntu_21_10 | 2 ++ scripts/build-private.sh | 2 -- 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/Dockerfile-debian b/scripts/Dockerfile-debian index 15f0d656..1ed73c5f 100644 --- a/scripts/Dockerfile-debian +++ b/scripts/Dockerfile-debian @@ -37,3 +37,5 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] + +ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_18_04 b/scripts/Dockerfile-ubuntu_18_04 index 5ee33ae3..dad4c96b 100644 --- a/scripts/Dockerfile-ubuntu_18_04 +++ b/scripts/Dockerfile-ubuntu_18_04 @@ -56,3 +56,5 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] + +ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_20_04 b/scripts/Dockerfile-ubuntu_20_04 index 5a633a10..689c820c 100644 --- a/scripts/Dockerfile-ubuntu_20_04 +++ b/scripts/Dockerfile-ubuntu_20_04 @@ -40,3 +40,5 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] + +ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_21_04 b/scripts/Dockerfile-ubuntu_21_04 index d5668df4..4beedac6 100644 --- a/scripts/Dockerfile-ubuntu_21_04 +++ b/scripts/Dockerfile-ubuntu_21_04 @@ -35,3 +35,5 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] + +ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/Dockerfile-ubuntu_21_10 b/scripts/Dockerfile-ubuntu_21_10 index 14770625..113d4f70 100644 --- a/scripts/Dockerfile-ubuntu_21_10 +++ b/scripts/Dockerfile-ubuntu_21_10 @@ -35,3 +35,5 @@ COPY build-private.sh /root/build.sh ENTRYPOINT ["/root/build.sh"] + +ENTRYPOINT ["/root/sunshine-build/gen-deb"] diff --git a/scripts/build-private.sh b/scripts/build-private.sh index ade64829..283aeffe 100755 --- a/scripts/build-private.sh +++ b/scripts/build-private.sh @@ -31,5 +31,3 @@ cd /root/sunshine-build cmake "-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE" "-DSUNSHINE_EXECUTABLE_PATH=$SUNSHINE_EXECUTABLE_PATH" "-DSUNSHINE_ASSETS_DIR=$SUNSHINE_ASSETS_DIR" "-DSUNSHINE_ENABLE_WAYLAND=$SUNSHINE_ENABLE_WAYLAND" "-DSUNSHINE_ENABLE_X11=$SUNSHINE_ENABLE_X11" "-DSUNSHINE_ENABLE_DRM=$SUNSHINE_ENABLE_DRM" "-DSUNSHINE_ENABLE_CUDA=$SUNSHINE_ENABLE_CUDA" "$SUNSHINE_ROOT" make -j ${nproc} - -./gen-deb