@@ -40,7 +40,6 @@ RUN apt-get update && apt-get install -y \

 	bsdmainutils \

 	btrfs-tools \

 	build-essential \

-	clang \

 	cmake \

 	createrepo \

 	curl \

@@ -52,7 +51,6 @@ RUN apt-get update && apt-get install -y \

 	less \

 	libapparmor-dev \

 	libcap-dev \

-	libltdl-dev \

 	libnl-3-dev \

 	libprotobuf-c0-dev \

 	libprotobuf-dev \

@@ -116,14 +114,6 @@ RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \

 ENV PATH /go/bin:/usr/local/go/bin:$PATH

 ENV GOPATH /go

-# Compile Go for cross compilation

-ENV DOCKER_CROSSPLATFORMS \

-	linux/386 linux/arm \

-	darwin/amd64 \

-	freebsd/amd64 freebsd/386 freebsd/arm \

-	windows/amd64 windows/386 \

-	solaris/amd64

-

 # Dependency for golint

 ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3

 RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \

@@ -204,7 +194,7 @@ RUN useradd --create-home --gid docker unprivilegeduser

 VOLUME /var/lib/docker

 WORKDIR /go/src/github.com/docker/docker

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 # Let us use a .bashrc file

 RUN ln -sfv $PWD/.bashrc ~/.bashrc

@@ -227,7 +217,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \

 # Please edit hack/dockerfile/install-binaries.sh to update them.

 COPY hack/dockerfile/binaries-commits /tmp/binaries-commits

 COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh

-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy bindata dockercli

+RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli

 ENV PATH=/usr/local/cli:$PATH

 # Wrap all commands in the "docker-in-docker" script to allow nested containers

@@ -37,7 +37,6 @@ RUN apt-get update && apt-get install -y \

 	libapparmor-dev \

 	libc6-dev \

 	libcap-dev \

-	libltdl-dev \

 	libsystemd-dev \

 	libyaml-dev \

 	mercurial \

@@ -171,7 +170,7 @@ RUN useradd --create-home --gid docker unprivilegeduser

 VOLUME /var/lib/docker

 WORKDIR /go/src/github.com/docker/docker

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 # Let us use a .bashrc file

 RUN ln -sfv $PWD/.bashrc ~/.bashrc

@@ -39,7 +39,6 @@ RUN apt-get update && apt-get install -y \

 	net-tools \

 	libapparmor-dev \

 	libcap-dev \

-	libltdl-dev \

 	libsystemd-journal-dev \

 	libtool \

 	mercurial \

@@ -152,7 +151,7 @@ RUN useradd --create-home --gid docker unprivilegeduser

 VOLUME /var/lib/docker

 WORKDIR /go/src/github.com/docker/docker

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 # Let us use a .bashrc file

 RUN ln -sfv $PWD/.bashrc ~/.bashrc

@@ -40,7 +40,6 @@ RUN apt-get update && apt-get install -y \

 	net-tools \

 	libapparmor-dev \

 	libcap-dev \

-	libltdl-dev \

 	libsystemd-journal-dev \

 	libtool \

 	mercurial \

@@ -158,7 +157,7 @@ RUN useradd --create-home --gid docker unprivilegeduser

 VOLUME /var/lib/docker

 WORKDIR /go/src/github.com/docker/docker

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 # Let us use a .bashrc file

 RUN ln -sfv $PWD/.bashrc ~/.bashrc

@@ -36,7 +36,6 @@ RUN apt-get update && apt-get install -y \

 	net-tools \

 	libapparmor-dev \

 	libcap-dev \

-	libltdl-dev \

 	libsystemd-journal-dev \

 	libtool \

 	mercurial \

@@ -15,6 +15,5 @@ RUN pkg install --accept \

 		developer/gcc-*

 ENV GOPATH /go/:/usr/lib/gocode/1.5/

-ENV DOCKER_CROSSPLATFORMS solaris/amd64

 WORKDIR /go/src/github.com/docker/docker

 COPY . /go/src/github.com/docker/docker

@@ -17,7 +17,7 @@ export DOCKER_GITCOMMIT

 # to allow things like `make KEEPBUNDLE=1 binary` easily

 # `project/PACKAGERS.md` have some limited documentation of some of these

 DOCKER_ENVS := \

-	$(if $(DOCKER_CROSSPLATFORMS), -e DOCKER_CROSSPLATFORMS) \

+	-e DOCKER_CROSSPLATFORMS \

 	-e BUILD_APT_MIRROR \

 	-e BUILDFLAGS \

 	-e KEEPBUNDLE \

@@ -5,7 +5,7 @@

 FROM aarch64/debian:jessie

 RUN echo deb http://ftp.debian.org/debian jessie-backports main > /etc/apt/sources.list.d/backports.list

-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev pkg-config vim-common libsystemd-journal-dev golang-1.6-go libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-journal-dev golang-1.6-go libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100

@@ -21,5 +21,5 @@ ENV PATH /usr/src/go/bin:$PATH

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux seccomp

+ENV DOCKER_BUILDTAGS apparmor selinux seccomp

 ENV RUNC_BUILDTAGS apparmor selinux seccomp

@@ -4,7 +4,7 @@

 FROM aarch64/debian:stretch

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

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-dev golang-go libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 # Install Go

 # aarch64 doesn't have official go binaries, so use the version of go installed from

@@ -18,5 +18,5 @@ ENV PATH /usr/src/go/bin:$PATH

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux seccomp

+ENV DOCKER_BUILDTAGS apparmor selinux seccomp

 ENV RUNC_BUILDTAGS apparmor selinux seccomp

@@ -38,7 +38,7 @@ for version in "${versions[@]}"; do

 	EOF

-	dockerBuildTags='apparmor pkcs11 selinux'

+	dockerBuildTags='apparmor selinux'

 	runcBuildTags='apparmor selinux'

 	# this list is sorted alphabetically; please keep it that way

@@ -55,7 +55,6 @@ for version in "${versions[@]}"; do

 		git # for "git commit" info in "docker -v"

 		libapparmor-dev # for "sys/apparmor.h"

 		libdevmapper-dev # for "libdevmapper.h"

-		libltdl-dev # for pkcs11 "ltdl.h"

 		pkg-config # for detecting things like libsystemd-journal dynamically

 		vim-common # tini dep

 	)

@@ -4,7 +4,7 @@

 FROM aarch64/ubuntu:trusty

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

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-journal-dev golang-1.6-go --no-install-recommends && rm -rf /var/lib/apt/lists/*

 RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100

@@ -20,5 +20,5 @@ ENV PATH /usr/src/go/bin:$PATH

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

+ENV DOCKER_BUILDTAGS apparmor selinux

 ENV RUNC_BUILDTAGS apparmor selinux

@@ -4,7 +4,7 @@

 FROM aarch64/ubuntu:xenial

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

+RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libsystemd-dev golang-go libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 # Install Go

 # aarch64 doesn't have official go binaries, so use the version of go installed from

@@ -18,5 +18,5 @@ ENV PATH /usr/src/go/bin:$PATH

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux seccomp

+ENV DOCKER_BUILDTAGS apparmor selinux seccomp

 ENV RUNC_BUILDTAGS apparmor selinux seccomp

@@ -8,7 +8,7 @@ FROM debian:jessie

 ARG APT_MIRROR=deb.debian.org

 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -16,5 +16,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

+ENV DOCKER_BUILDTAGS apparmor selinux

 ENV RUNC_BUILDTAGS apparmor selinux

@@ -8,7 +8,7 @@ FROM debian:stretch

 ARG APT_MIRROR=deb.debian.org

 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -16,5 +16,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -10,7 +10,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d/backports.list

 RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/*

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

+RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev  pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -18,5 +18,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

+ENV DOCKER_BUILDTAGS apparmor selinux

 ENV RUNC_BUILDTAGS apparmor selinux

@@ -57,7 +57,7 @@ for version in "${versions[@]}"; do

 		echo "" >> "$version/Dockerfile"

 	fi

-	extraBuildTags='pkcs11'

+	extraBuildTags=

 	runcBuildTags=

 	# this list is sorted alphabetically; please keep it that way

@@ -74,7 +74,6 @@ for version in "${versions[@]}"; do

 		git # for "git commit" info in "docker -v"

 		libapparmor-dev # for "sys/apparmor.h"

 		libdevmapper-dev # for "libdevmapper.h"

-		libltdl-dev # for pkcs11 "ltdl.h"

 		libseccomp-dev  # for "seccomp.h" & "libseccomp.so"

 		pkg-config # for detecting things like libsystemd-journal dynamically

 		vim-common # tini dep

@@ -4,7 +4,7 @@

 FROM ubuntu:trusty

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

+ENV DOCKER_BUILDTAGS apparmor selinux

 ENV RUNC_BUILDTAGS apparmor selinux

@@ -4,7 +4,7 @@

 FROM ubuntu:xenial

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -4,7 +4,7 @@

 FROM ubuntu:yakkety

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -4,7 +4,7 @@

 FROM ubuntu:zesty

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -8,7 +8,7 @@ FROM armhf/debian:jessie

 ARG APT_MIRROR=deb.debian.org

 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local

@@ -16,5 +16,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

+ENV DOCKER_BUILDTAGS apparmor selinux

 ENV RUNC_BUILDTAGS apparmor selinux

@@ -59,7 +59,7 @@ for version in "${versions[@]}"; do

 		echo "" >> "$version/Dockerfile"

 	fi

-	extraBuildTags='pkcs11'

+	extraBuildTags=

 	runcBuildTags=

 	# this list is sorted alphabetically; please keep it that way

@@ -76,7 +76,6 @@ for version in "${versions[@]}"; do

 		git # for "git commit" info in "docker -v"

 		libapparmor-dev # for "sys/apparmor.h"

 		libdevmapper-dev # for "libdevmapper.h"

-		libltdl-dev # for pkcs11 "ltdl.h"

 		libseccomp-dev  # for "seccomp.h" & "libseccomp.so"

 		pkg-config # for detecting things like libsystemd-journal dynamically

 		vim-common # tini dep

@@ -8,7 +8,7 @@ FROM resin/rpi-raspbian:jessie

 ARG APT_MIRROR=deb.debian.org

 RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

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

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

 ENV GO_VERSION 1.8.3

 # GOARM is the ARM architecture version which is unrelated to the above Golang version

@@ -18,5 +18,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

+ENV DOCKER_BUILDTAGS apparmor selinux

 ENV RUNC_BUILDTAGS apparmor selinux

@@ -4,7 +4,7 @@

 FROM armhf/ubuntu:trusty

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

+ENV DOCKER_BUILDTAGS apparmor selinux

 ENV RUNC_BUILDTAGS apparmor selinux

@@ -4,7 +4,7 @@

 FROM armhf/ubuntu:xenial

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -4,7 +4,7 @@

 FROM armhf/ubuntu:yakkety

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -36,7 +36,7 @@ for version in "${versions[@]}"; do

 	EOF

-	extraBuildTags='pkcs11'

+	extraBuildTags=

 	runcBuildTags=

 	# this list is sorted alphabetically; please keep it that way

@@ -53,13 +53,12 @@ for version in "${versions[@]}"; do

 		git # for "git commit" info in "docker -v"

 		libapparmor-dev # for "sys/apparmor.h"

 		libdevmapper-dev # for "libdevmapper.h"

-		libltdl-dev # for pkcs11 "ltdl.h"

 		pkg-config # for detecting things like libsystemd-journal dynamically

 		vim-common # tini dep

 	)

 	case "$suite" in

-		trusty) 

+		trusty)

 			packages+=( libsystemd-journal-dev )

 			;;

 		*)

@@ -82,7 +81,7 @@ for version in "${versions[@]}"; do

 			runcBuildTags="apparmor seccomp selinux"

 			;;

 	esac

-	

+

 	# update and install packages

 	echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"

 	echo >> "$version/Dockerfile"

@@ -4,7 +4,7 @@

 FROM ppc64le/ubuntu:trusty

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

+ENV DOCKER_BUILDTAGS apparmor selinux

 ENV RUNC_BUILDTAGS apparmor selinux

@@ -4,7 +4,7 @@

 FROM ppc64le/ubuntu:xenial

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -4,7 +4,7 @@

 FROM ppc64le/ubuntu:yakkety

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 ENV RUNC_BUILDTAGS apparmor seccomp selinux

@@ -36,7 +36,7 @@ for version in "${versions[@]}"; do

 	EOF

-	extraBuildTags='pkcs11'

+	extraBuildTags=

 	runcBuildTags=

 	# this list is sorted alphabetically; please keep it that way

@@ -53,7 +53,6 @@ for version in "${versions[@]}"; do

 		git # for "git commit" info in "docker -v"

 		libapparmor-dev # for "sys/apparmor.h"

 		libdevmapper-dev # for "libdevmapper.h"

-		libltdl-dev # for pkcs11 "ltdl.h"

 		libseccomp-dev  # for "seccomp.h" & "libseccomp.so"

 		pkg-config # for detecting things like libsystemd-journal dynamically

 		libsystemd-dev

@@ -4,7 +4,7 @@

 FROM s390x/ubuntu:xenial

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

+ENV DOCKER_BUILDTAGS apparmor selinux

 ENV RUNC_BUILDTAGS apparmor selinux

@@ -4,7 +4,7 @@

 FROM s390x/ubuntu:yakkety

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

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

 ENV GO_VERSION 1.8.3

 RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local

@@ -12,5 +12,5 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor seccomp selinux

 ENV RUNC_BUILDTAGS apparmor selinux seccomp

@@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS seccomp selinux

 ENV RUNC_BUILDTAGS seccomp selinux

@@ -14,6 +14,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS seccomp selinux

 ENV RUNC_BUILDTAGS seccomp selinux

@@ -14,6 +14,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS seccomp selinux

 ENV RUNC_BUILDTAGS seccomp selinux

@@ -14,6 +14,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS seccomp selinux

 ENV RUNC_BUILDTAGS seccomp selinux

@@ -42,7 +42,7 @@ for version in "${versions[@]}"; do

 	echo >> "$version/Dockerfile"

-	extraBuildTags='pkcs11'

+	extraBuildTags=

 	runcBuildTags=

 	case "$from" in

@@ -78,7 +78,7 @@ for version in "${versions[@]}"; do

 			echo 'RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build' >> "$version/Dockerfile"

 			;;

 		photon:*)

-			echo "RUN ${installer} install -y wget curl ca-certificates gzip make rpm-build sed gcc linux-api-headers glibc-devel binutils libseccomp libltdl-devel elfutils" >> "$version/Dockerfile"

+			echo "RUN ${installer} install -y wget curl ca-certificates gzip make rpm-build sed gcc linux-api-headers glibc-devel binutils libseccomp elfutils" >> "$version/Dockerfile"

 			;;

 		*)

 			echo "RUN ${installer} install -y @development-tools fedora-packager" >> "$version/Dockerfile"

@@ -91,7 +91,6 @@ for version in "${versions[@]}"; do

 		glibc-static

 		libseccomp-devel # for "seccomp.h" & "libseccomp.so"

 		libselinux-devel # for "libselinux.so"

-		libtool-ltdl-devel # for pkcs11 "ltdl.h"

 		pkgconfig # for the pkg-config command

 		selinux-policy

 		selinux-policy-devel

@@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 selinux

+ENV DOCKER_BUILDTAGS selinux

 ENV RUNC_BUILDTAGS selinux

@@ -16,7 +16,7 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 selinux

+ENV DOCKER_BUILDTAGS selinux

 ENV RUNC_BUILDTAGS selinux

 ENV CGO_CPPFLAGS -D__EXPORTED_HEADERS__ \

@@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS seccomp selinux

 ENV RUNC_BUILDTAGS seccomp selinux

@@ -4,7 +4,7 @@

 FROM photon:1.0

-RUN tdnf install -y wget curl ca-certificates gzip make rpm-build sed gcc linux-api-headers glibc-devel binutils libseccomp libltdl-devel elfutils

+RUN tdnf install -y wget curl ca-certificates gzip make rpm-build sed gcc linux-api-headers glibc-devel binutils libseccomp elfutils

 RUN tdnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common

 ENV GO_VERSION 1.8.3

@@ -13,6 +13,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS seccomp selinux

 ENV RUNC_BUILDTAGS seccomp selinux

@@ -15,6 +15,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS seccomp selinux

 ENV RUNC_BUILDTAGS seccomp selinux

@@ -52,7 +52,7 @@ for version in "${versions[@]}"; do

 	echo >> "$version/Dockerfile"

-	extraBuildTags='pkcs11'

+	extraBuildTags=

 	runcBuildTags=

 	case "$from" in

@@ -85,7 +85,6 @@ for version in "${versions[@]}"; do

 		glibc-static

 		libseccomp-devel # for "seccomp.h" & "libseccomp.so"

 		libselinux-devel # for "libselinux.so"

-		libtool-ltdl-devel # for pkcs11 "ltdl.h"

 		pkgconfig # for the pkg-config command

 		selinux-policy

 		selinux-policy-devel

@@ -14,6 +14,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS seccomp selinux

 ENV RUNC_BUILDTAGS seccomp selinux

@@ -14,6 +14,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS seccomp selinux

 ENV RUNC_BUILDTAGS seccomp selinux

@@ -39,7 +39,7 @@ for version in "${versions[@]}"; do

 	echo >> "$version/Dockerfile"

-	extraBuildTags='pkcs11'

+	extraBuildTags=

 	runcBuildTags=

 	case "$from" in

@@ -76,7 +76,6 @@ for version in "${versions[@]}"; do

 		glibc-static

 		libseccomp-devel # for "seccomp.h" & "libseccomp.so"

 		libselinux-devel # for "libselinux.so"

-		libtool-ltdl-devel # for pkcs11 "ltdl.h"

 		pkgconfig # for the pkg-config command

 		selinux-policy

 		selinux-policy-devel

@@ -15,6 +15,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 selinux

+ENV DOCKER_BUILDTAGS selinux

 ENV RUNC_BUILDTAGS selinux

@@ -14,6 +14,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux

+ENV DOCKER_BUILDTAGS seccomp selinux

 ENV RUNC_BUILDTAGS seccomp selinux

 RUN ln -s /usr/bin/gcc /usr/bin/s390x-linux-gnu-gcc

@@ -50,7 +50,7 @@ for version in "${versions[@]}"; do

 	echo >> "$version/Dockerfile"

-	extraBuildTags='pkcs11'

+	extraBuildTags=''

 	runcBuildTags=

 	case "$from" in

@@ -75,7 +75,6 @@ for version in "${versions[@]}"; do

 		glibc-static

 		libseccomp-devel # for "seccomp.h" & "libseccomp.so"

 		libselinux-devel # for "libselinux.so"

-		libtool-ltdl-devel # for pkcs11 "ltdl.h"

 		pkgconfig # for the pkg-config command

 		selinux-policy

 		selinux-policy-devel

@@ -15,6 +15,6 @@ ENV PATH $PATH:/usr/local/go/bin

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS pkcs11 selinux

+ENV DOCKER_BUILDTAGS selinux

 ENV RUNC_BUILDTAGS selinux

 RUN ln -s /usr/bin/gcc /usr/bin/s390x-linux-gnu-gcc

@@ -20,17 +20,6 @@ if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARC

 	esac

 fi

-if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ]; then

-	if  [ "${GOOS}/${GOARCH}" == "darwin/amd64" ]; then

-		export CGO_ENABLED=1

-		export CC=o64-clang

-		export LDFLAGS='-linkmode external -s'

-		export LDFLAGS_STATIC_DOCKER='-extld='${CC}

-	else

-		export BUILDFLAGS=( "${BUILDFLAGS[@]/pkcs11 /}" ) # we cannot dlopen in pkcs11 in a static binary

-	fi

-fi

-

 echo "Building: $DEST/$BINARY_FULLNAME"

 go build \

 	-o "$DEST/$BINARY_FULLNAME" \

@@ -1,6 +1,5 @@

 #!/usr/bin/env bash

-DOCKER_CLIENT_BINARY_NAME='docker'

 DOCKER_DAEMON_BINARY_NAME='dockerd'

 DOCKER_RUNC_BINARY_NAME='docker-runc'

 DOCKER_CONTAINERD_BINARY_NAME='docker-containerd'