Merge branch 'ent-6862-add-enterprise-dependencies-docker' into 'develop'

add dependencies in base docker image

See merge request artica/pandorafms!3727

extras/docker/centos8/base/Dockerfile

@@ -9,7 +9,7 @@ RUN dnf install -y --setopt=tsflags=nodocs \
         http://rpms.remirepo.net/enterprise/remi-release-8.rpm
 		
 RUN dnf module reset -y php && dnf module install -y php:remi-7.3
-RUN dnf config-manager --set-enabled PowerTools
+RUN dnf config-manager --set-enabled powertools
 
 # Install console
 RUN dnf install -y --setopt=tsflags=nodocs \
@@ -88,7 +88,7 @@ RUN dnf install -y --setopt=tsflags=nodocs \
         xorg-x11-fonts-75dpi \
         xorg-x11-fonts-misc \
         poppler-data \
-        php-yaml; yum clean all
+        php-yaml
 
 RUN mkdir -p /run/php-fpm/ ; chown -R root:apache /run/php-fpm/
 # not installed perl-Net-Telnet gtk-update-icon-cach ghostscript-fonts
@@ -242,16 +242,31 @@ RUN dnf install -y  --setopt=tsflags=nodocs \
         perl-DBD-MySQL \
         perl-DBI \
         initscripts \
+        vim \
+        fping \
+        perl-IO-Compress \
+	perl-Time-HiRes \
+	perl-Math-Complex \
+	libnsl \
+        mysql \
+        java \
+        net-snmp-utils \
         net-tools \
         nmap-ncat \
         nmap \
         net-snmp-utils \
         sudo \
         http://firefly.artica.es/centos8/perl-Net-Telnet-3.04-1.el8.noarch.rpm \
-        http://www6.atomicorp.com/channels/atomic/centos/7/x86_64/RPMS/wmi-1.3.14-4.el7.art.x86_64.rpm 
+        http://firefly.artica.es/centos8/wmi-1.3.14-4.el7.art.x86_64.rpm 
 
+# install utils
+RUN dnf install -y supervisor crontabs http://firefly.artica.es/centos8/phantomjs-2.1.1-1.el7.x86_64.rpm --setopt=tsflags=nodocs
+# SDK VMware perl dependencies
+RUN dnf install -y http://firefly.artica.es/centos8/perl-Crypt-OpenSSL-AES-0.02-1.el8.x86_64.rpm http://firefly.artica.es/centos8/perl-Crypt-SSLeay-0.73_07-1.gf.el8.x86_64.rpm perl-Net-HTTP perl-libwww-perl openssl-devel perl-Crypt-CBC perl-Bytes-Random-Secure perl-Crypt-Random-Seed perl-Math-Random-ISAAC perl-JSON http://firefly.artica.es/centos8/VMware-vSphere-Perl-SDK-6.5.0-4566394.x86_64.rpm
+# Instant client Oracle
+RUN dnf install -y https://download.oracle.com/otn_software/linux/instantclient/19800/oracle-instantclient19.8-basic-19.8.0.0.0-1.x86_64.rpm https://download.oracle.com/otn_software/linux/instantclient/19800/oracle-instantclient19.8-sqlplus-19.8.0.0.0-1.x86_64.rpm
 
-RUN dnf install -y supervisor crontabs mysql http://firefly.artica.es/centos8/phantomjs-2.1.1-1.el7.x86_64.rpm --setopt=tsflags=nodocs
+RUN dnf install -y supervisor crontabs http://firefly.artica.es/centos8/phantomjs-2.1.1-1.el7.x86_64.rpm --setopt=tsflags=nodocs
 
 
 EXPOSE 80 443 41121 162/udp

extras/docker/centos8/build_image_el8.sh

@@ -64,6 +64,7 @@ wget $oconsoleurl
 wget $oserverurl
 
 if [ "$BASEBUILD" == 1 ] ; then
+	docker pull centos:8
 	# Open Base image
 	echo "building Base el8 image"
 	cd $DOCKER_PATH/base
@@ -71,9 +72,12 @@ if [ "$BASEBUILD" == 1 ] ; then
 	echo "Taging Open stack el8 latest image before upload"	
 	docker tag $OBASE_IMAGE:$VERSION  $OBASE_IMAGE:latest
 	echo -e ">>>> \n"
+else 
+	docker pull pandorafms/pandorafms-open-base-el8
 fi
 
 if [ "$DBBUILD" == 1 ] ; then
+	docker pull percona:5.7
 	# Percona image
 	echo "building Percona image"
 	cd $OPEN/extras/docker/percona