@@ -1,4 +1,4 @@

-.PHONY: all binary dynbinary build cross deb help init-go-pkg-cache install manpages rpm run shell test test-docker-py test-integration test-unit validate win

+.PHONY: all binary dynbinary build cross help init-go-pkg-cache install manpages run shell test test-docker-py test-integration test-unit validate win

 # set the graph driver as the current graphdriver if not set

 DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info 2>&1 | grep "Storage Driver" | sed 's/.*: //'))

@@ -137,10 +137,6 @@ clean-pkg-cache-vol:

 cross: build ## cross build the binaries for darwin, freebsd and\nwindows

 	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross

-deb: build  ## build the deb packages

-	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary build-deb

-

-

 help: ## this help

 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)

@@ -150,9 +146,6 @@ init-go-pkg-cache:

 install: ## install the linux binaries

 	KEEPBUNDLE=1 hack/make.sh install-binary

-rpm: build ## build the rpm packages

-	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary build-rpm

-

 run: build ## run the docker daemon in a container

 	$(DOCKER_RUN_DOCKER) sh -c "KEEPBUNDLE=1 hack/make.sh install-binary run"

deleted file mode 100755

@@ -1,10 +0,0 @@

-#!/usr/bin/env bash

-set -e

-

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

-

-set -x

-./generate.sh

-for d in */; do

-	docker build -t "dockercore/builder-deb:$(basename "$d")" "$d"

-done

deleted file mode 100644

@@ -1,17 +0,0 @@

-#

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

-#

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor seccomp selinux

-ENV RUNC_BUILDTAGS apparmor seccomp selinux

deleted file mode 100644

@@ -1,16 +0,0 @@

-#

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

-#

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor seccomp selinux

-ENV RUNC_BUILDTAGS apparmor seccomp selinux

deleted file mode 100755

@@ -1,112 +0,0 @@

-#!/usr/bin/env bash

-set -e

-

-# This file is used to auto-generate Dockerfiles for making debs via 'make deb'

-#

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

-#    ie: ./generate.sh

-#        to update all Dockerfiles in this directory

-#    or: ./generate.sh ubuntu-trusty

-#        to only update ubuntu-trusty/Dockerfile

-#    or: ./generate.sh ubuntu-newversion

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

-#

-# Note: non-LTS versions are not guaranteed to work.

-

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

-

-versions=( "$@" )

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

-	versions=( */ )

-fi

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

-

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

-	echo "${versions[@]}"

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

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

-	from="aarch64/${distro}:${suite}"

-

-	mkdir -p "$version"

-	echo "$version -> FROM $from"

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

-		#

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

-		#

-

-		FROM $from

-

-	EOF

-

-	extraBuildTags='apparmor selinux'

-	runcBuildTags='apparmor selinux'

-

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

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

-		vim-common # tini dep

-	)

-

-	case "$suite" in

-		trusty)

-			packages+=( libsystemd-journal-dev )

-			;;

-		jessie)

-			packages+=( libsystemd-journal-dev )

-			packages+=( libseccomp-dev )

-

-			extraBuildTags+=' seccomp'

-			runcBuildTags+=' seccomp'

-			;;

-		stretch|xenial)

-			packages+=( libsystemd-dev )

-			packages+=( libseccomp-dev )

-

-			extraBuildTags+=' seccomp'

-			runcBuildTags+=' seccomp'

-			;;

-		*)

-			echo "Unsupported distro:" $distro:$suite

-			rm -fr "$version"

-			exit 1

-			;;

-	esac

-

-	case "$suite" in

-		jessie)

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

-			;;

-		*)

-			;;

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

-

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

-	echo 'RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.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 "$extraBuildTags" | xargs -n1 | sort -n | tr '\n' ' ' | sed -e 's/[[:space:]]*$//' )

-	runcBuildTags=$( echo "$runcBuildTags" | 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

deleted file mode 100644

@@ -1,16 +0,0 @@

-#

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

-#

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor selinux

-ENV RUNC_BUILDTAGS apparmor selinux

deleted file mode 100644

@@ -1,16 +0,0 @@

-#

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

-#

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor seccomp selinux

-ENV RUNC_BUILDTAGS apparmor seccomp selinux

deleted file mode 100644

@@ -1,5 +0,0 @@

-# `dockercore/builder-deb`

-

-This image's tags contain the dependencies for building Docker `.deb`s for each of the Debian-based platforms Docker targets.

-

-To add new tags, see [`contrib/builder/deb/amd64` in https://github.com/docker/docker](https://github.com/docker/docker/tree/master/contrib/builder/deb/amd64), specifically the `generate.sh` script, whose usage is described in a comment at the top of the file.

deleted file mode 100755

@@ -1,10 +0,0 @@

-#!/usr/bin/env bash

-set -e

-

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

-

-set -x

-./generate.sh

-for d in */; do

-	docker build -t "dockercore/builder-deb:$(basename "$d")" "$d"

-done

deleted file mode 100644

@@ -1,20 +0,0 @@

-#

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

-#

-

-FROM debian:jessie

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor selinux

-ENV RUNC_BUILDTAGS apparmor selinux

deleted file mode 100644

@@ -1,20 +0,0 @@

-#

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

-#

-

-FROM debian:stretch

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor seccomp selinux

-ENV RUNC_BUILDTAGS apparmor seccomp selinux

deleted file mode 100644

@@ -1,22 +0,0 @@

-#

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

-#

-

-FROM debian:wheezy-backports

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor selinux

-ENV RUNC_BUILDTAGS apparmor selinux

deleted file mode 100755

@@ -1,130 +0,0 @@

-#!/usr/bin/env 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

-		debian:wheezy)

-			# add -backports, like our users have to

-			from+='-backports'

-			;;

-	esac

-

-	mkdir -p "$version"

-	echo "$version -> FROM $from"

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

-		#

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

-		#

-

-		FROM $from

-	EOF

-

-	echo >> "$version/Dockerfile"

-

-	if [ "$distro" = "debian" ]; 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=

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

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

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

-		vim-common # tini dep

-	)

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

-	case "$suite" in

-		wheezy) ;;

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

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

-	esac

-

-	# debian wheezy does not have the right libseccomp libs

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

-	case "$suite" in

-		wheezy|jessie|trusty)

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

-			runcBuildTags="apparmor selinux"

-			;;

-		*)

-			extraBuildTags+=' seccomp'

-			runcBuildTags="apparmor seccomp selinux"

-			;;

-	esac

-

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

-	echo 'RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.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

deleted file mode 100644

@@ -1,16 +0,0 @@

-#

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

-#

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor selinux

-ENV RUNC_BUILDTAGS apparmor selinux

deleted file mode 100644

@@ -1,16 +0,0 @@

-#

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

-#

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor seccomp selinux

-ENV RUNC_BUILDTAGS apparmor seccomp selinux

deleted file mode 100644

@@ -1,16 +0,0 @@

-#

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

-#

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor seccomp selinux

-ENV RUNC_BUILDTAGS apparmor seccomp selinux

deleted file mode 100644

@@ -1,16 +0,0 @@

-#

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

-#

-

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

-

-ENV GO_VERSION 1.10.1

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

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

-

-ENV AUTO_GOPATH 1

-

-ENV DOCKER_BUILDTAGS apparmor seccomp selinux

-ENV RUNC_BUILDTAGS apparmor seccomp selinux

deleted file mode 100644

@@ -1,20 +0,0 @@

-#

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

-#

-

-FROM armhf/debian:jessie

-

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

-

-ENV GO_VERSION 1.10.1

-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 RUNC_BUILDTAGS apparmor selinux

deleted file mode 100755

@@ -1,139 +0,0 @@

-#!/usr/bin/env 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=

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

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

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

-		vim-common # tini dep

-	)

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

-	case "$suite" in

-		wheezy) ;;

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

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

-	esac

-

-	# debian wheezy does not have the right libseccomp libs

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

-	case "$suite" in

-		wheezy|jessie|trusty)

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

-			runcBuildTags="apparmor selinux"

-			;;

-		*)

-			extraBuildTags+=' seccomp'

-			runcBuildTags="apparmor seccomp selinux"

-			;;

-	esac

-

-	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.armhf >> "$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

deleted file mode 100644

@@ -1,22 +0,0 @@

-#

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

-#

-

-FROM resin/rpi-raspbian:jessie

-

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

-

-ENV GO_VERSION 1.10.1

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

-ENV GOARM 6

-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 RUNC_BUILDTAGS apparmor selinux

deleted file mode 100644

@@ -1,16 +0,0 @@

-#

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

-

-ENV GO_VERSION 1.10.1

-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 RUNC_BUILDTAGS apparmor selinux

deleted file mode 100644

@@ -1,16 +0,0 @@

-#

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

-

-ENV GO_VERSION 1.10.1

-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 seccomp selinux

-ENV RUNC_BUILDTAGS apparmor seccomp selinux

deleted file mode 100644

@@ -1,16 +0,0 @@

-#

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

-

-ENV GO_VERSION 1.10.1

-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 seccomp selinux

-ENV RUNC_BUILDTAGS apparmor seccomp selinux

deleted file mode 100755

@@ -1,10 +0,0 @@

-#!/usr/bin/env bash

-set -e 

-

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

-

-set -x

-./generate.sh

-for d in */; do

-	docker build -t "dockercore/builder-deb:$(basename "$d")" "$d"

-done

deleted file mode 100755

@@ -1,101 +0,0 @@

-#!/usr/bin/env bash

-set -e

-

-# This file is used to auto-generate Dockerfiles for making debs via 'make deb'

-#

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

-#    ie: ./generate.sh

-#        to update all Dockerfiles in this directory

-#    or: ./generate.sh ubuntu-xenial

-#        to only update ubuntu-xenial/Dockerfile

-#    or: ./generate.sh ubuntu-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

-	echo "${versions[@]}"

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

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

-	from="ppc64le/${distro}:${suite}"

-

-	mkdir -p "$version"

-	echo "$version -> FROM $from"

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

-		#

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

-		#

-

-		FROM $from

-

-	EOF

-

-	extraBuildTags=

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

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

-		vim-common # tini dep

-	)

-

-	case "$suite" in