From 4ef1290e9fd62f1c924465b6de76acac1a4a99c0 Mon Sep 17 00:00:00 2001 From: Juraj Linkeš Date: Thu, 17 Dec 2020 11:52:23 +0100 Subject: docker: update distro packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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š --- docker/scripts/lib_apt.sh | 5 +++-- docker/scripts/lib_dnf.sh | 6 +++--- docker/scripts/lib_yum.sh | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'docker') diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh index 0c3711534..b0bc4bc96 100644 --- 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 639e7f073..e5948fbda 100644 --- 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 89ac3a691..58ad38f64 100644 --- 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 \\ -- cgit 1.2.3-korg