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

add WIN_<BITS>_OR_NULL env to windows

Browse Source
This commit is contained in:
Пелипенко Иван
2026-05-07 20:22:26 +03:00
parent 1ad8feaf65
commit fc43473291
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows-base-env32/Dockerfile
+2
View File
@@ -2,6 +2,8 @@ ARG DOCKER_PREFIX=wapmobil/
FROM ${DOCKER_PREFIX}windows-base FROM ${DOCKER_PREFIX}windows-base
ENV WIN_BITS=32 ENV WIN_BITS=32
ENV WIN_32_OR_NULL=32
ENV WIN_64_OR_NULL=
ENV WIN_ARCH=i686 ENV WIN_ARCH=i686
ENV WIN_ARCH2=x86 ENV WIN_ARCH2=x86
ENV SODIUM_M_ARG= ENV SODIUM_M_ARG=
windows-base-env64/Dockerfile
+2
View File
@@ -2,6 +2,8 @@ ARG DOCKER_PREFIX=wapmobil/
FROM ${DOCKER_PREFIX}windows-base FROM ${DOCKER_PREFIX}windows-base
ENV WIN_BITS=64 ENV WIN_BITS=64
ENV WIN_32_OR_NULL=
ENV WIN_64_OR_NULL=64
ENV WIN_ARCH=x86_64 ENV WIN_ARCH=x86_64
ENV WIN_ARCH2=x86_64 ENV WIN_ARCH2=x86_64
ENV SODIUM_M_ARG=-m64 ENV SODIUM_M_ARG=-m64
windows/Dockerfile
+5 -5
View File
@@ -48,7 +48,7 @@ RUN unzip -o /soft/postgresql_x${WIN_BITS}.zip -d ${SYSROOT}/ \
# microhttpd # microhttpd
RUN mkdir -p /soft/tmp && cd /soft/tmp \ RUN mkdir -p /soft/tmp && cd /soft/tmp \
&& wget https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest-w32-bin.zip \ && wget -nv https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest-w32-bin.zip \
&& unzip -o /soft/tmp/*.zip -d /soft/tmp \ && unzip -o /soft/tmp/*.zip -d /soft/tmp \
&& cp -rfv /soft/tmp/libmicrohttpd-*-w32-bin/${WIN_ARCH2}/MinGW/static/mingw${WIN_BITS}/* ${INSTALL_DIR}/ \ && cp -rfv /soft/tmp/libmicrohttpd-*-w32-bin/${WIN_ARCH2}/MinGW/static/mingw${WIN_BITS}/* ${INSTALL_DIR}/ \
&& rm -rf /soft/tmp && rm -rf /soft/tmp
@@ -80,7 +80,7 @@ RUN curl -s https://download.libsodium.org/libsodium/releases/libsodium-${CUR_SO
# fftw3 # fftw3
WORKDIR /soft WORKDIR /soft
RUN wget -v http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \ RUN wget -nv http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \
&& tar -xf fftw-${CUR_FFTW_VERSION}.tar.gz -C /soft \ && tar -xf fftw-${CUR_FFTW_VERSION}.tar.gz -C /soft \
&& rm -f fftw-${CUR_FFTW_VERSION}.tar.gz \ && rm -f fftw-${CUR_FFTW_VERSION}.tar.gz \
&& cd /soft/fftw-* && patch < /soft/fftw.cmake.patch \ && cd /soft/fftw-* && patch < /soft/fftw.cmake.patch \
@@ -109,7 +109,7 @@ RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar
# markdown # markdown
RUN mkdir -p /soft/discount-${CUR_DISCOUNT_VERSION}/cmake && mkdir -p /soft/linux/build/discount && mkdir -p ${INSTALL_DIR}/build/discount RUN mkdir -p /soft/discount-${CUR_DISCOUNT_VERSION}/cmake && mkdir -p /soft/linux/build/discount && mkdir -p ${INSTALL_DIR}/build/discount
WORKDIR /soft WORKDIR /soft
RUN wget -v https://github.com/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \ RUN wget -nv https://github.com/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
&& tar -xf v${CUR_DISCOUNT_VERSION}.tar.gz -C /soft \ && tar -xf v${CUR_DISCOUNT_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_DISCOUNT_VERSION}.tar.gz && rm -f v${CUR_DISCOUNT_VERSION}.tar.gz
RUN sed -i 's/DESTRUCTOR/ /' /soft/discount-${CUR_DISCOUNT_VERSION}/setup.c RUN sed -i 's/DESTRUCTOR/ /' /soft/discount-${CUR_DISCOUNT_VERSION}/setup.c
@@ -138,7 +138,7 @@ RUN wget -nv https://github.com/openssl/openssl/archive/OpenSSL_${CUR_OPENSSL_VE
&& rm -f OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz \ && rm -f OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz \
&& mkdir -p ${INSTALL_DIR}/build/openssl && cd ${INSTALL_DIR}/build/openssl \ && mkdir -p ${INSTALL_DIR}/build/openssl && cd ${INSTALL_DIR}/build/openssl \
&& /soft/openssl-OpenSSL_${CUR_OPENSSL_VERSION}/Configure --cross-compile-prefix=${WIN_TRIPPLET}- \ && /soft/openssl-OpenSSL_${CUR_OPENSSL_VERSION}/Configure --cross-compile-prefix=${WIN_TRIPPLET}- \
--prefix=${INSTALL_DIR}/ --release no-idea no-mdc2 no-rc5 no-tests shared mingw \ --prefix=${INSTALL_DIR}/ --release no-idea no-mdc2 no-rc5 no-tests shared mingw${WIN_64_OR_NULL} \
&& make -j${JOBS_COUNT} && make install \ && make -j${JOBS_COUNT} && make install \
&& cd /soft && rm -rf ${INSTALL_DIR}/build/openssl && rm -rf /soft/openssl-OpenSSL_* && cd /soft && rm -rf ${INSTALL_DIR}/build/openssl && rm -rf /soft/openssl-OpenSSL_*
@@ -146,7 +146,7 @@ RUN wget -nv https://github.com/openssl/openssl/archive/OpenSSL_${CUR_OPENSSL_VE
# Qt # Qt
ENV QT_SRC=/soft/qt-everywhere-src-${CUR_QT_VERSION} ENV QT_SRC=/soft/qt-everywhere-src-${CUR_QT_VERSION}
WORKDIR /soft WORKDIR /soft
RUN wget -v https://shstk.ru/files/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \ RUN wget -nv https://shstk.ru/files/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
&& tar -xf qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz -C /soft \ && tar -xf qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz -C /soft \
&& rm -f qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \ && rm -f qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \
&& cd ${QT_SRC}/qtdeclarative/src/plugins/scenegraph/d3d12 \ && cd ${QT_SRC}/qtdeclarative/src/plugins/scenegraph/d3d12 \