@@ -1,15 +1,20 @@

+#

+# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!

+#

+

 FROM armhf/debian:jessie

-# allow replacing httpredir mirror

-ARG APT_MIRROR=httpredir.debian.org

-RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list

+# allow replacing httpredir or deb mirror

+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 libsqlite3-dev libsystemd-journal-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 libltdl-dev  libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.7.3

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

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

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor selinux

+

+ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

 ENV RUNC_BUILDTAGS apparmor selinux

new file mode 100755

@@ -0,0 +1,158 @@

+#!/bin/bash

+set -e

+

+# usage: ./generate.sh [versions]

+#    ie: ./generate.sh

+#        to update all Dockerfiles in this directory

+#    or: ./generate.sh debian-jessie

+#        to only update debian-jessie/Dockerfile

+#    or: ./generate.sh debian-newversion

+#        to create a new folder and a Dockerfile within it

+

+cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

+

+versions=( "$@" )

+if [ ${#versions[@]} -eq 0 ]; then

+	versions=( */ )

+fi

+versions=( "${versions[@]%/}" )

+

+for version in "${versions[@]}"; do

+	distro="${version%-*}"

+	suite="${version##*-}"

+	from="${distro}:${suite}"

+

+	case "$from" in

+		raspbian:jessie)

+			from="resin/rpi-raspbian:jessie"

+			;;

+		*)

+			from="armhf/$from"

+			;;

+	esac

+

+	mkdir -p "$version"

+	echo "$version -> FROM $from"

+	cat > "$version/Dockerfile" <<-EOF

+		#

+		# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!

+		#

+

+		FROM $from

+	EOF

+

+	echo >> "$version/Dockerfile"

+

+	if [[ "$distro" = "debian" || "$distro" = "raspbian" ]]; then

+		cat >> "$version/Dockerfile" <<-'EOF'

+			# allow replacing httpredir or deb mirror

+			ARG APT_MIRROR=deb.debian.org

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

+		EOF

+

+		if [ "$suite" = "wheezy" ]; then

+			cat >> "$version/Dockerfile" <<-'EOF'

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

+			EOF

+		fi

+

+		echo "" >> "$version/Dockerfile"

+	fi

+

+	extraBuildTags='pkcs11'

+	runcBuildTags=

+

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

+	packages=(

+		apparmor # for apparmor_parser for testing the profile

+		bash-completion # for bash-completion debhelper integration

+		btrfs-tools # for "btrfs/ioctl.h" (and "version.h" if possible)

+		build-essential # "essential for building Debian packages"

+		cmake # tini dep

+		curl ca-certificates # for downloading Go

+		debhelper # for easy ".deb" building

+		dh-apparmor # for apparmor debhelper

+		dh-systemd # for systemd debhelper integration

+		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"

+		libsqlite3-dev # for "sqlite3.h"

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

+		vim-common # tini dep

+	)

+	# packaging for "sd-journal.h" and libraries varies

+	case "$suite" in

+		precise|wheezy) ;;

+		jessie|trusty) packages+=( libsystemd-journal-dev );;

+		*) packages+=( libsystemd-dev );;

+	esac

+

+	# debian wheezy & ubuntu precise do not have the right libseccomp libs

+	# debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :(

+	case "$suite" in

+		precise|wheezy|jessie|trusty)

+			packages=( "${packages[@]/libseccomp-dev}" )

+			runcBuildTags="apparmor selinux"

+			;;

+		*)

+			extraBuildTags+=' seccomp'

+			runcBuildTags="apparmor seccomp selinux"

+			;;

+	esac

+

+

+	if [ "$suite" = 'precise' ]; then

+		# precise has a few package issues

+

+		# - dh-systemd doesn't exist at all

+		packages=( "${packages[@]/dh-systemd}" )

+

+		# - libdevmapper-dev is missing critical structs (too old)

+		packages=( "${packages[@]/libdevmapper-dev}" )

+		extraBuildTags+=' exclude_graphdriver_devicemapper'

+

+		# - btrfs-tools is missing "ioctl.h" (too old), so it's useless

+		#   (since kernels on precise are old too, just skip btrfs entirely)

+		packages=( "${packages[@]/btrfs-tools}" )

+		extraBuildTags+=' exclude_graphdriver_btrfs'

+	fi

+

+	if [ "$suite" = 'wheezy' ]; then

+		# pull a couple packages from backports explicitly

+		# (build failures otherwise)

+		backportsPackages=( btrfs-tools )

+		for pkg in "${backportsPackages[@]}"; do

+			packages=( "${packages[@]/$pkg}" )

+		done

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

+	fi

+

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

+

+	echo >> "$version/Dockerfile"

+

+	awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../../Dockerfile >> "$version/Dockerfile"

+	if [ "$distro" == 'raspbian' ];

+	then

+		cat <<EOF >> "$version/Dockerfile"

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

+ENV GOARM 6

+EOF

+	fi

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

+	echo 'ENV PATH $PATH:/usr/local/go/bin' >> "$version/Dockerfile"

+

+	echo >> "$version/Dockerfile"

+

+	echo 'ENV AUTO_GOPATH 1' >> "$version/Dockerfile"

+

+	echo >> "$version/Dockerfile"

+

+	# print build tags in alphabetical order

+	buildTags=$( echo "apparmor selinux $extraBuildTags" | xargs -n1 | sort -n | tr '\n' ' ' | sed -e 's/[[:space:]]*$//' )

+

+	echo "ENV DOCKER_BUILDTAGS $buildTags" >> "$version/Dockerfile"

+	echo "ENV RUNC_BUILDTAGS $runcBuildTags" >> "$version/Dockerfile"

+done

@@ -1,10 +1,14 @@

+#

+# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!

+#

+

 FROM resin/rpi-raspbian:jessie

-# allow replacing httpredir mirror

-ARG APT_MIRROR=httpredir.debian.org

-RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list

+# allow replacing httpredir or deb mirror

+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 libsqlite3-dev libsystemd-journal-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 libltdl-dev  libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.7.3

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

@@ -13,5 +17,6 @@ RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar

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

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor selinux

+

+ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

 ENV RUNC_BUILDTAGS apparmor selinux

@@ -1,6 +1,10 @@

+#

+# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!

+#

+

 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 libsqlite3-dev pkg-config libsystemd-journal-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 libltdl-dev  libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.7.3

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

@@ -1,6 +1,10 @@

+#

+# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!

+#

+

 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 libsqlite3-dev libsystemd-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 btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.7.3

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

@@ -1,6 +1,10 @@

+#

+# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!

+#

+

 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 libsqlite3-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 libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*

 ENV GO_VERSION 1.7.3

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

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

 ENV AUTO_GOPATH 1

-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

-ENV RUNC_BUILDTAGS apparmor selinux

+ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

+ENV RUNC_BUILDTAGS apparmor seccomp selinux