Browse code
Add tini build deps to deb generation
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Michael Crosby authored on 2016/11/10 03:47:31Showing 17 changed files
- contrib/builder/deb/amd64/debian-jessie/Dockerfile
- contrib/builder/deb/amd64/debian-stretch/Dockerfile
- contrib/builder/deb/amd64/debian-wheezy/Dockerfile
- contrib/builder/deb/amd64/generate.sh
- contrib/builder/deb/amd64/ubuntu-precise/Dockerfile
- contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile
- contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile
- contrib/builder/deb/amd64/ubuntu-yakkety/Dockerfile
- contrib/builder/deb/armhf/debian-jessie/Dockerfile
- contrib/builder/deb/armhf/raspbian-jessie/Dockerfile
- contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile
- contrib/builder/deb/ppc64le/generate.sh
- contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile
- contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile
- contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile
- contrib/builder/deb/s390x/generate.sh
- contrib/builder/deb/s390x/ubuntu-xenial/Dockerfile
| ... | ... |
@@ -8,7 +8,7 @@ FROM debian:jessie |
| 8 | 8 |
ARG APT_MIRROR=deb.debian.org |
| 9 | 9 |
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list |
| 10 | 10 |
|
| 11 |
-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/* |
|
| 11 |
+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/* |
|
| 12 | 12 |
|
| 13 | 13 |
ENV GO_VERSION 1.7.3 |
| 14 | 14 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -8,7 +8,7 @@ FROM debian:stretch |
| 8 | 8 |
ARG APT_MIRROR=deb.debian.org |
| 9 | 9 |
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list |
| 10 | 10 |
|
| 11 |
-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/* |
|
| 11 |
+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/* |
|
| 12 | 12 |
|
| 13 | 13 |
ENV GO_VERSION 1.7.3 |
| 14 | 14 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -10,7 +10,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list |
| 10 | 10 |
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d/backports.list |
| 11 | 11 |
|
| 12 | 12 |
RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/* |
| 13 |
-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/* |
|
| 13 |
+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 libsqlite3-dev pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 14 | 14 |
|
| 15 | 15 |
ENV GO_VERSION 1.7.3 |
| 16 | 16 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -66,6 +66,7 @@ for version in "${versions[@]}"; do
|
| 66 | 66 |
bash-completion # for bash-completion debhelper integration |
| 67 | 67 |
btrfs-tools # for "btrfs/ioctl.h" (and "version.h" if possible) |
| 68 | 68 |
build-essential # "essential for building Debian packages" |
| 69 |
+ cmake # tini dep |
|
| 69 | 70 |
curl ca-certificates # for downloading Go |
| 70 | 71 |
debhelper # for easy ".deb" building |
| 71 | 72 |
dh-apparmor # for apparmor debhelper |
| ... | ... |
@@ -77,6 +78,7 @@ for version in "${versions[@]}"; do
|
| 77 | 77 |
libseccomp-dev # for "seccomp.h" & "libseccomp.so" |
| 78 | 78 |
libsqlite3-dev # for "sqlite3.h" |
| 79 | 79 |
pkg-config # for detecting things like libsystemd-journal dynamically |
| 80 |
+ vim-common # tini dep |
|
| 80 | 81 |
) |
| 81 | 82 |
# packaging for "sd-journal.h" and libraries varies |
| 82 | 83 |
case "$suite" in |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM ubuntu:precise |
| 6 | 6 |
|
| 7 |
-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/* |
|
| 7 |
+RUN apt-get update && apt-get install -y apparmor bash-completion build-essential cmake curl ca-certificates debhelper dh-apparmor git libapparmor-dev libltdl-dev libsqlite3-dev pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.3 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM ubuntu:trusty |
| 6 | 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 libsqlite3-dev pkg-config libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 7 |
+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/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.3 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM ubuntu:xenial |
| 6 | 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/* |
|
| 7 |
+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/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.3 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM ubuntu:yakkety |
| 6 | 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/* |
|
| 7 |
+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/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.3 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -4,7 +4,7 @@ FROM armhf/debian:jessie |
| 4 | 4 |
ARG APT_MIRROR=httpredir.debian.org |
| 5 | 5 |
RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list |
| 6 | 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 libsqlite3-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 7 |
+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/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.3 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -4,7 +4,7 @@ FROM resin/rpi-raspbian:jessie |
| 4 | 4 |
ARG APT_MIRROR=httpredir.debian.org |
| 5 | 5 |
RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list |
| 6 | 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 libsqlite3-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 7 |
+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/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.3 |
| 10 | 10 |
# GOARM is the ARM architecture version which is unrelated to the above Golang version |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
FROM armhf/ubuntu:trusty |
| 2 | 2 |
|
| 3 |
-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/* |
|
| 3 |
+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/* |
|
| 4 | 4 |
|
| 5 | 5 |
ENV GO_VERSION 1.7.3 |
| 6 | 6 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -45,6 +45,7 @@ for version in "${versions[@]}"; do
|
| 45 | 45 |
bash-completion # for bash-completion debhelper integration |
| 46 | 46 |
btrfs-tools # for "btrfs/ioctl.h" (and "version.h" if possible) |
| 47 | 47 |
build-essential # "essential for building Debian packages" |
| 48 |
+ cmake # tini dep |
|
| 48 | 49 |
curl ca-certificates # for downloading Go |
| 49 | 50 |
debhelper # for easy ".deb" building |
| 50 | 51 |
dh-apparmor # for apparmor debhelper |
| ... | ... |
@@ -55,6 +56,7 @@ for version in "${versions[@]}"; do
|
| 55 | 55 |
libltdl-dev # for pkcs11 "ltdl.h" |
| 56 | 56 |
libsqlite3-dev # for "sqlite3.h" |
| 57 | 57 |
pkg-config # for detecting things like libsystemd-journal dynamically |
| 58 |
+ vim-common # tini dep |
|
| 58 | 59 |
) |
| 59 | 60 |
|
| 60 | 61 |
# trusty uses a different go package name then xenial and newer, so track that for later |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM ppc64le/ubuntu:trusty |
| 6 | 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 libsqlite3-dev pkg-config golang-1.6 libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 7 |
+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 golang-1.6 libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
# Install Go |
| 10 | 10 |
# ppc64le doesn't have official go binaries, so use a distro packaged version of go |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM ppc64le/ubuntu:xenial |
| 6 | 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 libsqlite3-dev pkg-config golang-go libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 7 |
+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 golang-go libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
# Install Go |
| 10 | 10 |
# ppc64le doesn't have official go binaries, so use a distro packaged version of go |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM ppc64le/ubuntu:yakkety |
| 6 | 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 libsqlite3-dev pkg-config golang-go libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 7 |
+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 golang-go libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
# Install Go |
| 10 | 10 |
# ppc64le doesn't have official go binaries, so use a distro packaged version of go |
| ... | ... |
@@ -45,6 +45,7 @@ for version in "${versions[@]}"; do
|
| 45 | 45 |
bash-completion # for bash-completion debhelper integration |
| 46 | 46 |
btrfs-tools # for "btrfs/ioctl.h" (and "version.h" if possible) |
| 47 | 47 |
build-essential # "essential for building Debian packages" |
| 48 |
+ cmake # tini dep |
|
| 48 | 49 |
curl ca-certificates # for downloading Go |
| 49 | 50 |
debhelper # for easy ".deb" building |
| 50 | 51 |
dh-apparmor # for apparmor debhelper |
| ... | ... |
@@ -57,6 +58,7 @@ for version in "${versions[@]}"; do
|
| 57 | 57 |
libsqlite3-dev # for "sqlite3.h" |
| 58 | 58 |
pkg-config # for detecting things like libsystemd-journal dynamically |
| 59 | 59 |
libsystemd-dev |
| 60 |
+ vim-common # tini dep |
|
| 60 | 61 |
) |
| 61 | 62 |
|
| 62 | 63 |
case "$suite" in |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM s390x/ubuntu:xenial |
| 6 | 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/* |
|
| 7 |
+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 libsystemd-dev vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.3 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local
|