starlingx
/
tools
Code Issues Proposed changes

Add docker-ce 3rd party repository 

In a centos build, the Centos mirror can be created from
a third party packages like docker-ce. The debdownloader
script that is used to populate the Debian mirror does not
support this.

The debdownloader script uses the apt repository to download
the binaries that are specified by the developer. If the
debian package is not specified and if it doesn't know
where to get the package it is not downloaded.

In order to workaround this, add the docker-ce repository so
that it is enabled and specify which docker-ce and associated
dependencies to download. This is needed because since
the starlingx/config-files package tries to configure
the docker-ce package rather than the Debian docker.io
package.

Story: 2008846
Task: 43814

Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: I96f5d426fcf7389d7565be4f883d3123a0bf61da
This commit is contained in:
Charles Short 2021-10-29 10:09:08 -04:00
parent 4c67a7c20b
commit 4d7bae7dab
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian-mirror-tools/config/debian/common/3rdparty.lst Normal file
View File

@ -0,0 +1,5 @@
# These are 3rd party binary debian packages to
# be included locally.
docker-ce 5:20.10.10~3-0~debian-bullseye
docker-ce-cli 5:20.10.10~3-0~debian-bullseye
containerd.io 1.4.11-1

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

@ -63,6 +63,14 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
ln -sf /usr/local/bin/stx/stx-localrc /root/localrc && \
echo '. /usr/local/bin/finishSetup.sh' >> /root/.bashrc
# 3rd party apt repositories
# docker-cli
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
echo \
"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \
apt-get update
COPY stx/toCOPY/lat-tool/lat /opt/LAT/lat
COPY stx/toCOPY/builder/finishSetup.sh /usr/local/bin
COPY stx/toCOPY/builder/userenv /root/