starlingx/tools
Code Issues Proposed changes

Update certs before anything else in trixie Dockerfiles

Browse Source 
Change-Id: I16bbb6fed2f506cf27e3e61cc3d9075714d2cf8c
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little
2025-08-01 15:03:08 -04:00
parent 951e50c04d
commit b6b45fcb80
4 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stx/debian/trixie/dockerfiles/stx-aptly.Dockerfile
View File

@@ -18,18 +18,18 @@ FROM debian:trixie
ARG os_mirror_url="http://"
ARG os_mirror_dist_path=""
RUN echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie contrib main non-free-firmware" > /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie-updates contrib main non-free-firmware" >> /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie-backports contrib main non-free-firmware" >> /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian-security trixie-security contrib main non-free-firmware" >> /etc/apt/sources.list && \
rm /etc/apt/sources.list.d/debian.sources
# Add retry to apt config
RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/99custom
# Update certificates
RUN apt-get -q -y update && apt-get -y install --no-install-recommends curl ca-certificates && update-ca-certificates
RUN echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie contrib main non-free-firmware" > /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie-updates contrib main non-free-firmware" >> /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie-backports contrib main non-free-firmware" >> /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian-security trixie-security contrib main non-free-firmware" >> /etc/apt/sources.list && \
rm /etc/apt/sources.list.d/debian.sources
RUN curl -O https://nginx.org/keys/nginx_signing.key
# Add Nginx repository and install required packages

14
stx/debian/trixie/dockerfiles/stx-builder.Dockerfile
View File

@@ -16,9 +16,17 @@ FROM debian:trixie
ARG os_mirror_url="http://"
ARG os_mirror_dist_path=""
ARG STX_MIRROR_URL=https://mirror.starlingx.windriver.com/mirror
ENV container=docker \
PATH=/opt/LAT/lat:$PATH
# Add retry to apt config
RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/99custom
# Update certificates via upsteam repos
RUN apt-get -y update && apt-get -y install --no-install-recommends ca-certificates && update-ca-certificates
RUN echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie contrib main non-free-firmware" > /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie-updates contrib main non-free-firmware" >> /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie-backports contrib main non-free-firmware" >> /etc/apt/sources.list && \
@@ -30,12 +38,6 @@ RUN echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie
RUN echo "[global]" >> /etc/pip.conf && \
echo "break-system-packages = true" >> /etc/pip.conf
# Add retry to apt config
RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/99custom
# Update certificates via upsteam repos
RUN apt-get -y update && apt-get -y install --no-install-recommends ca-certificates && update-ca-certificates
# Download required dependencies by mirror/build processes.
RUN apt-get update && apt-get install --no-install-recommends -y \
bzip2 \

12
stx/debian/trixie/dockerfiles/stx-lat-tool.Dockerfile
View File

@@ -25,6 +25,12 @@ MAINTAINER Chen Qi <Qi.Chen@windriver.com>
ARG LAT_BINARY_RESOURCE_PATH="${lat_mirror_url}${lat_mirror_lat_path}${lat_version}"
# Add retry to apt config
RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/99custom
# Update certificates via upsteam repos
RUN apt-get -y update && apt-get -y install --no-install-recommends ca-certificates && update-ca-certificates
RUN echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie contrib main non-free-firmware" > /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie-updates contrib main non-free-firmware" >> /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie-backports contrib main non-free-firmware" >> /etc/apt/sources.list && \
@@ -36,12 +42,6 @@ RUN echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie
RUN echo "[global]" >> /etc/pip.conf && \
echo "break-system-packages = true" >> /etc/pip.conf
# Add retry to apt config
RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/99custom
# Update certificates via upsteam repos
RUN apt-get -y update && apt-get -y install --no-install-recommends ca-certificates && update-ca-certificates
# Install necessary packages
RUN apt-get -y update && apt-get --no-install-recommends -y install \
bzip2 \

16
stx/debian/trixie/dockerfiles/stx-pkgbuilder.Dockerfile
View File

@@ -16,6 +16,14 @@ FROM debian:trixie
ARG os_mirror_url="http://"
ARG os_mirror_dist_path=""
ARG DEBIAN_FRONTEND=noninteractive
# Add retry to apt config
RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/99custom
# Update certificates via upsteam repos
RUN apt-get -y update && apt-get -y install --no-install-recommends ca-certificates && update-ca-certificates
RUN echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie contrib main non-free-firmware" > /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie-updates contrib main non-free-firmware" >> /etc/apt/sources.list && \
echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie-backports contrib main non-free-firmware" >> /etc/apt/sources.list && \
@@ -27,14 +35,6 @@ RUN echo "deb ${os_mirror_url}${os_mirror_dist_path}deb.debian.org/debian trixie
RUN echo "[global]" >> /etc/pip.conf && \
echo "break-system-packages = true" >> /etc/pip.conf
ARG DEBIAN_FRONTEND=noninteractive
# Add retry to apt config
RUN echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/99custom
# Update certificates via upsteam repos
RUN apt-get -y update && apt-get -y install --no-install-recommends ca-certificates && update-ca-certificates
# Download required dependencies by mirror/build processes.
RUN apt-get update && apt-get install --no-install-recommends -y \
apt-utils \