From 3466e5c91111c43fb4a9850d3dc1ba417be478a6 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Fri, 15 Jan 2016 15:29:43 -0800 Subject: [PATCH] fix selinux version for contrib/builder generation Signed-off-by: Jessica Frazelle --- contrib/builder/rpm/fedora-22/Dockerfile | 4 ++-- contrib/builder/rpm/fedora-23/Dockerfile | 4 ++-- contrib/builder/rpm/generate.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/builder/rpm/fedora-22/Dockerfile b/contrib/builder/rpm/fedora-22/Dockerfile index 912be90a46..9b4e5493c8 100644 --- a/contrib/builder/rpm/fedora-22/Dockerfile +++ b/contrib/builder/rpm/fedora-22/Dockerfile @@ -7,7 +7,7 @@ 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 selinux-policy selinux-policy-devel sqlite-devel tar -ENV SECCOMP_VERSION v2.2.3 +ENV SECCOMP_VERSION 2.2.3 RUN buildDeps=' \ automake \ libtool \ @@ -15,7 +15,7 @@ libtool \ && set -x \ && yum install -y $buildDeps \ && export SECCOMP_PATH=$(mktemp -d) \ -&& git clone -b "$SECCOMP_VERSION" --depth 1 https://github.com/seccomp/libseccomp.git "$SECCOMP_PATH" \ +&& git clone -b "v${SECCOMP_VERSION}" --depth 1 https://github.com/seccomp/libseccomp.git "$SECCOMP_PATH" \ && ( \ cd "$SECCOMP_PATH" \ && ./autogen.sh \ diff --git a/contrib/builder/rpm/fedora-23/Dockerfile b/contrib/builder/rpm/fedora-23/Dockerfile index bfa70617de..c3314f9ec6 100644 --- a/contrib/builder/rpm/fedora-23/Dockerfile +++ b/contrib/builder/rpm/fedora-23/Dockerfile @@ -7,7 +7,7 @@ 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 selinux-policy selinux-policy-devel sqlite-devel tar -ENV SECCOMP_VERSION v2.2.3 +ENV SECCOMP_VERSION 2.2.3 RUN buildDeps=' \ automake \ libtool \ @@ -15,7 +15,7 @@ libtool \ && set -x \ && yum install -y $buildDeps \ && export SECCOMP_PATH=$(mktemp -d) \ -&& git clone -b "$SECCOMP_VERSION" --depth 1 https://github.com/seccomp/libseccomp.git "$SECCOMP_PATH" \ +&& git clone -b "v${SECCOMP_VERSION}" --depth 1 https://github.com/seccomp/libseccomp.git "$SECCOMP_PATH" \ && ( \ cd "$SECCOMP_PATH" \ && ./autogen.sh \ diff --git a/contrib/builder/rpm/generate.sh b/contrib/builder/rpm/generate.sh index b6d7287cef..ce3eeb6e07 100755 --- a/contrib/builder/rpm/generate.sh +++ b/contrib/builder/rpm/generate.sh @@ -121,7 +121,7 @@ for version in "${versions[@]}"; do && set -x \ && yum install -y $buildDeps \ && export SECCOMP_PATH=$(mktemp -d) \ - && git clone -b "$SECCOMP_VERSION" --depth 1 https://github.com/seccomp/libseccomp.git "$SECCOMP_PATH" \ + && git clone -b "v${SECCOMP_VERSION}" --depth 1 https://github.com/seccomp/libseccomp.git "$SECCOMP_PATH" \ && ( \ cd "$SECCOMP_PATH" \ && ./autogen.sh \