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

Merge pull request 'change github.archive to shstk/files' (#18) from master into release
SHS Gitea/docker/pipeline/head Something is wrong with the build of this commit
Details

Browse Source 
Reviewed-on: #18
This commit was merged in pull request #18.
This commit is contained in:
peri4
2026-08-20 16:10:09 +03:00
parent 320fa4f0a4 f6fbec8628
commit c975a5a874
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linux_desktop/Dockerfile
+2 -2
View File
@@ -89,7 +89,7 @@ RUN wget -nv http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \
# assimp
WORKDIR /soft
RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
&& tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_ASSIMP_VERSION}.tar.gz pax_global_header \
&& mkdir -p /soft/build/assimp && cd /soft/build/assimp \
@@ -99,7 +99,7 @@ RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar
# markdown
WORKDIR /soft
RUN wget -nv https://github.com/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
&& tar -xf v${CUR_DISCOUNT_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_DISCOUNT_VERSION}.tar.gz
RUN sed -i 's/DESTRUCTOR/ /' /soft/discount-${CUR_DISCOUNT_VERSION}/setup.c
osx/Dockerfile
+2 -2
View File
@@ -48,7 +48,7 @@ RUN /soft/osxcross/target/bin/x86_64-${_DARWIN}-install_name_tool -id @rpath/lib
# assimp
WORKDIR /soft
RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
&& tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_ASSIMP_VERSION}.tar.gz pax_global_header \
&& mkdir -p /soft/osx/build/assimp && cd /soft/osx/build/assimp \
@@ -59,7 +59,7 @@ RUN /soft/osxcross/target/bin/x86_64-${_DARWIN}-install_name_tool -id @rpath/lib
# markdown
WORKDIR /soft
RUN wget -nv https://github.com/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
&& tar -xf v${CUR_DISCOUNT_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_DISCOUNT_VERSION}.tar.gz
RUN sed -i 's/DESTRUCTOR/ /' /soft/discount-${CUR_DISCOUNT_VERSION}/setup.c
osx/Dockerfile_arm.txt
+3 -3
View File
@@ -99,7 +99,7 @@ ENV CROSS_COMPILE=${ARCH}-${_DARWIN}-
# assimp
WORKDIR /soft
RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
&& tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_ASSIMP_VERSION}.tar.gz pax_global_header \
&& mkdir -p /soft/osx/build/assimp && cd /soft/osx/build/assimp \
@@ -113,7 +113,7 @@ ENV CROSS_COMPILE=${ARCH}-${_DARWIN}-
# assimp
WORKDIR /soft
RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
&& tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_ASSIMP_VERSION}.tar.gz pax_global_header \
&& mkdir -p /soft/osx/build/assimp && cd /soft/osx/build/assimp \
@@ -126,7 +126,7 @@ RUN /soft/osxcross/target/bin/${ARCH}-${_DARWIN}-install_name_tool -id @rpath/li
# markdown
WORKDIR /soft
RUN wget -nv https://github.com/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
&& tar -xf v${CUR_DISCOUNT_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_DISCOUNT_VERSION}.tar.gz
RUN sed -i 's/DESTRUCTOR/ /' /soft/discount-${CUR_DISCOUNT_VERSION}/setup.c
pi/Dockerfile
+2 -2
View File
@@ -48,7 +48,7 @@ RUN wget -nv http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \
# assimp
WORKDIR /soft
RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
&& tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_ASSIMP_VERSION}.tar.gz pax_global_header \
&& mkdir -p /soft/pi/build/assimp && cd /soft/pi/build/assimp \
@@ -58,7 +58,7 @@ RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar
# markdown
WORKDIR /soft
RUN wget -nv https://github.com/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
&& tar -xf v${CUR_DISCOUNT_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_DISCOUNT_VERSION}.tar.gz
RUN sed -i 's/DESTRUCTOR/ /' /soft/discount-${CUR_DISCOUNT_VERSION}/setup.c
windows-clang/Dockerfile
+3 -3
View File
@@ -94,7 +94,7 @@ RUN wget -nv http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \
# assimp
WORKDIR /soft
RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
&& tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_ASSIMP_VERSION}.tar.gz pax_global_header \
&& mkdir -p /soft/windows/build/assimp && cd /soft/windows/build/assimp \
@@ -104,7 +104,7 @@ RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar
# markdown
WORKDIR /soft
RUN wget -nv https://github.com/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
&& tar -xf v${CUR_DISCOUNT_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_DISCOUNT_VERSION}.tar.gz
RUN sed -i 's/DESTRUCTOR/ /' /soft/discount-${CUR_DISCOUNT_VERSION}/setup.c
@@ -134,7 +134,7 @@ RUN unzip -o /soft/postgresql.zip -d ${SYSROOT}/ \
# OpenSSL
RUN wget -nv https://github.com/openssl/openssl/archive/OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/openssl/openssl/archive/OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz \
&& tar -xf OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz -C /soft \
&& rm -f OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz \
&& mkdir -p /soft/windows/build/openssl && cd /soft/windows/build/openssl \
windows/Dockerfile
+3 -3
View File
@@ -98,7 +98,7 @@ RUN wget -nv http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \
# assimp
WORKDIR /soft
RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar.gz \
&& tar -xf v${CUR_ASSIMP_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_ASSIMP_VERSION}.tar.gz \
&& mkdir -p ${INSTALL_DIR}/build/assimp && cd ${INSTALL_DIR}/build/assimp \
@@ -111,7 +111,7 @@ RUN wget -nv https://github.com/assimp/assimp/archive/v${CUR_ASSIMP_VERSION}.tar
# markdown
RUN mkdir -p /soft/discount-${CUR_DISCOUNT_VERSION}/cmake && mkdir -p /soft/linux/build/discount && mkdir -p ${INSTALL_DIR}/build/discount
WORKDIR /soft
RUN wget -nv https://github.com/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/Orc/discount/archive/v${CUR_DISCOUNT_VERSION}.tar.gz \
&& tar -xf v${CUR_DISCOUNT_VERSION}.tar.gz -C /soft \
&& rm -f v${CUR_DISCOUNT_VERSION}.tar.gz
RUN sed -i 's/DESTRUCTOR/ /' /soft/discount-${CUR_DISCOUNT_VERSION}/setup.c
@@ -135,7 +135,7 @@ WORKDIR /soft
# --prefix=${INSTALL_DIR}/ --release no-idea no-mdc2 no-rc5 no-tests shared mingw \
# && make -j${JOBS_COUNT} && make install \
# && cd /soft && rm -rf ${INSTALL_DIR}/build/openssl && rm -rf /soft/openssl-*
RUN wget -nv https://github.com/openssl/openssl/archive/OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz \
RUN wget -nv https://shstk.ru/files/openssl/openssl/archive/OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz \
&& tar -xf OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz -C /soft \
&& rm -f OpenSSL_${CUR_OPENSSL_VERSION}.tar.gz \
&& mkdir -p ${INSTALL_DIR}/build/openssl && cd ${INSTALL_DIR}/build/openssl \