diff --git a/docker/Dockerfile-base-1604-master b/docker/Dockerfile-base-1604-master index 9abb51c35cd4..d119e27a517d 100644 --- a/docker/Dockerfile-base-1604-master +++ b/docker/Dockerfile-base-1604-master @@ -11,7 +11,7 @@ RUN apt install -y -qq libboost-filesystem1.58-dev libboost-filesystem1.58.0 lib RUN apt install -y -qq libsdl2-2.0-0 libsdl2-dev libsdl2-image-2.0-0 libsdl2-image-dev libsdl2-mixer-2.0-0 libsdl2-mixer-dev libsdl2-ttf-2.0-0 libsdl2-ttf-dev libglew1.13 libglew-dev # misc -RUN apt install -y -qq libpng12-0 libpng12-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev +RUN apt install -y -qq libpng12-0 libpng12-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev libmysqlclient-dev # programs RUN apt install -y -qq openssl gdb xvfb bzip2 git scons cmake make ccache gcc g++ clang diff --git a/docker/Dockerfile-base-1804-master b/docker/Dockerfile-base-1804-master index 3a14d6acf34c..8b8581439dae 100644 --- a/docker/Dockerfile-base-1804-master +++ b/docker/Dockerfile-base-1804-master @@ -11,7 +11,7 @@ RUN apt install -y -qq libboost-filesystem1.65-dev libboost-filesystem1.65.1 lib RUN apt install -y -qq libsdl2-2.0-0 libsdl2-dev libsdl2-image-2.0-0 libsdl2-image-dev libsdl2-mixer-2.0-0 libsdl2-mixer-dev libglew2.0 libglew-dev # misc -RUN apt install -y -qq libpng16-16 libpng-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev +RUN apt install -y -qq libpng16-16 libpng-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev libmysqlclient-dev # programs RUN apt install -y -qq openssl gdb xvfb bzip2 git scons cmake make ccache gcc g++ clang diff --git a/utils/travis/docker_run.sh b/utils/travis/docker_run.sh index 5a0c6bc54378..86dc60a028ad 100755 --- a/utils/travis/docker_run.sh +++ b/utils/travis/docker_run.sh @@ -65,7 +65,7 @@ else echo "compiler_check = content" >> $HOME/.ccache/ccache.conf cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_GAME=true -DENABLE_SERVER=true -DENABLE_CAMPAIGN_SERVER=true -DENABLE_TESTS=true -DENABLE_NLS=false \ - -DEXTRA_FLAGS_CONFIG="-pipe" -DOPT="$OPT" -DENABLE_STRICT_COMPILATION="$STRICT" -DENABLE_LTO="$LTO" -DLTO_JOBS=2 \ + -DEXTRA_FLAGS_CONFIG="-pipe" -DOPT="$OPT" -DENABLE_STRICT_COMPILATION="$STRICT" -DENABLE_LTO="$LTO" -DLTO_JOBS=2 -DENABLE_MYSQL=true \ -DCXX_STD="$CXXSTD" -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache && \ make VERBOSE=1 -j2 BUILD_RET=$? @@ -75,7 +75,7 @@ else else scons wesnoth wesnothd campaignd boost_unit_tests build=release \ ctool=$CC cxxtool=$CXX cxx_std=$CXXSTD \ - extra_flags_config="-pipe" opt="$OPT" strict="$STRICT" \ + extra_flags_config="-pipe" opt="$OPT" strict="$STRICT" forum_user_handler=true \ nls=false enable_lto="$LTO" sanitize="$SAN" jobs=2 --debug=time BUILD_RET=$? fi