SHS/docker
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'move JOBS arg to windows' (#6) from master into release
SHS Gitea/docker/pipeline/head Something is wrong with the build of this commit
Details

Browse Source 
Reviewed-on: #6
This commit was merged in pull request #6.
This commit is contained in:
Пелипенко Иван
2026-05-07 22:05:18 +03:00
parent 0b9f98cd98 aed07a9cd9
commit bfeceaa4da
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows-base/Dockerfile
-2
View File
@@ -1,7 +1,5 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
FROM ${DOCKER_PREFIX}debian-base FROM ${DOCKER_PREFIX}debian-base
ARG JOBS_COUNT=8
ARG JOBS_QT_COUNT=8
# versions # versions
ENV CUR_CMAKE_VERSION=4.3.2 ENV CUR_CMAKE_VERSION=4.3.2
windows/Dockerfile
+3 -1
View File
@@ -1,5 +1,7 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG DOCKER_BITS= ARG DOCKER_BITS=
ARG JOBS_COUNT=8
ARG JOBS_QT_COUNT=4
FROM ${DOCKER_PREFIX}windows-base-${DOCKER_BITS} FROM ${DOCKER_PREFIX}windows-base-${DOCKER_BITS}
ENV WIN_TRIPPLET=${WIN_ARCH}-w64-mingw32 ENV WIN_TRIPPLET=${WIN_ARCH}-w64-mingw32
@@ -188,7 +190,7 @@ WORKDIR /soft
RUN git clone -b hdf5_${CUR_HDF5_VERSION} --depth 1 https://github.com/HDFGroup/hdf5.git \ RUN git clone -b hdf5_${CUR_HDF5_VERSION} --depth 1 https://github.com/HDFGroup/hdf5.git \
&& mkdir hdf5_build && cd hdf5_build \ && mkdir hdf5_build && cd hdf5_build \
&& cmake -C/soft/hdf5_cache.cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DHDF5_BUILD_CPP_LIB=1 -DBUILD_TESTING=0 ../hdf5 \ && cmake -C/soft/hdf5_cache.cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DHDF5_BUILD_CPP_LIB=1 -DBUILD_TESTING=0 ../hdf5 \
&& make -j${JOBS_QT_COUNT} && make install && cd /soft && rm -rf hdf5 hdf5_build /soft/hdf5_cache.cmake && make -j${JOBS_COUNT} && make install && cd /soft && rm -rf hdf5 hdf5_build /soft/hdf5_cache.cmake
# curl (should be last) # curl (should be last)