docker/windows-shstk/Dockerfile

@@ -16,8 +16,8 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
  && rm -rf * \
  && ldconfig
 
-WORKDIR /soft/shstk_build_windows
+WORKDIR /soft/shstk_build_windows${WIN_32_OR_NULL}
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \
+RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows${WIN_32_OR_NULL} -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows${WIN_32_OR_NULL}.cmake ../shstk/ \
  && cmake --build ./ --target install -j${JOBS_COUNT} \
  && cmake --build ./ --target deploy -j${JOBS_COUNT} \
  && rm -rf *

docker/windows32-shstk/Dockerfile

@@ -1,25 +0,0 @@
-ARG DOCKER_PREFIX=wapmobil/
-ARG IMAGE_FROM
-FROM ${DOCKER_PREFIX}${IMAGE_FROM}
-
-ARG BRANCH=release
-ARG LIBS_BUILD_NUMBER=9999
-ARG JOBS_COUNT=4
-ENV PATH=/opt/cmake/bin:$PATH 
-
-WORKDIR /soft
-RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
-
-WORKDIR /soft/shstk_build_host
-RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && cmake --build ./ --target install -j${JOBS_COUNT} \
- && rm -rf * \
- && ldconfig
-
-WORKDIR /soft/shstk_build_windows32
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \
- && cmake --build ./ --target install -j${JOBS_COUNT} \
- && cmake --build ./ --target deploy -j${JOBS_COUNT} \
- && rm -rf *
- 
-WORKDIR /soft/src