docker: update distro packages

Remove puppet, since it's not used.
Add the missing yum/dnf libxslt dev package needed for Aarch64 CentOS-8
docker image build.

Change-Id: I8669e5d7aba6a5ad113bb0f3f9ea737ce6ae6829
Signed-off-by: Juraj Linkeš <[email protected]>

diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh
index 0c37115..b0bc4bc 100644 (file)
--- a/docker/scripts/lib_apt.sh
+++ b/docker/scripts/lib_apt.sh
@@ -114,10 +114,11 @@ ENV PATH=$PATH:$DOCKER_CIMAN_ROOT/docker/scripts
 #       python3-venv
 #   for lftools:
 #       xmlstarlet
-#   from global-jjb/packer/provision/baseline.sh:
+#       libxml2-dev
+#       libxslt-dev
+#   from packer/provision/baseline.sh:
 #       unzip
 #       xz-utils
-#       puppet
 #       git
 #       git-review
 #       libxml2-dev

diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh
index 639e7f0..e5948fb 100644 (file)
--- a/docker/scripts/lib_dnf.sh
+++ b/docker/scripts/lib_dnf.sh
@@ -79,14 +79,14 @@ COPY . .
 # ci-management global-jjb requirements:
 #   for lftools:
 #       libxml2-devel
+#       libxslt-devel
 #       xmlstarlet
 #   for lf-env.sh:
 #       facter
-#   from global-jjb/packer/provision/baseline.sh:
+#   from packer/provision/baseline.sh:
 #       deltarpm
 #       unzip
 #       xz
-#       puppet
 #       python3-pip
 #       git
 #       git-review
@@ -131,6 +131,7 @@ RUN export LC_ALL=C.UTF8 \\
         libffi-devel \\
         libpcap-devel \\
         libxml2-devel \\
+        libxslt-devel \\
         make \\
         mawk \\
         mock \\
@@ -138,7 +139,6 @@ RUN export LC_ALL=C.UTF8 \\
         perl \\
         perl-XML-XPath \\
         python3-pip \\
-        puppet \\
         rake \\
         rsync \\
         ruby-devel \\

diff --git a/docker/scripts/lib_yum.sh b/docker/scripts/lib_yum.sh
index 89ac3a6..58ad38f 100644 (file)
--- a/docker/scripts/lib_yum.sh
+++ b/docker/scripts/lib_yum.sh
@@ -72,14 +72,14 @@ COPY . .
 # ci-management global-jjb requirements:
 #   for lftools:
 #       libxml2-devel
+#       libxslt-devel
 #       xmlstarlet
 #   for lf-env.sh:
 #       facter
-#   from global-jjb/packer/provision/baseline.sh:
+#   from packer/provision/baseline.sh:
 #       deltarpm
 #       unzip
 #       xz
-#       puppet
 #       python3-pip
 #       git
 #       git-review
@@ -121,13 +121,13 @@ RUN yum update -y \\
         libopenblas-devel \\
         libpcap-devel \\
         libxml2-devel \\
+        libxslt-devel \\
         make \\
         mawk \\
         mock \\
         perl \\
         perl-XML-XPath \\
         python3-pip \\
-        puppet \\
         rake \\
         ruby-devel \\
         sudo \\