Skip to content

Commit 179479c

Browse files
LK4D4LK4D4
committed
project: unify way of installing runc and containerd
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
1 parent 9f30c28 commit 179479c

File tree

5 files changed

+46
-52
lines changed

5 files changed

+46
-52
lines changed

‎hack/dockerfile/install-binaries.sh‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,28 @@ GRIMES_COMMIT=15ecf9414859b16a8a19ac6748a622a5498d57e3
99

1010
export GOPATH="$(mktemp -d)"
1111

12+
RUNC_BUILDTAGS="${RUNC_BUILDTAGS:-"seccomp apparmor selinux"}"
13+
14+
install_runc() {
15+
echo "Install runc version $RUNC_COMMIT"
16+
git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc"
17+
cd "$GOPATH/src/github.com/opencontainers/runc"
18+
git checkout -q "$RUNC_COMMIT"
19+
make BUILDTAGS="$RUNC_BUILDTAGS" $1
20+
cp runc /usr/local/bin/docker-runc
21+
}
22+
23+
install_containerd() {
24+
echo "Install containerd version $CONTAINERD_COMMIT"
25+
git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd"
26+
cd "$GOPATH/src/github.com/docker/containerd"
27+
git checkout -q "$CONTAINERD_COMMIT"
28+
make $1
29+
cp bin/containerd /usr/local/bin/docker-containerd
30+
cp bin/containerd-shim /usr/local/bin/docker-containerd-shim
31+
cp bin/ctr /usr/local/bin/docker-containerd-ctr
32+
}
33+
1234
for prog in "$@"
1335
do
1436
case $prog in
@@ -20,23 +42,19 @@ do
2042
;;
2143

2244
runc)
23-
echo "Install runc version $RUNC_COMMIT"
24-
git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc"
25-
cd "$GOPATH/src/github.com/opencontainers/runc"
26-
git checkout -q "$RUNC_COMMIT"
27-
make static BUILDTAGS="seccomp apparmor selinux"
28-
cp runc /usr/local/bin/docker-runc
45+
install_runc static
46+
;;
47+
48+
runc-dynamic)
49+
install_runc
2950
;;
3051

3152
containerd)
32-
echo "Install containerd version $CONTAINERD_COMMIT"
33-
git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd"
34-
cd "$GOPATH/src/github.com/docker/containerd"
35-
git checkout -q "$CONTAINERD_COMMIT"
36-
make static
37-
cp bin/containerd /usr/local/bin/docker-containerd
38-
cp bin/containerd-shim /usr/local/bin/docker-containerd-shim
39-
cp bin/ctr /usr/local/bin/docker-containerd-ctr
53+
install_containerd static
54+
;;
55+
56+
containerd-dynamic)
57+
install_containerd
4058
;;
4159

4260
grimes)

‎hack/make/.build-deb/rules‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ override_dh_auto_install:
2525
cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary-client/docker)" debian/docker-engine/usr/bin/docker
2626
cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary-daemon/dockerd)" debian/docker-engine/usr/bin/dockerd
2727
cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary-daemon/docker-proxy)" debian/docker-engine/usr/bin/docker-proxy
28-
cp -aT /usr/local/bin/containerd debian/docker-engine/usr/bin/docker-containerd
29-
cp -aT /usr/local/bin/containerd-shim debian/docker-engine/usr/bin/docker-containerd-shim
30-
cp -aT /usr/local/bin/ctr debian/docker-engine/usr/bin/docker-containerd-ctr
31-
cp -aT /usr/local/sbin/runc debian/docker-engine/usr/bin/docker-runc
28+
cp -aT /usr/local/bin/docker-containerd debian/docker-engine/usr/bin/docker-containerd
29+
cp -aT /usr/local/bin/docker-containerd-shim debian/docker-engine/usr/bin/docker-containerd-shim
30+
cp -aT /usr/local/bin/docker-containerd-ctr debian/docker-engine/usr/bin/docker-containerd-ctr
31+
cp -aT /usr/local/bin/docker-runc debian/docker-engine/usr/bin/docker-runc
3232
mkdir -p debian/docker-engine/usr/lib/docker
3333

3434
override_dh_installinit:

‎hack/make/.build-rpm/docker-engine.spec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ install -p -m 755 bundles/%{_origversion}/dynbinary-daemon/dockerd-%{_origversio
129129
install -p -m 755 bundles/%{_origversion}/dynbinary-daemon/docker-proxy-%{_origversion} $RPM_BUILD_ROOT/%{_bindir}/docker-proxy
130130

131131
# install containerd
132-
install -p -m 755 /usr/local/bin/containerd $RPM_BUILD_ROOT/%{_bindir}/docker-containerd
133-
install -p -m 755 /usr/local/bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-shim
134-
install -p -m 755 /usr/local/bin/ctr $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-ctr
132+
install -p -m 755 /usr/local/bin/docker-containerd $RPM_BUILD_ROOT/%{_bindir}/docker-containerd
133+
install -p -m 755 /usr/local/bin/docker-containerd-shim $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-shim
134+
install -p -m 755 /usr/local/bin/docker-containerd-ctr $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-ctr
135135

136136
# install runc
137-
install -p -m 755 /usr/local/sbin/runc $RPM_BUILD_ROOT/%{_bindir}/docker-runc
137+
install -p -m 755 /usr/local/bin/docker-runc $RPM_BUILD_ROOT/%{_bindir}/docker-runc
138138

139139
# install udev rules
140140
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d

‎hack/make/build-deb‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,11 @@ set -e
7272
&& ln -snf /usr/src/docker /go/src/github.com/docker/docker
7373
EOF
7474

75-
echo "ENV RUNC_COMMIT $(grep "^RUNC_COMMIT" hack/dockerfile/install-binaries.sh | cut -d"=" -f 2)" >> "$DEST/$version/Dockerfile.build"
76-
echo "ENV CONTAINERD_COMMIT $(grep "^CONTAINERD_COMMIT" hack/dockerfile/install-binaries.sh | cut -d"=" -f 2)" >> "$DEST/$version/Dockerfile.build"
77-
78-
# add runc and containerd compile and install
7975
cat >> "$DEST/$version/Dockerfile.build" <<-EOF
80-
# Install runc
81-
RUN git clone https://github.com/opencontainers/runc.git "/go/src/github.com/opencontainers/runc" \
82-
&& cd "/go/src/github.com/opencontainers/runc" \
83-
&& git checkout -q "\$RUNC_COMMIT"
84-
RUN set -x && export GOPATH="/go" && cd "/go/src/github.com/opencontainers/runc" \
85-
&& make BUILDTAGS="\$RUNC_BUILDTAGS" && make install
86-
# Install containerd
87-
RUN git clone https://github.com/docker/containerd.git "/go/src/github.com/docker/containerd" \
88-
&& cd "/go/src/github.com/docker/containerd" \
89-
&& git checkout -q "\$CONTAINERD_COMMIT"
90-
RUN set -x && export GOPATH="/go" && cd "/go/src/github.com/docker/containerd" && make && make install
76+
# Install runc and containerd
77+
RUN ./hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic
9178
EOF
79+
9280
if [ "$DOCKER_EXPERIMENTAL" ]; then
9381
echo 'ENV DOCKER_EXPERIMENTAL 1' >> "$DEST/$version/Dockerfile.build"
9482
fi

‎hack/make/build-rpm‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,11 @@ set -e
9292
RUN mkdir -p /go/src/github.com/docker && mkdir -p /go/src/github.com/opencontainers
9393
EOF
9494

95-
echo "ENV RUNC_COMMIT $(grep "^RUNC_COMMIT" hack/dockerfile/install-binaries.sh | cut -d"=" -f 2)" >> "$DEST/$version/Dockerfile.build"
96-
echo "ENV CONTAINERD_COMMIT $(grep "^CONTAINERD_COMMIT" hack/dockerfile/install-binaries.sh | cut -d"=" -f 2)" >> "$DEST/$version/Dockerfile.build"
97-
98-
# add runc and containerd compile and install
9995
cat >> "$DEST/$version/Dockerfile.build" <<-EOF
100-
# Install runc
101-
RUN git clone https://github.com/opencontainers/runc.git "/go/src/github.com/opencontainers/runc" \
102-
&& cd "/go/src/github.com/opencontainers/runc" \
103-
&& git checkout -q "\$RUNC_COMMIT"
104-
RUN set -x && export GOPATH="/go" && cd "/go/src/github.com/opencontainers/runc" \
105-
&& make BUILDTAGS="\$RUNC_BUILDTAGS" && make install
106-
# Install containerd
107-
RUN git clone https://github.com/docker/containerd.git "/go/src/github.com/docker/containerd" \
108-
&& cd "/go/src/github.com/docker/containerd" \
109-
&& git checkout -q "\$CONTAINERD_COMMIT"
110-
RUN set -x && export GOPATH="/go" && cd "/go/src/github.com/docker/containerd" && make && make install
96+
# Install runc and containerd
97+
RUN ./hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic
11198
EOF
99+
112100
if [ "$DOCKER_EXPERIMENTAL" ]; then
113101
echo 'ENV DOCKER_EXPERIMENTAL 1' >> "$DEST/$version/Dockerfile.build"
114102
fi

0 commit comments

Comments
 (0)