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

Merge pull request 'Master' (#11) from master into release
SHS Gitea/docker/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: #11
This commit was merged in pull request #11.
This commit is contained in:
peri4
2026-08-18 10:20:49 +03:00
parent 20e61bf972 3402746af3
commit 17dc8afb0c
7 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
astra1.7/Dockerfile
+3 -3
View File
@@ -10,8 +10,8 @@ ENV CUR_FFTW_VERSION=3.3.10
ENV CUR_MICROHTTPD_VERSION=1.0.2
# apply RU mirror
RUN sed -i 's/deb.debian.org/mirror.mephi.ru/g' /etc/apt/sources.list || true
RUN sed -i 's/deb.debian.org/mirror.mephi.ru/g' /etc/apt/sources.list.d/* || true
RUN sed -i 's/deb.debian.org/mirror.truenetwork.ru/g' /etc/apt/sources.list || true
RUN sed -i 's/deb.debian.org/mirror.truenetwork.ru/g' /etc/apt/sources.list.d/* || true
RUN apt-get update && apt-get install -y ca-certificates gpg
@@ -43,7 +43,7 @@ RUN wget -nv http://www.fftw.org/fftw-${CUR_FFTW_VERSION}.tar.gz \
&& make install -j${JOBS_COUNT} && rm -rf ./* \
&& cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_FLOAT=1 -DENABLE_LONG_DOUBLE=0 -DENABLE_QUAD_PRECISION=0 -DENABLE_THREADS=1 -DWITH_COMBINED_THREADS=1 -DBUILD_SHARED_LIBS=0 /soft/fftw-* \
&& make install -j${JOBS_COUNT} && rm -rf ./* \
&& cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_FLOAT=0 -DENABLE_LONG_DOUBLE=1 -DENABLE_QUAD_PRECISION=0 -DENABLE_THREADS=1 -DWITH_COMBINED_THREADS=1 -DBUILD_SHARED_LIBS=0 /soft/fftw-* \
&& cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_FLOAT=0 -DENABLE_LONG_DOUBLE=1 -DENABLE_QUAD_PRECISION=0 -DENABLE_THREADS=1 -DWITH_COMBINED_THREADS=1 -DBUILD_SHARED_LIBS=0 /soft/fftw-* \
&& make install -j${JOBS_COUNT} && rm -rf ./* \
&& rm -rf /soft/fftw-*
astra1.8/Dockerfile
+2 -2
View File
@@ -10,8 +10,8 @@ ENV CUR_FFTW_VERSION=3.3.10
ENV CUR_MICROHTTPD_VERSION=1.0.2
# apply RU mirror
RUN sed -i 's/deb.debian.org/mirror.mephi.ru/g' /etc/apt/sources.list || true
RUN sed -i 's/deb.debian.org/mirror.mephi.ru/g' /etc/apt/sources.list.d/* || true
RUN sed -i 's/deb.debian.org/mirror.truenetwork.ru/g' /etc/apt/sources.list || true
RUN sed -i 's/deb.debian.org/mirror.truenetwork.ru/g' /etc/apt/sources.list.d/* || true
RUN apt-get update && apt-get install -y ca-certificates gpg
linux_cross/Dockerfile
+3 -3
View File
@@ -1,5 +1,5 @@
ARG image_from
FROM --platform=linux/amd64 ${image_from}
FROM ${image_from}
ARG JOBS_COUNT=4
ARG image_prepare_script
@@ -15,8 +15,8 @@ ENV QT_SELECT=5
ENV LANG=en_US.utf8
# apply RU mirror
RUN sed -i 's/deb.debian.org/mirror.mephi.ru/g' /etc/apt/sources.list || true
RUN sed -i 's/deb.debian.org/mirror.mephi.ru/g' /etc/apt/sources.list.d/* || true
RUN sed -i 's/deb.debian.org/mirror.truenetwork.ru/g' /etc/apt/sources.list || true
RUN sed -i 's/deb.debian.org/mirror.truenetwork.ru/g' /etc/apt/sources.list.d/* || true
# configs
COPY .bashrc /root/.bashrc
linux_cross/install_apt.sh
+1 -1
View File
@@ -5,7 +5,7 @@ toolchain=$2
export DEBIAN_FRONTEND=noninteractive
find "/etc/apt/sources.list.d/" -type f -exec sed -i "s|http://[a-zA-Z0-9_.]\+/|http://mirror.yandex.ru/|g" {} \;
find "/etc/apt/sources.list.d/" -type f -exec sed -i "s|http://[a-zA-Z0-9_.]\+/|http://mirror.truenetwork.ru/|g" {} \;
dpkg --add-architecture $arch
apt-get update
linux_cross/install_apt_ubuntu_20.04_arm64.sh
+8
View File
@@ -0,0 +1,8 @@
#!/bin/bash
arch=$1
toolchain=$2
cp -vf /soft/ubuntu.sources.20.04.arm64.sh /etc/apt/sources.list.d/ubuntu.sources
bash /soft/install_apt.sh $arch $toolchain
linux_cross/ubuntu.sources.20.04.arm64.sh
+33
View File
@@ -0,0 +1,33 @@
## See the sources.list(5) manual page for further settings.
Types: deb
URIs: http://mirror.yandex.ru/ubuntu/
Suites: focal focal-updates focal-backports
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
Architectures: amd64
## Ubuntu security updates. Aside from URIs and Suites,
## this should mirror your choices in the previous section.
Types: deb
URIs: http://mirror.yandex.ru/ubuntu/
Suites: focal-security
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
Architectures: amd64
## See the sources.list(5) manual page for further settings.
Types: deb
URIs: http://mirror.yandex.ru/ubuntu-ports/
Suites: focal focal-updates focal-backports
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
Architectures: arm64
## Ubuntu security updates. Aside from URIs and Suites,
## this should mirror your choices in the previous section.
Types: deb
URIs: http://mirror.yandex.ru/ubuntu-ports/
Suites: focal-security
Components: main universe restricted multiverse
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
Architectures: arm64
linux_desktop/Dockerfile
+2 -2
View File
@@ -22,8 +22,8 @@ ENV QT_SELECT=5
ENV LANG=en_US.utf8
# apply RU mirror
RUN sed -i 's/deb.debian.org/mirror.mephi.ru/g' /etc/apt/sources.list || true
RUN sed -i 's/deb.debian.org/mirror.mephi.ru/g' /etc/apt/sources.list.d/* || true
RUN sed -i 's/deb.debian.org/mirror.truenetwork.ru/g' /etc/apt/sources.list || true
RUN sed -i 's/deb.debian.org/mirror.truenetwork.ru/g' /etc/apt/sources.list.d/* || true
# configs
COPY .bashrc /root/.bashrc