[UPADTE] - add generate Dockerfile image

.dockerignore

@@ -1 +1,2 @@
 ./data
+./data.old

DockerFile/Dockerfile.esl

@@ -1,8 +1,8 @@
 FROM centos:centos7
-LABEL maintainer="Guillaume Astier Ruiz"
+LABEL maintainer='Guillaume Astier Ruiz'
 
-ENV os="centos" \
+ENV os='centos'
-    osversion="7" 
+    osversion='7' 
 
 RUN yum install -y perl perl-Business-ISBN perl-Business-ISBN-Data perl-Carp perl-Compress-Raw-Bzip2 perl-Compress-Raw-Zlib perl-Data-Dumper perl-Data-OptList perl-Digest perl-Digest-MD5 perl-Encode perl-Encode-Locale perl-Error perl-Exporter perl-ExtUtils-Install perl-ExtUtils-MakeMaker perl-ExtUtils-Manifest perl-ExtUtils-ParseXS perl-File-Listing perl-File-Path perl-File-Temp perl-Filter perl-Font-AFM perl-Getopt-Long perl-HTML-Format perl-HTML-Parser perl-HTML-Tagset perl-HTML-Tree perl-HTTP-Cookies perl-HTTP-Daemon perl-HTTP-Date perl-HTTP-Message perl-HTTP-Negotiate perl-HTTP-Tiny perl-IO-Compress perl-IO-HTML perl-IO-Socket-IP perl-IO-Socket-SSL perl-IO-stringy perl-LWP-MediaTypes perl-Module-Implementation perl-Module-Runtime perl-Mozilla-CA perl-Net-HTTP perl-Net-LibIDN perl-Net-SSLeay perl-Package-Generator perl-PadWalker perl-Params-Util perl-Params-Validate perl-PathTools perl-Pod-Escapes perl-Pod-Perldoc perl-Pod-Simple perl-Pod-Usage perl-Scalar-List-Utils perl-Socket perl-Storable perl-Sub-Exporter perl-Sub-Install perl-TermReadKey perl-Test-Harness perl-Text-ParseWords perl-Thread-Queue perl-Time-HiRes perl-Time-Local perl-TimeDate perl-Tk perl-Try-Tiny perl-URI perl-WWW-RobotRules perl-XML-Catalog perl-XML-DOM perl-XML-Dumper perl-XML-Filter-BufferText perl-XML-Grove perl-XML-Handler-YAWriter perl-XML-LibXML perl-XML-LibXSLT perl-XML-NamespaceSupport perl-XML-Parser perl-XML-RegExp perl-XML-SAX perl-XML-SAX-Base perl-XML-SAX-Writer perl-XML-Simple perl-XML-TokeParser perl-XML-TreeBuilder perl-XML-Twig perl-XML-Writer perl-XML-XPath perl-XML-XPathEngine perl-constant perl-devel perl-libs perl-libwww-perl perl-libxml-perl perl-macros perl-parent perl-podlators perl-srpm-macros perl-threads perl-threads-shared 
 RUN yum install -y basesystem binutils bzip2 cpp createrepo dejavu-fonts-common dejavu-sans-fonts deltarpm dwz elfutils elfutils-devel elfutils-libelf-devel fontconfig fontpackages-filesystem gcc gdb gdbm-devel genisoimage glibc-devel glibc-headers gpm-libs groff-base keyutils-libs-devel libX11 libX11-common libXau libXft libXrender libcom_err-devel libdb-devel libjpeg-turbo libmpc libselinux-devel libsepol-devel libusal libverto-devel libxcb libxml2-python lm_sensors-devel lm_sensors-libs mailcap mpfr ncurses-base net-tools openssl-devel pcre-devel popt-devel pyparsing python-deltarpm python-gobject-base python-srpm-macros redhat-rpm-config rpm-build rpm-devel rsync strace tcp_wrappers-devel tree unzip vim-common vim-enhanced vim-filesystem xz-devel zip zlib-devel nginx openssh-clients

DockerFile/Dockerfile.repo

@@ -0,0 +1,15 @@
+FROM centos:${CentOsVersion}
+LABEL maintainer='Guillaume Astier Ruiz'
+
+ENV os='centos'
+    osversion='7'
+
+
+RUN yum install yum-utils createrepo vim wget -y 
+RUN yum install epel-release -y
+COPY ./bin/sync.sh /bin/sync.sh
+RUN chmod 755 /bin/sync.sh
+COPY ./bin/empty.sh /bin/empty.sh
+RUN chmod 755 /bin/empty.sh
+
+CMD ["${Run} ${RunArg}"]

Dockerfile.repo

@@ -1,25 +0,0 @@
-
-FROM centos:${CentOsVersion}
-ENV container docker
-RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \
-systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*;\
-rm -f /etc/systemd/system/*.wants/*;\
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*;\
-rm -f /lib/systemd/system/anaconda.target.wants/*;
-VOLUME [ "/sys/fs/cgroup" ]
-
-
-RUN yum install yum-utils createrepo vim wget -y 
-RUN yum install epel-release -y
-COPY ./bin/sync.sh /bin/sync.sh
-RUN chmod 755 /bin/sync.sh
-COPY ./bin/empty.sh /bin/empty.sh
-RUN chmod 755 /bin/empty.sh
-
-#CMD ["/usr/sbin/init"]
-#CMD ["/bin/sync.sh"]
-CMD ["${Run} ${RunArg}"]

generate_env.sh

@@ -56,27 +56,85 @@ cd ${Wai}
 
 
 DockerGen() {
-	echo "Generate compilator Dokcer ... : "
+	echo -n "Delete Dockerfile ... : "
-	docker build . -t esl-compilator -f Dockerfile.esl 2>&1 | tee $LogDockerCompilatorGenerate &> /dev/null 
+	[[ -f ${Wai}/Dockerfile ]] && rm Dockerfile || true
 	Res $?
 
-	echo "Generate Repo Docker ... : "
+
-	docker build . -t esl-compilator -f Dockerfile.esl 2>&1 | tee $LogDockerCompilatorGenerate &> /dev/null 
+	echo -n "generate Dockerfile Esl compilator ... : "
+	source define.conf
+	while read line
+		do
+			if [[ ! -z $(echo "$line" | grep '\$') ]]
+				then
+					eval echo "${line}" 
+				else
+					echo $line
+			fi
+        done < DockerFile/Dockerfile.esl > Dockerfile
 	Res $?
+
+	echo -n "Delete Dockerfile ... : "
+	[[ -f ${Wai}/Dockerfile ]] && rm Dockerfile || true
+	Res $?
+
+
+	echo -n "Generate compilator Docker image ... : "
+	docker build . -t esl-compilator 2>&1 | tee $LogDockerCompilatorGenerate &> /dev/null 
+	Res $?
+
+	echo -n "generate Dockerfile CentOS REPO ... : "
+	while read line
+		do
+			if [[ ! -z $(echo "$line" | grep '\$') ]]
+				then
+					eval echo "${line}" 
+				else
+					echo $line
+			fi
+        done < DockerFile/Dockerfile.repo > Dockerfile
+	Res $?
+
+
+
+	echo -n "Generate Repo Docker image ... : "
+	docker build . -t c7repo 2>&1 | tee $LogDockerRepoGenerate &> /dev/null 
+	Res $?
+
+	echo "
+------ Log Compil -----------
+$LogDockerCompilatorGenerate
+$LogDockerRepoGenerate
+-----------------------------
+"
+
 }
 
 
 DockerComposeRunEsl () {
 	[[ $1 == "Print" ]] && Print="" || Print="-d"
 	echo -n "Starting ESL COMPILATOR ... : "
-	docker-compose  -f docker-compose.yml.esl up ${Print} 2>&1 ${LogDockerCompilatorRun} &> /dev/null
+	docker-compose  -f docker-compose.yml.esl up ${Print} --remove-orphans 2>&1 ${LogDockerCompilatorRun} &> /dev/null
 	Res $?
+	echo "
+--------- Log Esl -----------
+$LogDockerCompilatorRun
+-----------------------------
+"
 }
 
 DockerComposeRunRepo () {
 	echo -n "Starting Repo Sync ... : "
-	docker-compose  -f docker-compose.yml.repo up ${Print} 2>&1 ${LogDockerRepoRun} &> /dev/null
+	echo "docker-compose  -f docker-compose.yml.repo up --remove-orphans ${Print} "
+	exit
+	docker-compose  -f docker-compose.yml.repo up --remove-orphans ${Print} 2>&1 ${LogDockerRepoRun} &> /dev/null
 	Res $?
+	echo "
+-------- Log Repo -----------
+$LogDockerRepoRun
+-----------------------------
+"
+
 }
 
 
@@ -84,7 +142,7 @@ Exec=$1
 
 
 
-[[ -z "${Exec}"]] && help 
+[[ -z "${Exec}" ]] && help 
 [[ "${Exec}" == "image" ]] && DockerGen
 
 
@@ -101,7 +159,3 @@ if [[ "${Exec}" == "all" ]]
 fi
 
 
-
-
-
-