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

Merge pull request 'move Qt sources to shstk.ru' (#3) from master into release
SHS Gitea/docker/pipeline/head There was a failure building this commit
Details

Browse Source 
Reviewed-on: #3
This commit was merged in pull request #3.
This commit is contained in:
Пелипенко Иван
2026-05-07 18:45:00 +03:00
parent af44c42c1c 1ad8feaf65
commit add11c05b2
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linux_desktop/Dockerfile
+1 -1
View File
@@ -127,7 +127,7 @@ RUN wget -nv https://mirror.tochlab.net/pub/gnu/libmicrohttpd/libmicrohttpd-${CU
# Qt # Qt
WORKDIR /soft WORKDIR /soft
RUN if [ "${QT_FROM_SOURCE}" = "1" ]; then \ RUN if [ "${QT_FROM_SOURCE}" = "1" ]; then \
wget -nv http://qt-mirror.dannhauer.de/archive/qt/${CUR_QT_VERSION_MAJOR}/${CUR_QT_VERSION}/single/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \ 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 \
&& mkdir -p /soft/build/qt && cd /soft/build/qt \ && mkdir -p /soft/build/qt && cd /soft/build/qt \
osx/Dockerfile
+1 -1
View File
@@ -88,7 +88,7 @@ RUN wget -nv https://mirror.tochlab.net/pub/gnu/libmicrohttpd/libmicrohttpd-${CU
ENV SYSROOT=/soft/osxcross/target/SDK/MacOSX10.14.sdk ENV SYSROOT=/soft/osxcross/target/SDK/MacOSX10.14.sdk
ENV CROSS_COMPILE=/soft/osxcross/target/bin/x86_64-${_DARWIN}- ENV CROSS_COMPILE=/soft/osxcross/target/bin/x86_64-${_DARWIN}-
WORKDIR /soft WORKDIR /soft
RUN wget -nv http://qt-mirror.dannhauer.de/archive/qt/${CUR_QT_VERSION_MAJOR}/${CUR_QT_VERSION}/single/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 \
&& mkdir -p /soft/osx/build/qt && cd /soft/osx/build/qt \ && mkdir -p /soft/osx/build/qt && cd /soft/osx/build/qt \
pi/Dockerfile
+1 -1
View File
@@ -91,7 +91,7 @@ RUN ln -s /usr/bin/arm-linux-gnueabihf-ar /usr/bin/arm-linux-gnueabi-ar
RUN ln -s /usr/bin/arm-linux-gnueabihf-nm /usr/bin/arm-linux-gnueabi-nm RUN ln -s /usr/bin/arm-linux-gnueabihf-nm /usr/bin/arm-linux-gnueabi-nm
RUN ln -s /usr/bin/arm-linux-gnueabihf-strip /usr/bin/arm-linux-gnueabi-strip RUN ln -s /usr/bin/arm-linux-gnueabihf-strip /usr/bin/arm-linux-gnueabi-strip
RUN ln -s /usr/bin/arm-linux-gnueabihf-objcopy /usr/bin/arm-linux-gnueabi-objcopy RUN ln -s /usr/bin/arm-linux-gnueabihf-objcopy /usr/bin/arm-linux-gnueabi-objcopy
RUN wget -nv http://qt-mirror.dannhauer.de/archive/qt/${CUR_QT_VERSION_MAJOR}/${CUR_QT_VERSION}/single/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 \
&& mkdir -p /soft/build/qt && cd /soft/build/qt \ && mkdir -p /soft/build/qt && cd /soft/build/qt \
windows/Dockerfile
+1 -1
View File
@@ -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://mirrors.ustc.edu.cn/qtproject/archive/qt/${CUR_QT_VERSION_MAJOR}/${CUR_QT_VERSION}/single/qt-everywhere-opensource-src-${CUR_QT_VERSION}.tar.xz \ RUN wget -v 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 \