Browse code
Add tini deps to rpm build
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Michael Crosby authored on 2016/11/10 03:34:08Showing 8 changed files
- contrib/builder/rpm/amd64/centos-7/Dockerfile
- contrib/builder/rpm/amd64/fedora-23/Dockerfile
- contrib/builder/rpm/amd64/fedora-24/Dockerfile
- contrib/builder/rpm/amd64/generate.sh
- contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile
- contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile
- contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile
- contrib/builder/rpm/amd64/photon-1.0/Dockerfile
| ... | ... |
@@ -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 |
|
| 9 |
+RUN yum install -y btrfs-progs-devel cmake device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git vim-common |
|
| 10 | 10 |
|
| 11 | 11 |
ENV GO_VERSION 1.7.3 |
| 12 | 12 |
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 fedora:23 |
| 6 | 6 |
|
| 7 | 7 |
RUN dnf install -y @development-tools fedora-packager |
| 8 |
-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 |
|
| 8 |
+RUN dnf install -y btrfs-progs-devel cmake device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git vim-common |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.7.3 |
| 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 fedora:24 |
| 6 | 6 |
|
| 7 | 7 |
RUN dnf install -y @development-tools fedora-packager |
| 8 |
-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 |
|
| 8 |
+RUN dnf install -y btrfs-progs-devel cmake device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git vim-common |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.7.3 |
| 11 | 11 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -84,6 +84,7 @@ for version in "${versions[@]}"; do
|
| 84 | 84 |
# this list is sorted alphabetically; please keep it that way |
| 85 | 85 |
packages=( |
| 86 | 86 |
btrfs-progs-devel # for "btrfs/ioctl.h" (and "version.h" if possible) |
| 87 |
+ cmake # tini build |
|
| 87 | 88 |
device-mapper-devel # for "libdevmapper.h" |
| 88 | 89 |
glibc-static |
| 89 | 90 |
libseccomp-devel # for "seccomp.h" & "libseccomp.so" |
| ... | ... |
@@ -96,6 +97,7 @@ for version in "${versions[@]}"; do
|
| 96 | 96 |
systemd-devel # for "sd-journal.h" and libraries |
| 97 | 97 |
tar # older versions of dev-tools do not have tar |
| 98 | 98 |
git # required for containerd and runc clone |
| 99 |
+ vim-common # tini build |
|
| 99 | 100 |
) |
| 100 | 101 |
|
| 101 | 102 |
case "$from" in |
| ... | ... |
@@ -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 systemd-rpm-macros |
|
| 8 |
+RUN zypper --non-interactive install libbtrfs-devel cmake device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git vim-common systemd-rpm-macros |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.7.3 |
| 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 |
|
| 11 |
+RUN yum install -y btrfs-progs-devel cmake device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel tar git vim-common |
|
| 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
|
| ... | ... |
@@ -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 |
|
| 8 |
+RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel cmake device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git vim-common |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.7.3 |
| 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 |
|
| 8 |
+RUN tdnf install -y btrfs-progs-devel cmake 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 vim-common |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.7.3 |
| 11 | 11 |
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|