From 1d4c70f8e5af2878f9e88877a8d15eb3af849de4 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Thu, 3 Feb 2022 10:04:24 +0800 Subject: [PATCH] Separate GCC 8 environment --- tool/quick_start/docker/README.md | 6 ++-- .../ryzombuild_bionic_gcc8_x86_64/Dockerfile | 34 +++++++++++++++++++ .../ryzombuild_bionic_x86_64/Dockerfile | 3 -- 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 tool/quick_start/docker/ryzombuild_bionic_gcc8_x86_64/Dockerfile diff --git a/tool/quick_start/docker/README.md b/tool/quick_start/docker/README.md index bb1340a09..491913d42 100644 --- a/tool/quick_start/docker/README.md +++ b/tool/quick_start/docker/README.md @@ -12,6 +12,7 @@ Just build the Docker images like this. The quick start scripts will generate th ``` docker build -t "ryzombuild_bionic_x86_64" -f "Y:\ryzomcore4\code\tool\quick_start\docker\ryzombuild_bionic_x86_64\Dockerfile" Y:\ryzomcore4\code +docker build -t "ryzombuild_bionic_gcc8_x86_64" -f "Y:\ryzomcore4\code\tool\quick_start\docker\ryzombuild_bionic_gcc8_x86_64\Dockerfile" Y:\ryzomcore4\code docker build -t "ryzombuild_focal_x86_64" -f "Y:\ryzomcore4\code\tool\quick_start\docker\ryzombuild_focal_x86_64\Dockerfile" Y:\ryzomcore4\code docker build -t "ryzombuild_scout_x86_64" -f "Y:\ryzomcore4\code\tool\quick_start\docker\ryzombuild_scout_x86_64\Dockerfile" Y:\ryzomcore4\code docker build -t "ryzombuild_scout_gcc5_x86_64" -f "Y:\ryzomcore4\code\tool\quick_start\docker\ryzombuild_scout_gcc5_x86_64\Dockerfile" Y:\ryzomcore4\code @@ -50,6 +51,7 @@ docker run --rm steamrt_scout_amd64 cmake --version ``` docker run --rm ryzombuild_bionic_x86_64 gcc -v +docker run --rm ryzombuild_bionic_gcc8_x86_64 gcc -v docker run --rm ryzombuild_focal_x86_64 gcc -v docker run --rm ryzombuild_scout_x86_64 gcc -v docker run --rm ryzombuild_scout_gcc5_x86_64 gcc -v @@ -61,12 +63,12 @@ docker run --rm ryzombuild_scout_gcc9_x86_64 c++ -v ## Build Client ``` -docker run --rm -v ryzombuild_focal_x86_64_hunter:/root/.hunter --mount "type=bind,source=Y:\ryzomcore4,target=/mnt/nel" --workdir "/mnt/nel/build_client_focal" ryzombuild_focal_x86_64 cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DHUNTER_ENABLED=ON -DHUNTER_STATUS_DEBUG=ON -DHUNTER_JOBS_NUMBER=9 -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_PATCH=ON -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NELNS=OFF -DWITH_QT5=OFF -DWITH_LIBGSF=OFF -DFINAL_VERSION=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON ../code +docker run --rm -v ryzombuild_focal_x86_64_hunter:/root/.hunter --mount "type=bind,source=Y:\ryzomcore4,target=/mnt/nel" --workdir "/mnt/nel/build_client_focal" ryzombuild_focal_x86_64 cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DHUNTER_ENABLED=ON -DHUNTER_STATUS_DEBUG=ON -DHUNTER_JOBS_NUMBER=9 -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_PATCH=ON -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NELNS=OFF -DWITH_QT5=OFF -DWITH_LIBGSF=OFF -DFINAL_VERSION=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_SSE3=OFF ../code docker run --rm -v ryzombuild_focal_x86_64_hunter:/root/.hunter --mount "type=bind,source=Y:\ryzomcore4,target=/mnt/nel" --workdir "/mnt/nel/build_client_focal" ryzombuild_focal_x86_64 ninja -j9 ``` ``` -docker run --rm -v ryzombuild_bionic_x86_64_hunter:/root/.hunter --mount "type=bind,source=Y:\ryzomcore4,target=/mnt/nel" --workdir "/mnt/nel/build_client_bionic" ryzombuild_bionic_x86_64 cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DHUNTER_ENABLED=ON -DHUNTER_STATUS_DEBUG=ON -DHUNTER_JOBS_NUMBER=9 -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_PATCH=ON -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NELNS=OFF -DWITH_QT5=OFF -DWITH_LIBGSF=OFF -DFINAL_VERSION=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON ../code +docker run --rm -v ryzombuild_bionic_x86_64_hunter:/root/.hunter --mount "type=bind,source=Y:\ryzomcore4,target=/mnt/nel" --workdir "/mnt/nel/build_client_bionic" ryzombuild_bionic_x86_64 cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_PATCH=ON -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NELNS=OFF -DWITH_QT5=OFF -DWITH_LIBGSF=OFF -DFINAL_VERSION=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_SSE3=OFF -DWITH_STATIC=ON -DWITH_STATIC_DRIVERS=ON ../code docker run --rm -v ryzombuild_bionic_x86_64_hunter:/root/.hunter --mount "type=bind,source=Y:\ryzomcore4,target=/mnt/nel" --workdir "/mnt/nel/build_client_bionic" ryzombuild_bionic_x86_64 ninja -j9 ``` diff --git a/tool/quick_start/docker/ryzombuild_bionic_gcc8_x86_64/Dockerfile b/tool/quick_start/docker/ryzombuild_bionic_gcc8_x86_64/Dockerfile new file mode 100644 index 000000000..06d5ff4c2 --- /dev/null +++ b/tool/quick_start/docker/ryzombuild_bionic_gcc8_x86_64/Dockerfile @@ -0,0 +1,34 @@ +FROM --platform=linux/amd64 ubuntu:bionic +MAINTAINER Ryzom Core + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + software-properties-common \ + ninja-build curl wget build-essential \ + bison autoconf automake \ + libpng-dev \ + libjpeg-dev \ + libgif-dev libfreetype6-dev \ + freeglut3-dev \ + liblua5.2-dev libluabind-dev libcpptest-dev \ + libogg-dev libvorbis-dev libopenal-dev \ + libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libpostproc-dev \ + libmysqlclient-dev \ + libxml2-dev \ + libcurl4-openssl-dev libssl-dev \ + libsquish-dev \ + liblzma-dev \ + libgsf-1-dev \ + qtbase5-dev qttools5-dev qttools5-dev-tools \ + && curl -sSL https://apt.kitware.com/kitware-archive.sh | bash \ + && apt-get install -y cmake \ + && rm -rf /var/lib/apt/lists/* + +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + gcc-8 g++-8 \ + && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 \ + && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60 \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p /mnt/nel + +WORKDIR /mnt/nel diff --git a/tool/quick_start/docker/ryzombuild_bionic_x86_64/Dockerfile b/tool/quick_start/docker/ryzombuild_bionic_x86_64/Dockerfile index 7b4b4ab62..a49d4758b 100644 --- a/tool/quick_start/docker/ryzombuild_bionic_x86_64/Dockerfile +++ b/tool/quick_start/docker/ryzombuild_bionic_x86_64/Dockerfile @@ -4,7 +4,6 @@ MAINTAINER Ryzom Core RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ software-properties-common \ ninja-build curl wget build-essential \ - gcc-8 g++-8 \ bison autoconf automake \ libpng-dev \ libjpeg-dev \ @@ -20,8 +19,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ liblzma-dev \ libgsf-1-dev \ qtbase5-dev qttools5-dev qttools5-dev-tools \ - && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 \ - && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60 \ && curl -sSL https://apt.kitware.com/kitware-archive.sh | bash \ && apt-get install -y cmake \ && rm -rf /var/lib/apt/lists/*