Enh: TEST fedora-42 now have a faster docker image for tests

naparuba · naparuba · commit 74c8b5359e9b · 2024-09-17T13:40:51.000+02:00
diff --git a/test/docker-files/TEMPLATE-centos7-PYTHON3.txt b/test/docker-files/TEMPLATE-centos7-PYTHON3.txt
diff --git a/test/docker-files/TEMPLATE-centos7.txt b/test/docker-files/TEMPLATE-centos7.txt
diff --git a/test/docker-files/TEMPLATE-debian9-PYTHON3.txt b/test/docker-files/TEMPLATE-debian9-PYTHON3.txt
diff --git a/test/docker-files/TEMPLATE-debian9.txt b/test/docker-files/TEMPLATE-debian9.txt
diff --git a/test/docker-files/TEMPLATE-fedora42.txt b/test/docker-files/TEMPLATE-fedora42.txt
@@ -0,0 +1,21 @@
+FROM       fedora:42
+LABEL maintainer="Jean Gabes <naparuba@gmail.com>"
+
+# THIS DOCKER FILE is USED TO PUSH TO naparuba/fedora-42 so tests will be faster, and won't need to recompute all of this every time
+
+ADD        test/docker-helper/  /
+
+RUN        /dnf_install   python3-rpm
+RUN        /dnf_install   python3-jinja2
+RUN        /dnf_install   python3-crypto
+RUN        /dnf_install   python3-simplejson
+RUN        /dnf_install   bash-completion  # Bash completion to enable the CLI completion
+RUN        /dnf_install   leveldb
+RUN        /dnf_install   python3-setproctitle
+RUN        /dnf_install   python3-psutil
+RUN        /dnf_install   python3-yaml
+
+ENV        PYTHON_EXE=/usr/bin/python3
+
+
+ENTRYPOINT     /bin/bash
diff --git a/test/docker-files/docker-file-COMPLIANCE-PACKAGE-INSTALL-fedora42.txt b/test/docker-files/docker-file-COMPLIANCE-PACKAGE-INSTALL-fedora42.txt
@@ -1,8 +1,6 @@
-FROM       fedora:42
-LABEL maintainer="Jean Gabes <naparuba@gmail.com>"
+FROM       naparuba/fedora-42
+LABEL      maintainer="Jean Gabes <naparuba@gmail.com>"
 
-ADD        test/docker-helper/  /
-RUN        /dnf_install python3
 
 # Need for debug and test
 RUN        /dnf_install   procps
diff --git a/test/docker-files/docker-file-MODULE-discord-module-fedora42.txt b/test/docker-files/docker-file-MODULE-discord-module-fedora42.txt
@@ -1,4 +1,4 @@
-FROM       fedora:42
+FROM       naparuba/fedora-42
 LABEL      maintainer="Jean Gabes <naparuba@gmail.com>"
 
 
diff --git a/test/docker-files/docker-file-MODULE-dns-module-fedora42.txt b/test/docker-files/docker-file-MODULE-dns-module-fedora42.txt
@@ -1,9 +1,9 @@
-FROM       fedora:42
+FROM       naparuba/fedora-42
 LABEL      maintainer="Jean Gabes <naparuba@gmail.com>"
 
 
 # DNS: need dig
-RUN        /yum_install  bind-utils
+RUN        /dnf_install  bind-utils
 
 ADD        . /root/opsbro-oss
 
diff --git a/test/docker-files/docker-file-PACK-MONGODB-fedora42.txt b/test/docker-files/docker-file-PACK-MONGODB-fedora42.txt
@@ -1,7 +1,7 @@
 FROM       fedora:42
 LABEL maintainer="Jean Gabes <naparuba@gmail.com>"
 
-
+ADD        test/docker-helper/  /
 
 ADD        . /root/opsbro-oss
 WORKDIR    /root/opsbro-oss
diff --git a/test/docker-files/docker-file-PACK-MYSQL-fedora42.txt b/test/docker-files/docker-file-PACK-MYSQL-fedora42.txt
@@ -1,8 +1,8 @@
-FROM       almalinux:9.3
-LABEL maintainer="Jean Gabes <naparuba@gmail.com>"
+FROM       naparuba/fedora-42
+LABEL      maintainer="Jean Gabes <naparuba@gmail.com>"
 
 
-RUN        /yum_install mariadb-server
+RUN        /dnf_install mariadb-server
 
 RUN        mysql_install_db --user=mysql --basedir=/usr/ --ldata=/var/lib/mysql/
 
diff --git a/test/docker-files/docker-file-PACK-RABBITMQ-fedora42.txt b/test/docker-files/docker-file-PACK-RABBITMQ-fedora42.txt
@@ -1,8 +1,8 @@
-FROM       fedora:42
-LABEL maintainer="Jean Gabes <naparuba@gmail.com>"
+FROM       naparuba/fedora-42
+LABEL      maintainer="Jean Gabes <naparuba@gmail.com>"
 
 
-RUN        /yum_install rabbitmq-server
+RUN        /dnf_install rabbitmq-server
 
 ADD        . /root/opsbro-oss
 WORKDIR    /root/opsbro-oss
diff --git a/test/docker-files/docker-file-PACK-REDIS-fedora42.txt b/test/docker-files/docker-file-PACK-REDIS-fedora42.txt
@@ -1,8 +1,8 @@
-FROM       fedora:42
+FROM       naparuba/fedora-42
 LABEL      maintainer="Jean Gabes <naparuba@gmail.com>"
 
 
-RUN        /yum_install  redis
+RUN        /dnf_install  redis
 
 ADD        . /root/opsbro-oss
 WORKDIR    /root/opsbro-oss

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM fedora:42`
	`1`	`+FROM naparuba/fedora-42`
`2`	`2`	`LABEL maintainer="Jean Gabes <naparuba@gmail.com>"`
`3`	`3`
`4`	`4`