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

Andrea Bolognani abologna at redhat.com
Thu Jul 19 10:56:32 UTC 2018


The corresponding libvirt-jenkins-ci commit is d2bbe1eee61a.

Signed-off-by: Andrea Bolognani <abologna at 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 5d92bfa..2c4c26d 100644
--- a/buildenv-centos-7.Dockerfile
+++ b/buildenv-centos-7.Dockerfile
@@ -23,6 +23,7 @@ ENV PACKAGES audit-libs-devel \
              gnutls-devel \
              iproute \
              iscsi-initiator-utils \
+             jansson-devel \
              libacl-devel \
              libattr-devel \
              libblkid-devel \
@@ -63,8 +64,7 @@ ENV PACKAGES audit-libs-devel \
              scrub \
              sudo \
              systemtap-sdt-devel \
-             vim \
-             yajl-devel
+             vim
 RUN yum install -y ${PACKAGES} && \
     yum autoremove -y && \
     yum clean all -y
diff --git a/buildenv-debian-8.Dockerfile b/buildenv-debian-8.Dockerfile
index 0766cc9..8a8c3b0 100644
--- a/buildenv-debian-8.Dockerfile
+++ b/buildenv-debian-8.Dockerfile
@@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \
              libdevmapper-dev \
              libfuse-dev \
              libgnutls28-dev \
+             libjansson-dev \
              libnetcf-dev \
              libnl-3-dev \
              libnl-route-3-dev \
@@ -50,7 +51,6 @@ 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 e106574..c3af421 100644
--- a/buildenv-debian-9.Dockerfile
+++ b/buildenv-debian-9.Dockerfile
@@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \
              libdevmapper-dev \
              libfuse-dev \
              libgnutls28-dev \
+             libjansson-dev \
              libnetcf-dev \
              libnl-3-dev \
              libnl-route-3-dev \
@@ -50,7 +51,6 @@ 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 c3a18be..a922457 100644
--- a/buildenv-debian-sid.Dockerfile
+++ b/buildenv-debian-sid.Dockerfile
@@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \
              libdevmapper-dev \
              libfuse-dev \
              libgnutls28-dev \
+             libjansson-dev \
              libnetcf-dev \
              libnl-3-dev \
              libnl-route-3-dev \
@@ -50,7 +51,6 @@ 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 4e5173f..2f35a2e 100644
--- a/buildenv-fedora-27.Dockerfile
+++ b/buildenv-fedora-27.Dockerfile
@@ -27,6 +27,7 @@ ENV PACKAGES audit-libs-devel \
              iproute \
              iproute-tc \
              iscsi-initiator-utils \
+             jansson-devel \
              libacl-devel \
              libattr-devel \
              libblkid-devel \
@@ -71,7 +72,6 @@ ENV PACKAGES audit-libs-devel \
              vim \
              wireshark-devel \
              xen-devel \
-             yajl-devel \
              zfs-fuse
 RUN yum install -y ${PACKAGES} && \
     yum autoremove -y && \
diff --git a/buildenv-fedora-28.Dockerfile b/buildenv-fedora-28.Dockerfile
index d051d65..f4f7198 100644
--- a/buildenv-fedora-28.Dockerfile
+++ b/buildenv-fedora-28.Dockerfile
@@ -26,6 +26,7 @@ ENV PACKAGES audit-libs-devel \
              iproute \
              iproute-tc \
              iscsi-initiator-utils \
+             jansson-devel \
              libacl-devel \
              libattr-devel \
              libblkid-devel \
@@ -71,7 +72,6 @@ ENV PACKAGES audit-libs-devel \
              vim \
              wireshark-devel \
              xen-devel \
-             yajl-devel \
              zfs-fuse
 RUN yum install -y ${PACKAGES} && \
     yum autoremove -y && \
diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-fedora-rawhide.Dockerfile
index 56d59a1..189ea59 100644
--- a/buildenv-fedora-rawhide.Dockerfile
+++ b/buildenv-fedora-rawhide.Dockerfile
@@ -26,6 +26,7 @@ ENV PACKAGES audit-libs-devel \
              iproute \
              iproute-tc \
              iscsi-initiator-utils \
+             jansson-devel \
              libacl-devel \
              libattr-devel \
              libblkid-devel \
@@ -95,7 +96,6 @@ ENV PACKAGES audit-libs-devel \
              vim \
              wireshark-devel \
              xen-devel \
-             yajl-devel \
              zfs-fuse
 RUN yum install -y ${PACKAGES} && \
     yum autoremove -y && \
diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-ubuntu-16.Dockerfile
index d2ece05..bc387a1 100644
--- a/buildenv-ubuntu-16.Dockerfile
+++ b/buildenv-ubuntu-16.Dockerfile
@@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \
              libdevmapper-dev \
              libfuse-dev \
              libgnutls28-dev \
+             libjansson-dev \
              libnetcf-dev \
              libnl-3-dev \
              libnl-route-3-dev \
@@ -51,7 +52,6 @@ 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 fdf97eb..2a15f14 100644
--- a/buildenv-ubuntu-18.Dockerfile
+++ b/buildenv-ubuntu-18.Dockerfile
@@ -29,6 +29,7 @@ ENV PACKAGES augeas-tools \
              libdevmapper-dev \
              libfuse-dev \
              libgnutls28-dev \
+             libjansson-dev \
              libnetcf-dev \
              libnl-3-dev \
              libnl-route-3-dev \
@@ -51,7 +52,6 @@ ENV PACKAGES augeas-tools \
              libxen-dev \
              libxml2-dev \
              libxml2-utils \
-             libyajl-dev \
              lvm2 \
              make \
              nfs-common \
-- 
2.17.1




More information about the libvir-list mailing list