Skip to content

Commit bb66d71

Browse files
kencochranekencochrane
committed
Packaging changes required for new containerd binaries
These are the changes required due to the new binaries that containerd introduced. The rpm, and deb packages now include 5 binaries. docker, containerd, containerd-shim, ctr, and runc The tar files also include all 5 binaries. Signed-off-by: Ken Cochrane <[email protected]>
1 parent 38227b9 commit bb66d71

20 files changed

Lines changed: 119 additions & 23 deletions

File tree

‎contrib/builder/deb/amd64/debian-jessie/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ FROM debian:jessie
66

77
RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
88

9-
ENV GO_VERSION 1.5.3
9+
ENV GO_VERSION 1.6
1010
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
1111
ENV PATH $PATH:/usr/local/go/bin
1212

1313
ENV AUTO_GOPATH 1
1414

1515
ENV DOCKER_BUILDTAGS apparmor selinux
16+
ENV RUNC_BUILDTAGS apparmor selinux

‎contrib/builder/deb/amd64/debian-stretch/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ FROM debian:stretch
66

77
RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
88

9-
ENV GO_VERSION 1.5.3
9+
ENV GO_VERSION 1.6
1010
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
1111
ENV PATH $PATH:/usr/local/go/bin
1212

1313
ENV AUTO_GOPATH 1
1414

1515
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
16+
ENV RUNC_BUILDTAGS apparmor seccomp selinux

‎contrib/builder/deb/amd64/debian-wheezy/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ FROM debian:wheezy-backports
77
RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/*
88
RUN apt-get update && apt-get install -y apparmor bash-completion build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/*
99

10-
ENV GO_VERSION 1.5.3
10+
ENV GO_VERSION 1.6
1111
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
1212
ENV PATH $PATH:/usr/local/go/bin
1313

1414
ENV AUTO_GOPATH 1
1515

1616
ENV DOCKER_BUILDTAGS apparmor selinux
17+
ENV RUNC_BUILDTAGS apparmor selinux

‎contrib/builder/deb/amd64/generate.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ for version in "${versions[@]}"; do
4242
echo >> "$version/Dockerfile"
4343

4444
extraBuildTags=
45+
runcBuildTags=
4546

4647
# this list is sorted alphabetically; please keep it that way
4748
packages=(
@@ -64,7 +65,7 @@ for version in "${versions[@]}"; do
6465
# packaging for "sd-journal.h" and libraries varies
6566
case "$suite" in
6667
precise|wheezy) ;;
67-
sid|stretch|wily) packages+=( libsystemd-dev );;
68+
sid|stretch|wily|xenial) packages+=( libsystemd-dev );;
6869
*) packages+=( libsystemd-journal-dev );;
6970
esac
7071

@@ -73,9 +74,11 @@ for version in "${versions[@]}"; do
7374
case "$suite" in
7475
precise|wheezy|jessie|trusty)
7576
packages=( "${packages[@]/libseccomp-dev}" )
77+
runcBuildTags="apparmor selinux"
7678
;;
7779
*)
7880
extraBuildTags+=' seccomp'
81+
runcBuildTags="apparmor seccomp selinux"
7982
;;
8083
esac
8184

@@ -124,4 +127,5 @@ for version in "${versions[@]}"; do
124127
buildTags=$( echo "apparmor selinux $extraBuildTags" | xargs -n1 | sort -n | tr '\n' ' ' | sed -e 's/[[:space:]]*$//' )
125128

126129
echo "ENV DOCKER_BUILDTAGS $buildTags" >> "$version/Dockerfile"
130+
echo "ENV RUNC_BUILDTAGS $runcBuildTags" >> "$version/Dockerfile"
127131
done

‎contrib/builder/deb/amd64/ubuntu-precise/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ FROM ubuntu:precise
66

77
RUN apt-get update && apt-get install -y apparmor bash-completion build-essential curl ca-certificates debhelper dh-apparmor git libapparmor-dev libltdl-dev libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/*
88

9-
ENV GO_VERSION 1.5.3
9+
ENV GO_VERSION 1.6
1010
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
1111
ENV PATH $PATH:/usr/local/go/bin
1212

1313
ENV AUTO_GOPATH 1
1414

1515
ENV DOCKER_BUILDTAGS apparmor exclude_graphdriver_btrfs exclude_graphdriver_devicemapper selinux
16+
ENV RUNC_BUILDTAGS apparmor selinux

‎contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ FROM ubuntu:trusty
66

77
RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
88

9-
ENV GO_VERSION 1.5.3
9+
ENV GO_VERSION 1.6
1010
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
1111
ENV PATH $PATH:/usr/local/go/bin
1212

1313
ENV AUTO_GOPATH 1
1414

1515
ENV DOCKER_BUILDTAGS apparmor selinux
16+
ENV RUNC_BUILDTAGS apparmor selinux

‎contrib/builder/deb/amd64/ubuntu-wily/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ FROM ubuntu:wily
66

77
RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
88

9-
ENV GO_VERSION 1.5.3
9+
ENV GO_VERSION 1.6
1010
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
1111
ENV PATH $PATH:/usr/local/go/bin
1212

1313
ENV AUTO_GOPATH 1
1414

1515
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
16+
ENV RUNC_BUILDTAGS apparmor seccomp selinux

‎contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"!
3+
#
4+
5+
FROM ubuntu:xenial
6+
7+
RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
8+
9+
ENV GO_VERSION 1.6
10+
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
11+
ENV PATH $PATH:/usr/local/go/bin
12+
13+
ENV AUTO_GOPATH 1
14+
15+
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
16+
ENV RUNC_BUILDTAGS apparmor seccomp selinux

‎contrib/builder/rpm/amd64/centos-7/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ FROM centos:7
66

77
RUN yum groupinstall -y "Development Tools"
88
RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs
9-
RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar
9+
RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git
1010

11-
ENV GO_VERSION 1.5.3
11+
ENV GO_VERSION 1.6
1212
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
1313
ENV PATH $PATH:/usr/local/go/bin
1414

1515
ENV AUTO_GOPATH 1
1616

1717
ENV DOCKER_BUILDTAGS selinux
18+
ENV RUNC_BUILDTAGS selinux
1819

‎contrib/builder/rpm/amd64/fedora-22/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
FROM fedora:22
66

77
RUN dnf install -y @development-tools fedora-packager
8-
RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar
8+
RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git
99

10-
ENV GO_VERSION 1.5.3
10+
ENV GO_VERSION 1.6
1111
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
1212
ENV PATH $PATH:/usr/local/go/bin
1313

1414
ENV AUTO_GOPATH 1
1515

1616
ENV DOCKER_BUILDTAGS seccomp selinux
17+
ENV RUNC_BUILDTAGS seccomp selinux
1718

0 commit comments

Comments
 (0)