starlingx/tools
Code Issues Proposed changes

Merge "debian: Use Debian Global CDN Mirror"

Browse Source
This commit is contained in:
Zuul 2022-02-02 16:50:14 +00:00 committed by Gerrit Code Review
commit 08f2ac900c
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian-mirror-tools/config/debian/common/base-bullseye.yaml
View File

@ -5,7 +5,7 @@ image_type:
- iso
- ostree-repo
- ustart
debootstrap-mirror: http://ftp.cn.debian.org/debian
debootstrap-mirror: http://deb.debian.org/debian
package_feeds: []
package_type: external-debian
wic:

4
debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml
View File

@ -3,9 +3,9 @@ name: debian-initramfs-ostree-image
machine: intel-x86-64
image_type:
- initramfs
debootstrap-mirror: http://ftp.cn.debian.org/debian
debootstrap-mirror: http://deb.debian.org/debian
package_feeds:
- deb http://ftp.cn.debian.org/debian bullseye main contrib
- deb http://deb.debian.org/debian bullseye main contrib
package_type: external-debian
gpg:
gpg_path: /tmp/.lat_gnupg_root

2
stx/dockerfiles/stx-builder.Dockerfile
View File

@ -19,7 +19,7 @@ ENV container=docker \
RUN echo "deb-src http://deb.debian.org/debian bullseye main" >> /etc/apt/sources.list && \
echo "deb-src http://deb.debian.org/debian buster main" >> /etc/apt/sources.list && \
echo "deb http://ftp.de.debian.org/debian bullseye main contrib" >> /etc/apt/sources.list
echo "deb http://deb.debian.org/debian bullseye main contrib" >> /etc/apt/sources.list
# Download required dependencies by mirror/build processes.
RUN apt-get update && apt-get install --no-install-recommends -y \

3
stx/dockerfiles/stx-lat-tool.Dockerfile
View File

@ -44,5 +44,8 @@ RUN /opt/LAT/AppSDK.sh -d /opt/LAT/SDK -y
RUN sed -i -e 's#--no-check-gpg#--variant=minbase --no-check-gpg#g' \
/opt/LAT/SDK/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/python3.10/site-packages/genimage/package_manager/deb/__init__.py
# Fix: Use Debian CDN address for geo-frendly servers
RUN sed -i 's/ftp.cn.debian.org/deb.debian.org/g' /opt/LAT/SDK/sysroots/x86_64-wrlinuxsdk-linux/usr/lib/python3.10/site-packages/genimage/debian_constant.py
ENTRYPOINT ["/usr/bin/tini", "--"]
CMD ["/opt/LAT/lat/latd"]

2
stx/dockerfiles/stx-pkgbuilder.Dockerfile
View File

@ -47,7 +47,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=968927
RUN cd /tmp && \
wget \
http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.126+nmu1_all.deb && \
http://deb.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.126+nmu1_all.deb && \
dpkg -i debootstrap_1.0.126+nmu1_all.deb
RUN groupadd crontab