This drops support for migrations from pre-1.10 Docker versions, which
should be done via an external tool or an intermediate upgrade.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
(from "ubuntu:14.04") |
| 2 | 2 |
(maintainer "Tianon Gravi <admwiggin@gmail.com> (@tianon)") |
| 3 |
-(run "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \tapt-utils \taufs-tools \tautomake \tbtrfs-tools \tbuild-essential \tcurl \tdpkg-sig \tgit \tiptables \tlibapparmor-dev \tlibcap-dev \tlibsqlite3-dev \tmercurial \tpandoc \tparallel \treprepro \truby1.9.1 \truby1.9.1-dev \ts3cmd=1.1.0* \t--no-install-recommends") |
|
| 3 |
+(run "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \tapt-utils \taufs-tools \tautomake \tbtrfs-tools \tbuild-essential \tcurl \tdpkg-sig \tgit \tiptables \tlibapparmor-dev \tlibcap-dev \tmercurial \tpandoc \tparallel \treprepro \truby1.9.1 \truby1.9.1-dev \ts3cmd=1.1.0* \t--no-install-recommends") |
|
| 4 | 4 |
(run "git clone --no-checkout https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout -q v2_02_103") |
| 5 | 5 |
(run "cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper") |
| 6 | 6 |
(run "curl -sSL https://golang.org/dl/go1.3.src.tar.gz | tar -v -C /usr/local -xz") |
| ... | ... |
@@ -56,7 +56,6 @@ for version in "${versions[@]}"; do
|
| 56 | 56 |
libapparmor-dev # for "sys/apparmor.h" |
| 57 | 57 |
libdevmapper-dev # for "libdevmapper.h" |
| 58 | 58 |
libltdl-dev # for pkcs11 "ltdl.h" |
| 59 |
- libsqlite3-dev # for "sqlite3.h" |
|
| 60 | 59 |
pkg-config # for detecting things like libsystemd-journal dynamically |
| 61 | 60 |
vim-common # tini dep |
| 62 | 61 |
) |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM aarch64/ubuntu:trusty |
| 6 | 6 |
|
| 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 golang-1.6-go --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 pkg-config vim-common libsystemd-journal-dev golang-1.6-go --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100 |
| 10 | 10 |
|
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM aarch64/ubuntu:xenial |
| 6 | 6 |
|
| 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-dev golang-go libseccomp-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 pkg-config vim-common libsystemd-dev golang-go libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
# Install Go |
| 10 | 10 |
# aarch64 doesn't have official go binaries, so use the version of go installed from |
| ... | ... |
@@ -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 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/* |
|
| 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 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.4 |
| 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 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/* |
|
| 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 pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 12 | 12 |
|
| 13 | 13 |
ENV GO_VERSION 1.7.4 |
| 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 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/* |
|
| 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 pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 14 | 14 |
|
| 15 | 15 |
ENV GO_VERSION 1.7.4 |
| 16 | 16 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -76,7 +76,6 @@ for version in "${versions[@]}"; do
|
| 76 | 76 |
libdevmapper-dev # for "libdevmapper.h" |
| 77 | 77 |
libltdl-dev # for pkcs11 "ltdl.h" |
| 78 | 78 |
libseccomp-dev # for "seccomp.h" & "libseccomp.so" |
| 79 |
- libsqlite3-dev # for "sqlite3.h" |
|
| 80 | 79 |
pkg-config # for detecting things like libsystemd-journal dynamically |
| 81 | 80 |
vim-common # tini dep |
| 82 | 81 |
) |
| ... | ... |
@@ -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 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/* |
|
| 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 pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.4 |
| 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 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/* |
|
| 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 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.4 |
| 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 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/* |
|
| 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 pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.4 |
| 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 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/* |
|
| 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 pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.4 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -8,7 +8,7 @@ FROM armhf/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 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/* |
|
| 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 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.4 |
| 14 | 14 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -78,7 +78,6 @@ for version in "${versions[@]}"; do
|
| 78 | 78 |
libdevmapper-dev # for "libdevmapper.h" |
| 79 | 79 |
libltdl-dev # for pkcs11 "ltdl.h" |
| 80 | 80 |
libseccomp-dev # for "seccomp.h" & "libseccomp.so" |
| 81 |
- libsqlite3-dev # for "sqlite3.h" |
|
| 82 | 81 |
pkg-config # for detecting things like libsystemd-journal dynamically |
| 83 | 82 |
vim-common # tini dep |
| 84 | 83 |
) |
| ... | ... |
@@ -8,7 +8,7 @@ FROM resin/rpi-raspbian: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 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/* |
|
| 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 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.4 |
| 14 | 14 |
# GOARM is the ARM architecture version which is unrelated to the above Golang version |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM armhf/ubuntu:trusty |
| 6 | 6 |
|
| 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/* |
|
| 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 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.4 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM armhf/ubuntu:xenial |
| 6 | 6 |
|
| 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/* |
|
| 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 pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.4 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM armhf/ubuntu:yakkety |
| 6 | 6 |
|
| 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/* |
|
| 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 pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.4 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -54,7 +54,6 @@ for version in "${versions[@]}"; do
|
| 54 | 54 |
libapparmor-dev # for "sys/apparmor.h" |
| 55 | 55 |
libdevmapper-dev # for "libdevmapper.h" |
| 56 | 56 |
libltdl-dev # for pkcs11 "ltdl.h" |
| 57 |
- libsqlite3-dev # for "sqlite3.h" |
|
| 58 | 57 |
pkg-config # for detecting things like libsystemd-journal dynamically |
| 59 | 58 |
vim-common # tini dep |
| 60 | 59 |
) |
| ... | ... |
@@ -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 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/* |
|
| 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 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.4 |
| 10 | 10 |
RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -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 cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common 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 pkg-config vim-common libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.4 |
| 10 | 10 |
RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -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 cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common 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 pkg-config vim-common libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.4 |
| 10 | 10 |
RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -55,7 +55,6 @@ for version in "${versions[@]}"; do
|
| 55 | 55 |
libdevmapper-dev # for "libdevmapper.h" |
| 56 | 56 |
libltdl-dev # for pkcs11 "ltdl.h" |
| 57 | 57 |
libseccomp-dev # for "seccomp.h" & "libseccomp.so" |
| 58 |
- libsqlite3-dev # for "sqlite3.h" |
|
| 59 | 58 |
pkg-config # for detecting things like libsystemd-journal dynamically |
| 60 | 59 |
libsystemd-dev |
| 61 | 60 |
vim-common # tini dep |
| ... | ... |
@@ -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 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/* |
|
| 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 pkg-config libsystemd-dev vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* |
|
| 8 | 8 |
|
| 9 | 9 |
ENV GO_VERSION 1.7.4 |
| 10 | 10 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -6,7 +6,7 @@ FROM centos:7 |
| 6 | 6 |
|
| 7 | 7 |
RUN yum groupinstall -y "Development Tools" |
| 8 | 8 |
RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs |
| 9 |
-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common |
|
| 9 |
+RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common |
|
| 10 | 10 |
|
| 11 | 11 |
ENV GO_VERSION 1.7.4 |
| 12 | 12 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -6,7 +6,7 @@ FROM fedora:24 |
| 6 | 6 |
|
| 7 | 7 |
RUN dnf -y upgrade |
| 8 | 8 |
RUN dnf install -y @development-tools fedora-packager |
| 9 |
-RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common |
|
| 9 |
+RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common |
|
| 10 | 10 |
|
| 11 | 11 |
ENV GO_VERSION 1.7.4 |
| 12 | 12 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -6,7 +6,7 @@ FROM fedora:25 |
| 6 | 6 |
|
| 7 | 7 |
RUN dnf -y upgrade |
| 8 | 8 |
RUN dnf install -y @development-tools fedora-packager |
| 9 |
-RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common |
|
| 9 |
+RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common |
|
| 10 | 10 |
|
| 11 | 11 |
ENV GO_VERSION 1.7.4 |
| 12 | 12 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -95,7 +95,6 @@ for version in "${versions[@]}"; do
|
| 95 | 95 |
pkgconfig # for the pkg-config command |
| 96 | 96 |
selinux-policy |
| 97 | 97 |
selinux-policy-devel |
| 98 |
- sqlite-devel # for "sqlite3.h" |
|
| 99 | 98 |
systemd-devel # for "sd-journal.h" and libraries |
| 100 | 99 |
tar # older versions of dev-tools do not have tar |
| 101 | 100 |
git # required for containerd and runc clone |
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
FROM opensuse:13.2 |
| 6 | 6 |
|
| 7 | 7 |
RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build |
| 8 |
-RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim systemd-rpm-macros |
|
| 8 |
+RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel systemd-devel tar git cmake vim systemd-rpm-macros |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.7.4 |
| 11 | 11 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -8,7 +8,7 @@ RUN yum install -y yum-utils && curl -o /etc/yum.repos.d/public-yum-ol6.repo htt |
| 8 | 8 |
RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek |
| 9 | 9 |
|
| 10 | 10 |
RUN yum groupinstall -y "Development Tools" |
| 11 |
-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel tar git cmake vim-common |
|
| 11 |
+RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel tar git cmake vim-common |
|
| 12 | 12 |
|
| 13 | 13 |
ENV GO_VERSION 1.7.4 |
| 14 | 14 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
FROM oraclelinux:7 |
| 6 | 6 |
|
| 7 | 7 |
RUN yum groupinstall -y "Development Tools" |
| 8 |
-RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common |
|
| 8 |
+RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.7.4 |
| 11 | 11 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
FROM photon:1.0 |
| 6 | 6 |
|
| 7 | 7 |
RUN tdnf install -y wget curl ca-certificates gzip make rpm-build sed gcc linux-api-headers glibc-devel binutils libseccomp libltdl-devel elfutils |
| 8 |
-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 sqlite-devel systemd-devel tar git cmake vim-common |
|
| 8 |
+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 |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.7.4 |
| 11 | 11 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -6,7 +6,7 @@ FROM ppc64le/fedora:24 |
| 6 | 6 |
|
| 7 | 7 |
RUN dnf -y upgrade |
| 8 | 8 |
RUN dnf install -y @development-tools fedora-packager |
| 9 |
-RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake |
|
| 9 |
+RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake |
|
| 10 | 10 |
|
| 11 | 11 |
ENV GO_VERSION 1.7.4 |
| 12 | 12 |
RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -60,7 +60,6 @@ for version in "${versions[@]}"; do
|
| 60 | 60 |
pkgconfig # for the pkg-config command |
| 61 | 61 |
selinux-policy |
| 62 | 62 |
selinux-policy-devel |
| 63 |
- sqlite-devel # for "sqlite3.h" |
|
| 64 | 63 |
systemd-devel # for "sd-journal.h" and libraries |
| 65 | 64 |
tar # older versions of dev-tools do not have tar |
| 66 | 65 |
git # required for containerd and runc clone |
| ... | ... |
@@ -149,7 +149,7 @@ LDFLAGS_STATIC='' |
| 149 | 149 |
EXTLDFLAGS_STATIC='-static' |
| 150 | 150 |
# ORIG_BUILDFLAGS is necessary for the cross target which cannot always build |
| 151 | 151 |
# with options like -race. |
| 152 |
-ORIG_BUILDFLAGS=( -tags "autogen netgo static_build sqlite_omit_load_extension $DOCKER_BUILDTAGS" -installsuffix netgo ) |
|
| 152 |
+ORIG_BUILDFLAGS=( -tags "autogen netgo static_build $DOCKER_BUILDTAGS" -installsuffix netgo ) |
|
| 153 | 153 |
# see https://github.com/golang/go/issues/9369#issuecomment-69864440 for why -installsuffix is necessary here |
| 154 | 154 |
|
| 155 | 155 |
# When $DOCKER_INCREMENTAL_BINARY is set in the environment, enable incremental |
| ... | ... |
@@ -186,14 +186,6 @@ if [ "$(uname -s)" = 'FreeBSD' ]; then |
| 186 | 186 |
LDFLAGS="$LDFLAGS -extld clang" |
| 187 | 187 |
fi |
| 188 | 188 |
|
| 189 |
-# If sqlite3.h doesn't exist under /usr/include, |
|
| 190 |
-# check /usr/local/include also just in case |
|
| 191 |
-# (e.g. FreeBSD Ports installs it under the directory) |
|
| 192 |
-if [ ! -e /usr/include/sqlite3.h ] && [ -e /usr/local/include/sqlite3.h ]; then |
|
| 193 |
- export CGO_CFLAGS='-I/usr/local/include' |
|
| 194 |
- export CGO_LDFLAGS='-L/usr/local/lib' |
|
| 195 |
-fi |
|
| 196 |
- |
|
| 197 | 189 |
HAVE_GO_TEST_COVER= |
| 198 | 190 |
if \ |
| 199 | 191 |
go help testflag | grep -- -cover > /dev/null \ |