From 8735b64ed8c1bd50e05f41e79ff359bf98cdd256 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Fri, 28 Aug 2020 13:39:50 +0300 Subject: [PATCH] docker, Jenkinsfile --- Jenkinsfile | 4 ++-- .../Dockerfile | 22 +++++++++---------- .../{debian-libs => debian-shstk}/Dockerfile | 6 ++--- docker/{osx-libs => osx-shstk}/Dockerfile | 10 ++++----- docker/{pi-libs => pi-shstk}/Dockerfile | 10 ++++----- .../Dockerfile | 10 ++++----- 6 files changed, 31 insertions(+), 31 deletions(-) rename docker/{android-libs => android-shstk}/Dockerfile (82%) rename docker/{debian-libs => debian-shstk}/Dockerfile (77%) rename docker/{osx-libs => osx-shstk}/Dockerfile (76%) rename docker/{pi-libs => pi-shstk}/Dockerfile (75%) rename docker/{windows-libs => windows-shstk}/Dockerfile (75%) diff --git a/Jenkinsfile b/Jenkinsfile index aa1dfb8..759eff1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ def build_docker(name) { - def image = "${name}-libs" + def image = "${name}-shstk" echo "Build image ${image}" def pref = "" if (env.DOCKER_PREFIX) { @@ -31,7 +31,7 @@ node { def platforms = ['debian', 'osx', 'windows', 'android', 'pi'] for (int i = 0; i < platforms.size(); ++i) { if (_envmap["BUILD_${platforms[i]}"] == "1") { - stage("${platforms[i]}-libs") { + stage("${platforms[i]}-shstk") { _msg += build_docker("${platforms[i]}") } } diff --git a/docker/android-libs/Dockerfile b/docker/android-shstk/Dockerfile similarity index 82% rename from docker/android-libs/Dockerfile rename to docker/android-shstk/Dockerfile index e94bc3f..19188d1 100644 --- a/docker/android-libs/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -10,34 +10,34 @@ ENV ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake ENV NDK_PLATFORM="android-21" WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git -WORKDIR /soft/libs_build_host -RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \ +WORKDIR /soft/shstk_build_host +RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && make install -j${JOBS_COUNT} \ && rm -rf * \ && ldconfig -WORKDIR /soft/libs_build_anroid +WORKDIR /soft/shstk_build_anroid ENV _ANDROID_TOOLCHAIN=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake ENV _CUR_ABI=armeabi-v7a -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ +RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ && make install -j${JOBS_COUNT} && rm -rf * ENV _CUR_ABI=arm64-v8a -WORKDIR /soft/libs_build_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ +WORKDIR /soft/shstk_build_android_${_CUR_ABI} +RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ && make install -j${JOBS_COUNT} && rm -rf * ENV _CUR_ABI=x86 -WORKDIR /soft/libs_build_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ +WORKDIR /soft/shstk_build_android_${_CUR_ABI} +RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ && make install -j${JOBS_COUNT} && rm -rf * ENV _CUR_ABI=x86_64 -WORKDIR /soft/libs_build_android_${_CUR_ABI} -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../libs/ \ +WORKDIR /soft/shstk_build_android_${_CUR_ABI} +RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \ && make install -j${JOBS_COUNT} && rm -rf * WORKDIR /soft/src diff --git a/docker/debian-libs/Dockerfile b/docker/debian-shstk/Dockerfile similarity index 77% rename from docker/debian-libs/Dockerfile rename to docker/debian-shstk/Dockerfile index 0a85c7f..2c0f358 100644 --- a/docker/debian-libs/Dockerfile +++ b/docker/debian-shstk/Dockerfile @@ -6,10 +6,10 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git -WORKDIR /soft/libs_build_debian -RUN cmake -DICU=0 -DLIB=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \ +WORKDIR /soft/shstk_build_debian +RUN cmake -DICU=0 -DLIB=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && make install -j${JOBS_COUNT} \ && rm -rf * \ && ldconfig diff --git a/docker/osx-libs/Dockerfile b/docker/osx-shstk/Dockerfile similarity index 76% rename from docker/osx-libs/Dockerfile rename to docker/osx-shstk/Dockerfile index 5a496e4..970d877 100644 --- a/docker/osx-libs/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -6,16 +6,16 @@ ARG JOBS_COUNT=4 ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git -WORKDIR /soft/libs_build_host -RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \ +WORKDIR /soft/shstk_build_host +RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && make install -j${JOBS_COUNT} \ && rm -rf * \ && ldconfig -WORKDIR /soft/libs_build_osx -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLIB=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../libs/ \ +WORKDIR /soft/shstk_build_osx +RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLIB=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \ && make install -j${JOBS_COUNT} && rm -rf * WORKDIR /soft/src diff --git a/docker/pi-libs/Dockerfile b/docker/pi-shstk/Dockerfile similarity index 75% rename from docker/pi-libs/Dockerfile rename to docker/pi-shstk/Dockerfile index 666e20c..4207098 100644 --- a/docker/pi-libs/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -6,16 +6,16 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git -WORKDIR /soft/libs_build_host -RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \ +WORKDIR /soft/shstk_build_host +RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && make install -j${JOBS_COUNT} \ && rm -rf * \ && ldconfig -WORKDIR /soft/libs_build_pi -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../libs/ \ +WORKDIR /soft/shstk_build_pi +RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLIB=0 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \ && make install -j${JOBS_COUNT} && rm -rf * WORKDIR /soft/src diff --git a/docker/windows-libs/Dockerfile b/docker/windows-shstk/Dockerfile similarity index 75% rename from docker/windows-libs/Dockerfile rename to docker/windows-shstk/Dockerfile index 82be301..c52bef9 100644 --- a/docker/windows-libs/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -6,16 +6,16 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/libs.git +RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git -WORKDIR /soft/libs_build_host -RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../libs \ +WORKDIR /soft/shstk_build_host +RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && make install -j${JOBS_COUNT} \ && rm -rf * \ && ldconfig -WORKDIR /soft/libs_build_windows -RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLIB=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../libs/ \ +WORKDIR /soft/shstk_build_windows +RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLIB=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \ && make install -j${JOBS_COUNT} && rm -rf * WORKDIR /soft/src