starlingx
/
tools
Code Issues Proposed changes

Merge "Add docker-ce 3rd party repository"

This commit is contained in:
Zuul 2021-11-01 14:07:38 +00:00 committed by Gerrit Code Review
parent 7235664f5e 4d7bae7dab
commit 6745ff447d
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/