guillaume/ESL-devenv
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

[UPADTE] - compile esl porduit success git status !

Browse Source
This commit is contained in:
isen
2022-10-20 17:09:11 +02:00
parent d4a41cf128
commit 66d98e5400
11 changed files with 78 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Template/Dockerfile.gen
+25 -10
View File
@@ -1,19 +1,34 @@
FROM centos:centos7
#FROM centos:centos7
FROM ${Cible}:${VersionCible}
LABEL maintainer='Guillaume Astier Ruiz'
ENV os='centos'
ENV osversion='7'
ENV ESL-TOOLS=gen
ENV os="${Cible}"
ENV osversion="${VersionCible}"
ENV ESL-TOOLS=repo
ENV TERM=xterm
RUN yum update -y
RUN ${PackageManager} update -y
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
RUN ${PackageManager} install -y perl 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-Getopt-Long perl-HTML-Parser perl-HTML-Tagset perl-HTTP-Cookies 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-LWP-MediaTypes perl-Module-Runtime perl-Mozilla-CA perl-Net-HTTP perl-Net-SSLeay perl-Package-Generator perl-Params-Util 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-LibXML perl-XML-NamespaceSupport perl-XML-Parser perl-XML-SAX perl-XML-SAX-Base perl-XML-Simple perl-XML-TokeParser perl-XML-XPath 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 ${PackageManager} install -y basesystem binutils bzip2 cpp createrepo dejavu-fonts-common dejavu-sans-fonts 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 lm_sensors-devel lm_sensors-libs mailcap mpfr ncurses-base net-tools openssl-devel pcre-devel popt-devel python3 python-srpm-macros redhat-rpm-config rpm-build rpm-devel rsync strace tree unzip vim-common vim-enhanced vim-filesystem xz-devel zip zlib-devel nginx openssh-clients
RUN yum install -y net-snmp
RUN ${PackageManager} install -y net-snmp
RUN ${PackageManager} install epel-release -y
RUN ${PackageManager} install screen -y
COPY ./bin/run.sh /usr/local/bin/run.sh
COPY ./bin/ /usr/local/bin/
RUN chmod 777 /usr/local/bin/run.sh
CMD /usr/local/bin/run.sh ${GenScript}
RUN groupadd esl -g 1000
#RUN useradd -s /bin/bash -g 1000 -u 1000 -p "$(/usr/bin/openssl passwd -1 esl)" esl
RUN useradd -s /bin/bash -g 1000 -u 1000 esl
RUN mkdir /data
RUN mkdir -p /tmp/log/
RUN chown -R esl:esl /data
RUN chown -R esl:esl /tmp/log
USER esl
RUN echo /usr/local/bin/run.sh ${GenScript}
CMD /usr/local/bin/run.sh ${GenScript}
Template/Dockerfile.repo
+10 -8
View File
@@ -8,27 +8,29 @@ ENV osversion="${VersionCible}"
ENV ESL-TOOLS=repo
ENV TERM=xterm
RUN yum update -y
RUN ${PackageManager} update -y
RUN yum install yum-utils createrepo vim wget -y
RUN yum install epel-release -y
RUN yum install screen -y
#COPY ./bin/sync.sh /usr/local/bin/sync.sh
RUN ${PackageManager} install yum-utils createrepo vim wget -y
RUN ${PackageManager} install epel-release -y
RUN ${PackageManager} install screen -y
#COPY ./bin/repo.sh /usr/local/bin/repo.sh
COPY ./bin/ /usr/local/bin/
#RUN chmod 755 /usr/local/bin/sync.sh
#RUN chmod 755 /usr/local/bin/repo.sh
RUN chmod 755 /usr/local/bin/*
#COPY ./bin/empty.sh /usr/local/bin/empty.sh
#RUN chmod 755 /usr/local/bin/empty.sh
RUN yum install openssl -y
RUN groupadd esl -g 1000
RUN useradd -s /bin/bash -g 1000 -u 1000 -p "$(/usr/bin/openssl passwd -1 esl)" esl
#RUN useradd -s /bin/bash -g 1000 -u 1000 -p "$(/usr/bin/openssl passwd -1 esl)" esl
RUN useradd -s /bin/bash -g 1000 -u 1000 esl
RUN mkdir /data
RUN mkdir -p /tmp/log/
RUN chown -R esl:esl /data
RUN chown -R esl:esl /tmp/log
USER esl
Template/docker-compose.yml.repo
+1 -1
View File
@@ -6,6 +6,6 @@ services:
image: esl-repo:${RepoVers}
volumes:
- ./data:/data
- ./log:/tmp/log
- ./data/log:/tmp/log
- ./bin:/usr/local/bin
Template/function
+4 -2
View File
@@ -55,7 +55,8 @@ DeleteFile() {
DockerConnect() {
Inst=$(docker ps|grep "esl-$1" | awk '{print $NF}')
[[ -z "${Inst}" ]] && docker run -ti -v $(realpath $(dirname $0))/data:/data -u esl esl\-${1}:1 bash || docker exec -ti ${Inst} bash
[[ -L $(realpath $(dirname $0))/cible ]] && Cible="-v $(realpath $(dirname $0))/cible:/data/cible"
[[ -z "${Inst}" ]] && docker run -ti -v $(realpath $(dirname $0))/data:/data -v $(realpath $(dirname $0))/data/log:/log ${Cible} --hostname $1 -u esl esl\-${1}:2 bash || docker exec -ti ${Inst} bash
echo DEBUG $Inst $1
}
@@ -124,7 +125,8 @@ DockerComposeRun () {
[[ "$2" == "Print" ]] && Print="-d" || Print=""
cp ${Wai}/Template/docker-compose.yml.$1 ${Wai}/docker-compose.yml
echo "Log is : log/${1} - use tail -f ./log/$1"
docker run -ti -v $(realpath $(dirname $0))/data:/data -u esl esl-repo:1 /usr/local/bin/sync.sh
[[ -L $(realpath $(dirname $0))/cible ]] && Cible="-v $(realpath $(dirname $0))/cible:/data/cible"
docker run -ti -v $(realpath $(dirname $0))/data:/data -v $(realpath $(dirname $0))/data/log:/tmp/log ${Cible} -u esl --hostname $1 esl\-${1}:2 /usr/local/bin/${1}.sh
#yes | docker-compose up ${Print} --remove-orphans 1>&1 | tee /tmp/RunDocker-${1}.log &> /dev/null
##yes | docker-compose up ${Print} --remove-orphans
Res $?