Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docker] Upgrade docker engine to docker-ce 18.09.0~3-0 #2409

Closed
wants to merge 2 commits into from
Closed

[docker] Upgrade docker engine to docker-ce 18.09.0~3-0 #2409

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8edfa0a
[docker] Upgrade docker engine to docker-ce 18.09.0~3-0
yxieca Jan 2, 2019
d2ea110
address review comment
yxieca Jan 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ThirdPartyLicenses.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ Microsoft is offering you a license to use the following components, to the exte
* <http://www.gnu.org/philosophy/why-not-lgpl.html>.
*/

4. apt-clean, apt-gzip-indexes, apt-no-languages imported from docker v1.11.1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

THIS was originally imported, think we can keep as it is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Reverted.

4. apt-clean, apt-gzip-indexes, apt-no-languages imported from docker ce 18.09.0~3-0
/*
* Apache License
* Version 2.0, January 2004
Expand Down
63 changes: 52 additions & 11 deletions build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,35 @@
## PASSWORD
## The password, expected by chpasswd command

function install_docker_deb()
{
url=$1
docker_deb_temp=`mktemp`
trap_push "rm -f $docker_deb_temp"
wget $url -qO $docker_deb_temp
sudo dpkg --root=$FILESYSTEM_ROOT -i $docker_deb_temp || \
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
}

function upgrade_docker_deb()
{
url=$1
docker_deb_temp=`mktemp`
trap_push "rm -f $docker_deb_temp"
wget $url -qO $docker_deb_temp
sudo dpkg --force-conflicts --force-overwrite --root=$FILESYSTEM_ROOT -i $docker_deb_temp
}

function prepare_docker_upgrade()
{
## This upgrade preparation is very verion speific. Because we are chroot'ing
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

specific

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks fixed now.

## to create installer image. The docker service is not really running in the
## target file system root. Removing docker-engine.prerm will avoid stopping
## the never-started service and failing.
sudo LANG=C rm $FILESYSTEM_ROOT/var/lib/dpkg/info/docker-engine.prerm
sudo dpkg --root=$FILESYSTEM_ROOT -r docker-engine
}

## Default user
[ -n "$USERNAME" ] || {
echo "Error: no or empty USERNAME"
Expand All @@ -29,7 +58,9 @@
set -x -e

## docker engine version (with platform)
DOCKER_VERSION=1.11.1-0~stretch_amd64
DOCKER_INIT_VERSION=1.11.1-0~stretch_amd64
CONTAINERD_VERSION=1.2.0-1_amd64
DOCKER_VERSION=18.09.0~3-0~debian-stretch_amd64
LINUX_KERNEL_VERSION=4.9.0-8

## Working directory to prepare the file system
Expand Down Expand Up @@ -159,17 +190,12 @@ echo '[INFO] Install docker'
## Install apparmor utils since they're missing and apparmor is enabled in the kernel
## Otherwise Docker will fail to start
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install apparmor
docker_deb_url=https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}.deb
docker_deb_temp=`mktemp`
trap_push "rm -f $docker_deb_temp"
wget $docker_deb_url -qO $docker_deb_temp
sudo dpkg --root=$FILESYSTEM_ROOT -i $docker_deb_temp || \
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f

## Add docker config drop-in to select aufs, otherwise it may select other storage driver
sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/
## Note: $_ means last argument of last command
sudo cp files/docker/docker.service.conf $_
## Install lower version docker to load docker images into target installer.
## The higher version docker requires docker daemon running in order to load
## docker images. Which is not possible with chroot.
docker_deb_url=https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_INIT_VERSION}.deb
install_docker_deb ${docker_deb_url}

## Create default user
## Note: user should be in the group with the same name, and also in sudo/docker group
Expand Down Expand Up @@ -375,6 +401,21 @@ if [ -f sonic_debian_extension.sh ]; then
./sonic_debian_extension.sh $FILESYSTEM_ROOT $PLATFORM_DIR
fi

## Upgrade docker to target version. Docker images are loaded by
## sonic_debian_extension.sh
prepare_docker_upgrade
containerd_deb_url=https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/containerd.io_${CONTAINERD_VERSION}.deb
upgrade_docker_deb ${containerd_deb_url}
docker_cli_deb_url=https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce-cli_${DOCKER_VERSION}.deb
upgrade_docker_deb ${docker_cli_deb_url}
docker_deb_url=https://download.docker.com/linux/debian/dists/stretch/pool/stable/amd64/docker-ce_${DOCKER_VERSION}.deb
upgrade_docker_deb ${docker_deb_url}

## Add docker config drop-in to select aufs, otherwise it may select other storage driver
sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/
## Note: $_ means last argument of last command
sudo cp files/docker/docker.service.conf $_

## Organization specific extensions such as Configuration & Scripts for features like AAA, ZTP...
if [ "${enable_organization_extensions}" = "y" ]; then
if [ -f files/build_templates/organization_extensions.sh ]; then
Expand Down
2 changes: 1 addition & 1 deletion files/docker/docker.service.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[Service]
ExecStart=
ExecStart=/usr/bin/docker daemon -H fd:// --storage-driver=overlay --bip=240.127.1.1/24 --iptables=false
ExecStart=/usr/bin/dockerd -H unix:// --storage-driver=overlay --bip=240.127.1.1/24 --iptables=false