diff --git a/utils/dockerbuilds/CI/Dockerfile-base-steamrt b/utils/dockerbuilds/CI/Dockerfile-base-steamrt index d7ac8063c35..a060dfc154b 100644 --- a/utils/dockerbuilds/CI/Dockerfile-base-steamrt +++ b/utils/dockerbuilds/CI/Dockerfile-base-steamrt @@ -1,17 +1,11 @@ -FROM steamrt_scout_amd64 +FROM steamrt_sniper_amd64 ENV DEBIAN_FRONTEND=noninteractive ARG BOOST_VERSION=1.66.0 ARG BOOST_VERSION_=1_66_0 RUN apt-get update -RUN apt-get install -y scons libsdl2-dev libicu-dev libreadline-dev expect-dev +RUN apt-get install -y scons libreadline-dev expect-dev RUN wget --max-redirect 3 https://boostorg.jfrog.io/artifactory/main/release/$BOOST_VERSION/source/boost_$BOOST_VERSION_.tar.gz RUN mkdir -p /src/boost && tar zxf boost_${BOOST_VERSION_}.tar.gz -C /src/boost --strip-components=1 -RUN cd /src/boost && ./bootstrap.sh --with-libraries=iostreams,regex,system,filesystem,program_options,random,locale,context,coroutine && ./b2 toolset=gcc-9 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install - -RUN wget https://www.openssl.org/source/openssl-1.1.1l.tar.gz --no-check-certificate -RUN mkdir -p /src/openssl && tar zxf openssl-1.1.1l.tar.gz -C /src/openssl --strip-components=1 -RUN cd /src/openssl && ./config --prefix=/usr/local --openssldir=/etc/ssl && make && make install - -RUN mkdir -p /staging/lib64 && cp /usr/lib/libicu*.so.* /lib/x86_64-linux-gnu/libhistory.so.6 /usr/local/lib/libcrypto.so.1.1 /usr/local/lib/libssl.so.1.1 /staging/lib64/ +RUN cd /src/boost && ./bootstrap.sh --with-libraries=iostreams,regex,system,filesystem,program_options,random,locale,context,coroutine && ./b2 toolset=gcc-10 --layout=system link=static variant=release cxxflags='-fPIE -fstack-protector-strong' define=_FORTIFY_SOURCE=2 install diff --git a/utils/dockerbuilds/make_steam_image b/utils/dockerbuilds/make_steam_image index 93c5d7fda40..5ee8b1196a3 100755 --- a/utils/dockerbuilds/make_steam_image +++ b/utils/dockerbuilds/make_steam_image @@ -1,18 +1,18 @@ #!/bin/sh -xe -VALVEFILE=com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.Dockerfile -VALVETAR=com.valvesoftware.SteamRuntime.Sdk-amd64,i386-scout-sysroot.tar.gz -VALVE_SNAPSHOT=0.20220119.0 +VALVEFILE=com.valvesoftware.SteamRuntime.Sdk-amd64,i386-sniper-sysroot.Dockerfile +VALVETAR=com.valvesoftware.SteamRuntime.Sdk-amd64,i386-sniper-sysroot.tar.gz +VALVE_SNAPSHOT=0.20220601.1 -DOCKERBASEIMAGE=steamrt_scout_amd64 -DOCKERLOCALIMAGE=wesnoth/wesnoth:steamrt-master +DOCKERBASEIMAGE=steamrt_sniper_amd64 +DOCKERLOCALIMAGE=wesnoth/wesnoth:steamrt-sniper DOCKERLOCALFILE=./CI/Dockerfile-base-steamrt if [ ! -f "$VALVEFILE" ]; then - wget http://repo.steampowered.com/steamrt-images-scout/snapshots/"$VALVE_SNAPSHOT"/"$VALVEFILE" + wget https://repo.steampowered.com/steamrt-images-sniper/snapshots/"$VALVE_SNAPSHOT"/"$VALVEFILE" fi if [ ! -f "$VALVETAR" ]; then - wget http://repo.steampowered.com/steamrt-images-scout/snapshots/"$VALVE_SNAPSHOT"/"$VALVETAR" + wget https://repo.steampowered.com/steamrt-images-sniper/snapshots/"$VALVE_SNAPSHOT"/"$VALVETAR" fi docker build -t "$DOCKERBASEIMAGE" -f "$VALVEFILE" . diff --git a/utils/dockerbuilds/steamrt/Dockerfile b/utils/dockerbuilds/steamrt/Dockerfile index 02afea7dc71..1647cb2a478 100644 --- a/utils/dockerbuilds/steamrt/Dockerfile +++ b/utils/dockerbuilds/steamrt/Dockerfile @@ -1,6 +1,6 @@ -FROM wesnoth/wesnoth:steamrt-master +FROM wesnoth/wesnoth:steamrt-sniper ENV DEBIAN_FRONTEND=noninteractive COPY start.sh /staging/start.sh -ENTRYPOINT mkdir -p /build && cd /build && scons -j `nproc` ctool=gcc-9 cxxtool=g++-9 boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt -Y /wesnoth force_color=true && cp /build/wesnoth /output/ && cp /build/wesnothd /output/ && cp -r /staging/* /output/ +ENTRYPOINT mkdir -p /build && cd /build && scons -j `nproc` ctool=gcc-10 cxxtool=g++-10 boostdir=/usr/local/include boostlibdir=/usr/local/lib extra_flags_config=-lrt -Y /wesnoth && cp /build/wesnoth /output/ && cp /build/wesnothd /output/ && cp -r /staging/* /output/ diff --git a/utils/dockerbuilds/steamrt/start.sh b/utils/dockerbuilds/steamrt/start.sh index b5e1e67b634..5c915363a68 100755 --- a/utils/dockerbuilds/steamrt/start.sh +++ b/utils/dockerbuilds/steamrt/start.sh @@ -1,5 +1,4 @@ #!/bin/sh gamedir=${0%/*} cd "$gamedir" || exit -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gamedir/lib64" exec ./wesnoth --log-to-file "$@"