diff --git a/contrib/builder/rpm/amd64/fedora-22/Dockerfile b/contrib/builder/rpm/amd64/fedora-22/Dockerfile index 90f5123442..f287dd0907 100644 --- a/contrib/builder/rpm/amd64/fedora-22/Dockerfile +++ b/contrib/builder/rpm/amd64/fedora-22/Dockerfile @@ -7,27 +7,6 @@ FROM fedora:22 RUN dnf install -y @development-tools fedora-packager 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 -ENV SECCOMP_VERSION 2.2.3 -RUN buildDeps=' \ -automake \ -libtool \ -' \ -&& set -x \ -&& yum install -y $buildDeps \ -&& export SECCOMP_PATH=$(mktemp -d) \ -&& curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \ -| tar -xzC "$SECCOMP_PATH" --strip-components=1 \ -&& ( \ -cd "$SECCOMP_PATH" \ -&& ./configure --prefix=/usr \ -&& make \ -&& install -c src/.libs/libseccomp.a /usr/lib/libseccomp.a \ -&& chmod 644 /usr/lib/libseccomp.a \ -&& ranlib /usr/lib/libseccomp.a \ -&& ldconfig -n /usr/lib \ -) \ -&& rm -rf "$SECCOMP_PATH" - ENV GO_VERSION 1.5.3 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/rpm/amd64/fedora-23/Dockerfile b/contrib/builder/rpm/amd64/fedora-23/Dockerfile index bc5ad4884a..ba75402e62 100644 --- a/contrib/builder/rpm/amd64/fedora-23/Dockerfile +++ b/contrib/builder/rpm/amd64/fedora-23/Dockerfile @@ -7,27 +7,6 @@ FROM fedora:23 RUN dnf install -y @development-tools fedora-packager 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 -ENV SECCOMP_VERSION 2.2.3 -RUN buildDeps=' \ -automake \ -libtool \ -' \ -&& set -x \ -&& yum install -y $buildDeps \ -&& export SECCOMP_PATH=$(mktemp -d) \ -&& curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \ -| tar -xzC "$SECCOMP_PATH" --strip-components=1 \ -&& ( \ -cd "$SECCOMP_PATH" \ -&& ./configure --prefix=/usr \ -&& make \ -&& install -c src/.libs/libseccomp.a /usr/lib/libseccomp.a \ -&& chmod 644 /usr/lib/libseccomp.a \ -&& ranlib /usr/lib/libseccomp.a \ -&& ldconfig -n /usr/lib \ -) \ -&& rm -rf "$SECCOMP_PATH" - ENV GO_VERSION 1.5.3 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local ENV PATH $PATH:/usr/local/go/bin diff --git a/contrib/builder/rpm/amd64/generate.sh b/contrib/builder/rpm/amd64/generate.sh index 2ab1cabbb5..4a0cc79e29 100755 --- a/contrib/builder/rpm/amd64/generate.sh +++ b/contrib/builder/rpm/amd64/generate.sh @@ -118,37 +118,6 @@ for version in "${versions[@]}"; do echo >> "$version/Dockerfile" - # TODO remove this since dockerinit is finally gone - case "$from" in - fedora:*) - awk '$1 == "ENV" && $2 == "SECCOMP_VERSION" { print; exit }' ../../../Dockerfile >> "$version/Dockerfile" - cat <<-'EOF' >> "$version/Dockerfile" - RUN buildDeps=' \ - automake \ - libtool \ - ' \ - && set -x \ - && yum install -y $buildDeps \ - && export SECCOMP_PATH=$(mktemp -d) \ - && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \ - | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ - && ( \ - cd "$SECCOMP_PATH" \ - && ./configure --prefix=/usr \ - && make \ - && install -c src/.libs/libseccomp.a /usr/lib/libseccomp.a \ - && chmod 644 /usr/lib/libseccomp.a \ - && ranlib /usr/lib/libseccomp.a \ - && ldconfig -n /usr/lib \ - ) \ - && rm -rf "$SECCOMP_PATH" - EOF - - echo >> "$version/Dockerfile" - ;; - *) ;; - esac - case "$from" in oraclelinux:6) # We need a known version of the kernel-uek-devel headers to set CGO_CPPFLAGS, so grab the UEKR4 GA version