Skip to content

Commit b57a376

Browse files
authored
[docker-engine]: upgrade docker engine to 18.09 (#2417)
* [docker-engine]: upgrade docker engine to 18.09
1 parent f0b2190 commit b57a376

File tree

5 files changed

+177
-9
lines changed

5 files changed

+177
-9
lines changed

build_debian.sh

+19-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
set -x -e
3030

3131
## docker engine version (with platform)
32-
DOCKER_VERSION=1.11.1-0~stretch_amd64
32+
DOCKER_VERSION=5:18.09.0~3-0~debian-stretch
3333
LINUX_KERNEL_VERSION=4.9.0-8
3434

3535
## Working directory to prepare the file system
@@ -63,6 +63,11 @@ mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR
6363
mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub
6464
touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime
6565

66+
## make / as a mountpoint in chroot env, needed by dockerd
67+
pushd $FILESYSTEM_ROOT
68+
sudo mount --bind . .
69+
popd
70+
6671
## Build a basic Debian system by debootstrap
6772
echo '[INFO] Debootstrap...'
6873
sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch amd64 stretch $FILESYSTEM_ROOT http://debian-archive.trafficmanager.net/debian
@@ -159,12 +164,19 @@ echo '[INFO] Install docker'
159164
## Install apparmor utils since they're missing and apparmor is enabled in the kernel
160165
## Otherwise Docker will fail to start
161166
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install apparmor
162-
docker_deb_url=https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}.deb
163-
docker_deb_temp=`mktemp`
164-
trap_push "rm -f $docker_deb_temp"
165-
wget $docker_deb_url -qO $docker_deb_temp
166-
sudo dpkg --root=$FILESYSTEM_ROOT -i $docker_deb_temp || \
167-
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
167+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install apt-transport-https \
168+
ca-certificates \
169+
curl \
170+
gnupg2 \
171+
software-properties-common
172+
sudo LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/docker.gpg -fsSL https://download.docker.com/linux/debian/gpg
173+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add /tmp/docker.gpg
174+
sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
175+
sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
176+
"deb [arch=amd64] https://download.docker.com/linux/debian stretch stable"
177+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
178+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
179+
sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2
168180

169181
## Add docker config drop-in to select aufs, otherwise it may select other storage driver
170182
sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/

files/build_templates/sonic_debian_extension.j2

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ clean_sys() {
4343
trap_push clean_sys
4444
sudo LANG=C chroot $FILESYSTEM_ROOT mount sysfs /sys -t sysfs
4545

46-
sudo bash -c "echo \"DOCKER_OPTS=\"--storage-driver=overlay\"\" >> $FILESYSTEM_ROOT/etc/default/docker"
46+
sudo bash -c "echo \"DOCKER_OPTS=\"--storage-driver=overlay2\"\" >> $FILESYSTEM_ROOT/etc/default/docker"
47+
sudo cp files/docker/docker $FILESYSTEM_ROOT/etc/init.d/
4748
sudo chroot $FILESYSTEM_ROOT service docker start
4849

4950
# Apply apt configuration files
@@ -280,6 +281,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT docker load < {{image}}
280281
sudo LANG=C chroot $FILESYSTEM_ROOT docker tag {{imagename}}:latest {{imagename}}:$(sonic_get_version)
281282
{% endfor %}
282283
sudo chroot $FILESYSTEM_ROOT service docker stop
284+
sudo rm $FILESYSTEM_ROOT/etc/init.d/docker
283285
{% for script in installer_start_scripts.split(' ') -%}
284286
sudo cp {{script}} $FILESYSTEM_ROOT/usr/bin/
285287
{% endfor %}

files/docker/README

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
docker file is extracted from docker-ce 17.03.0~ce-0~debian-stretch to
2+
enable 'service docker start' in the build chroot env.

files/docker/docker

+152
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
#!/bin/sh
2+
set -e
3+
4+
### BEGIN INIT INFO
5+
# Provides: docker
6+
# Required-Start: $syslog $remote_fs
7+
# Required-Stop: $syslog $remote_fs
8+
# Should-Start: cgroupfs-mount cgroup-lite
9+
# Should-Stop: cgroupfs-mount cgroup-lite
10+
# Default-Start: 2 3 4 5
11+
# Default-Stop: 0 1 6
12+
# Short-Description: Create lightweight, portable, self-sufficient containers.
13+
# Description:
14+
# Docker is an open-source project to easily create lightweight, portable,
15+
# self-sufficient containers from any application. The same container that a
16+
# developer builds and tests on a laptop can run at scale, in production, on
17+
# VMs, bare metal, OpenStack clusters, public clouds and more.
18+
### END INIT INFO
19+
20+
export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
21+
22+
BASE=docker
23+
24+
# modify these in /etc/default/$BASE (/etc/default/docker)
25+
DOCKERD=/usr/bin/dockerd
26+
# This is the pid file managed by docker itself
27+
DOCKER_PIDFILE=/var/run/$BASE.pid
28+
# This is the pid file created/managed by start-stop-daemon
29+
DOCKER_SSD_PIDFILE=/var/run/$BASE-ssd.pid
30+
DOCKER_LOGFILE=/var/log/$BASE.log
31+
DOCKER_OPTS=
32+
DOCKER_DESC="Docker"
33+
34+
# Get lsb functions
35+
. /lib/lsb/init-functions
36+
37+
if [ -f /etc/default/$BASE ]; then
38+
. /etc/default/$BASE
39+
fi
40+
41+
# Check docker is present
42+
if [ ! -x $DOCKERD ]; then
43+
log_failure_msg "$DOCKERD not present or not executable"
44+
exit 1
45+
fi
46+
47+
check_init() {
48+
# see also init_is_upstart in /lib/lsb/init-functions (which isn't available in Ubuntu 12.04, or we'd use it directly)
49+
if [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | grep -q upstart; then
50+
log_failure_msg "$DOCKER_DESC is managed via upstart, try using service $BASE $1"
51+
exit 1
52+
fi
53+
}
54+
55+
fail_unless_root() {
56+
if [ "$(id -u)" != '0' ]; then
57+
log_failure_msg "$DOCKER_DESC must be run as root"
58+
exit 1
59+
fi
60+
}
61+
62+
cgroupfs_mount() {
63+
# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
64+
if grep -v '^#' /etc/fstab | grep -q cgroup \
65+
|| [ ! -e /proc/cgroups ] \
66+
|| [ ! -d /sys/fs/cgroup ]; then
67+
return
68+
fi
69+
if ! mountpoint -q /sys/fs/cgroup; then
70+
mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
71+
fi
72+
(
73+
cd /sys/fs/cgroup
74+
for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
75+
mkdir -p $sys
76+
if ! mountpoint -q $sys; then
77+
if ! mount -n -t cgroup -o $sys cgroup $sys; then
78+
rmdir $sys || true
79+
fi
80+
fi
81+
done
82+
)
83+
}
84+
85+
case "$1" in
86+
start)
87+
check_init
88+
89+
fail_unless_root
90+
91+
cgroupfs_mount
92+
93+
touch "$DOCKER_LOGFILE"
94+
chgrp docker "$DOCKER_LOGFILE"
95+
96+
ulimit -n 1048576
97+
98+
# Having non-zero limits causes performance problems due to accounting overhead
99+
# in the kernel. We recommend using cgroups to do container-local accounting.
100+
if [ "$BASH" ]; then
101+
ulimit -u unlimited
102+
else
103+
ulimit -p unlimited
104+
fi
105+
106+
log_begin_msg "Starting $DOCKER_DESC: $BASE"
107+
start-stop-daemon --start --background \
108+
--no-close \
109+
--exec "$DOCKERD" \
110+
--pidfile "$DOCKER_SSD_PIDFILE" \
111+
--make-pidfile \
112+
-- \
113+
-p "$DOCKER_PIDFILE" \
114+
$DOCKER_OPTS \
115+
>> "$DOCKER_LOGFILE" 2>&1
116+
log_end_msg $?
117+
;;
118+
119+
stop)
120+
check_init
121+
fail_unless_root
122+
log_begin_msg "Stopping $DOCKER_DESC: $BASE"
123+
start-stop-daemon --stop --pidfile "$DOCKER_SSD_PIDFILE" --retry 10
124+
log_end_msg $?
125+
;;
126+
127+
restart)
128+
check_init
129+
fail_unless_root
130+
docker_pid=`cat "$DOCKER_SSD_PIDFILE" 2>/dev/null`
131+
[ -n "$docker_pid" ] \
132+
&& ps -p $docker_pid > /dev/null 2>&1 \
133+
&& $0 stop
134+
$0 start
135+
;;
136+
137+
force-reload)
138+
check_init
139+
fail_unless_root
140+
$0 restart
141+
;;
142+
143+
status)
144+
check_init
145+
status_of_proc -p "$DOCKER_SSD_PIDFILE" "$DOCKERD" "$DOCKER_DESC"
146+
;;
147+
148+
*)
149+
echo "Usage: service docker {start|stop|restart|status}"
150+
exit 1
151+
;;
152+
esac

files/docker/docker.service.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[Service]
22
ExecStart=
3-
ExecStart=/usr/bin/docker daemon -H fd:// --storage-driver=overlay --bip=240.127.1.1/24 --iptables=false
3+
ExecStart=/usr/bin/dockerd -H unix:// --storage-driver=overlay2 --bip=240.127.1.1/24 --iptables=false

0 commit comments

Comments
 (0)