Browse code
correct ltdl for centos
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Jessica Frazelle authored on 2015/11/15 01:04:41Showing 8 changed files
- contrib/builder/rpm/centos-7/Dockerfile
- contrib/builder/rpm/fedora-21/Dockerfile
- contrib/builder/rpm/fedora-22/Dockerfile
- contrib/builder/rpm/fedora-23/Dockerfile
- contrib/builder/rpm/generate.sh
- contrib/builder/rpm/opensuse-13.2/Dockerfile
- contrib/builder/rpm/oraclelinux-6/Dockerfile
- contrib/builder/rpm/oraclelinux-7/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 libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 9 |
+RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 10 | 10 |
|
| 11 | 11 |
ENV GO_VERSION 1.5.1 |
| 12 | 12 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
FROM fedora:21 |
| 6 | 6 |
|
| 7 | 7 |
RUN yum install -y @development-tools fedora-packager |
| 8 |
-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 8 |
+RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.5.1 |
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
FROM fedora:22 |
| 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 libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 8 |
+RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.5.1 |
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/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 libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 8 |
+RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.5.1 |
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -65,8 +65,8 @@ for version in "${versions[@]}"; do
|
| 65 | 65 |
btrfs-progs-devel # for "btrfs/ioctl.h" (and "version.h" if possible) |
| 66 | 66 |
device-mapper-devel # for "libdevmapper.h" |
| 67 | 67 |
glibc-static |
| 68 |
- libltdl-devel # for pkcs11 "ltdl.h" |
|
| 69 | 68 |
libselinux-devel # for "libselinux.so" |
| 69 |
+ libtool-ltdl-devel # for pkcs11 "ltdl.h" |
|
| 70 | 70 |
selinux-policy |
| 71 | 71 |
selinux-policy-devel |
| 72 | 72 |
sqlite-devel # for "sqlite3.h" |
| ... | ... |
@@ -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 libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 8 |
+RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.5.1 |
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
FROM oraclelinux:6 |
| 6 | 6 |
|
| 7 | 7 |
RUN yum groupinstall -y "Development Tools" |
| 8 |
-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 8 |
+RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.5.1 |
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/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 libltdl-devel libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 8 |
+RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.5.1 |
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|