[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [dockerfiles PATCH] Refresh after switch from jansson to yajl



The corresponding libvirt-jenkins-ci commit is f188ff6a7ceb.

Signed-off-by: Andrea Bolognani <abologna redhat com>
---
Pushed under the Dockerfile refresh rule.

 buildenv-centos-7.Dockerfile       | 4 ++--
 buildenv-debian-8.Dockerfile       | 2 +-
 buildenv-debian-9.Dockerfile       | 2 +-
 buildenv-debian-sid.Dockerfile     | 2 +-
 buildenv-fedora-27.Dockerfile      | 2 +-
 buildenv-fedora-28.Dockerfile      | 2 +-
 buildenv-fedora-rawhide.Dockerfile | 2 +-
 buildenv-ubuntu-16.Dockerfile      | 2 +-
 buildenv-ubuntu-18.Dockerfile      | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/buildenv-centos-7.Dockerfile b/buildenv-centos-7.Dockerfile
index 896bf68..cce63fc 100644
--- a/buildenv-centos-7.Dockerfile
+++ b/buildenv-centos-7.Dockerfile
@@ -23,7 +23,6 @@ ENV PACKAGES audit-libs-devel \
              gnutls-devel \
              iproute \
              iscsi-initiator-utils \
-             jansson-devel \
              libacl-devel \
              libattr-devel \
              libblkid-devel \
@@ -64,7 +63,8 @@ ENV PACKAGES audit-libs-devel \
              scrub \
              sudo \
              systemtap-sdt-devel \
-             vim
+             vim \
+             yajl-devel
 RUN yum update -y && \
     yum install -y ${PACKAGES} && \
     yum autoremove -y && \
diff --git a/buildenv-debian-8.Dockerfile b/buildenv-debian-8.Dockerfile
index 8877528..cdf38d3 100644
--- a/buildenv-debian-8.Dockerfile
+++ b/buildenv-debian-8.Dockerfile
@@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \
              libdevmapper-dev \
              libfuse-dev \
              libgnutls28-dev \
-             libjansson-dev \
              libnetcf-dev \
              libnl-3-dev \
              libnl-route-3-dev \
@@ -51,6 +50,7 @@ ENV PACKAGES augeas-tools \
              libxen-dev \
              libxml2-dev \
              libxml2-utils \
+             libyajl-dev \
              lvm2 \
              make \
              nfs-common \
diff --git a/buildenv-debian-9.Dockerfile b/buildenv-debian-9.Dockerfile
index 0592c97..ff8de7c 100644
--- a/buildenv-debian-9.Dockerfile
+++ b/buildenv-debian-9.Dockerfile
@@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \
              libdevmapper-dev \
              libfuse-dev \
              libgnutls28-dev \
-             libjansson-dev \
              libnetcf-dev \
              libnl-3-dev \
              libnl-route-3-dev \
@@ -51,6 +50,7 @@ ENV PACKAGES augeas-tools \
              libxen-dev \
              libxml2-dev \
              libxml2-utils \
+             libyajl-dev \
              lvm2 \
              make \
              nfs-common \
diff --git a/buildenv-debian-sid.Dockerfile b/buildenv-debian-sid.Dockerfile
index 2d0310d..d06c1e0 100644
--- a/buildenv-debian-sid.Dockerfile
+++ b/buildenv-debian-sid.Dockerfile
@@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \
              libdevmapper-dev \
              libfuse-dev \
              libgnutls28-dev \
-             libjansson-dev \
              libnetcf-dev \
              libnl-3-dev \
              libnl-route-3-dev \
@@ -51,6 +50,7 @@ ENV PACKAGES augeas-tools \
              libxen-dev \
              libxml2-dev \
              libxml2-utils \
+             libyajl-dev \
              lvm2 \
              make \
              nfs-common \
diff --git a/buildenv-fedora-27.Dockerfile b/buildenv-fedora-27.Dockerfile
index 09ec721..9953e1c 100644
--- a/buildenv-fedora-27.Dockerfile
+++ b/buildenv-fedora-27.Dockerfile
@@ -27,7 +27,6 @@ ENV PACKAGES audit-libs-devel \
              iproute \
              iproute-tc \
              iscsi-initiator-utils \
-             jansson-devel \
              libacl-devel \
              libattr-devel \
              libblkid-devel \
@@ -72,6 +71,7 @@ ENV PACKAGES audit-libs-devel \
              vim \
              wireshark-devel \
              xen-devel \
+             yajl-devel \
              zfs-fuse
 RUN yum update -y && \
     yum install -y ${PACKAGES} && \
diff --git a/buildenv-fedora-28.Dockerfile b/buildenv-fedora-28.Dockerfile
index 60afba5..6e3587f 100644
--- a/buildenv-fedora-28.Dockerfile
+++ b/buildenv-fedora-28.Dockerfile
@@ -26,7 +26,6 @@ ENV PACKAGES audit-libs-devel \
              iproute \
              iproute-tc \
              iscsi-initiator-utils \
-             jansson-devel \
              libacl-devel \
              libattr-devel \
              libblkid-devel \
@@ -72,6 +71,7 @@ ENV PACKAGES audit-libs-devel \
              vim \
              wireshark-devel \
              xen-devel \
+             yajl-devel \
              zfs-fuse
 RUN yum update -y && \
     yum install -y ${PACKAGES} && \
diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-fedora-rawhide.Dockerfile
index 33b47e1..e7d1fd3 100644
--- a/buildenv-fedora-rawhide.Dockerfile
+++ b/buildenv-fedora-rawhide.Dockerfile
@@ -26,7 +26,6 @@ ENV PACKAGES audit-libs-devel \
              iproute \
              iproute-tc \
              iscsi-initiator-utils \
-             jansson-devel \
              libacl-devel \
              libattr-devel \
              libblkid-devel \
@@ -96,6 +95,7 @@ ENV PACKAGES audit-libs-devel \
              vim \
              wireshark-devel \
              xen-devel \
+             yajl-devel \
              zfs-fuse
 RUN yum update -y && \
     yum install -y ${PACKAGES} && \
diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-ubuntu-16.Dockerfile
index c904c6e..d28b9aa 100644
--- a/buildenv-ubuntu-16.Dockerfile
+++ b/buildenv-ubuntu-16.Dockerfile
@@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \
              libdevmapper-dev \
              libfuse-dev \
              libgnutls28-dev \
-             libjansson-dev \
              libnetcf-dev \
              libnl-3-dev \
              libnl-route-3-dev \
@@ -52,6 +51,7 @@ ENV PACKAGES augeas-tools \
              libxen-dev \
              libxml2-dev \
              libxml2-utils \
+             libyajl-dev \
              lvm2 \
              make \
              nfs-common \
diff --git a/buildenv-ubuntu-18.Dockerfile b/buildenv-ubuntu-18.Dockerfile
index bbd32c1..14abd98 100644
--- a/buildenv-ubuntu-18.Dockerfile
+++ b/buildenv-ubuntu-18.Dockerfile
@@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \
              libdevmapper-dev \
              libfuse-dev \
              libgnutls28-dev \
-             libjansson-dev \
              libnetcf-dev \
              libnl-3-dev \
              libnl-route-3-dev \
@@ -52,6 +51,7 @@ ENV PACKAGES augeas-tools \
              libxen-dev \
              libxml2-dev \
              libxml2-utils \
+             libyajl-dev \
              lvm2 \
              make \
              nfs-common \
-- 
2.17.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]