From: Magnus Jacobsson Date: Mon, 1 Jun 2020 06:53:53 +0000 (+0200) Subject: Squash Fedora Dockerfiles yums into fewer layers X-Git-Tag: 2.44.1~32^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ff4730605f081febbb10a4fa5404439bf3db3285;p=graphviz Squash Fedora Dockerfiles yums into fewer layers --- diff --git a/ci/fedora29/Dockerfile b/ci/fedora29/Dockerfile index 0590f0dc3..83ef934a9 100644 --- a/ci/fedora29/Dockerfile +++ b/ci/fedora29/Dockerfile @@ -1,114 +1,81 @@ FROM fedora:29 # Development tools -RUN yum -y groupinstall 'Development Tools' -RUN ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so -RUN yum -y install rpm-build -RUN yum -y install bison -RUN yum -y install byacc -RUN yum -y install flex - +RUN yum -y groupinstall 'Development Tools' \ +&& ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so \ +&& yum -y install rpm-build \ +bison \ +byacc \ +flex \ # Centos build utilities -RUN yum -y install libtool-ltdl-devel -RUN yum -y install ksh -RUN yum -y install cmake - +libtool-ltdl-devel \ +ksh \ +cmake \ # Option glut -RUN yum -y install freeglut-devel - +freeglut-devel \ # Option ann -RUN yum -y install ann-devel - +ann-devel \ # Option gts -RUN yum -y install gts-devel - +gts-devel \ # Option swig -RUN yum -y install swig - +swig \ # Command lefty - # Command smyra - # Command gvedit -RUN yum -y install qt5-devel -RUN yum -y install ncurses-devel - +qt5-devel \ +ncurses-devel \ # Plugin library devil -RUN yum -y install DevIL-devel - +DevIL-devel \ # Plugin library gd -RUN yum -y install gd-devel - +gd-devel \ # Documentation and Plugin library ghostscipt -RUN yum -y install ghostscript ghostscript-devel - +ghostscript ghostscript-devel \ # Plugin library gtk -RUN yum -y install gtkglext-devel - +gtkglext-devel \ # Plugin library lasi -RUN yum -y install lasi-devel - +lasi-devel \ # Plugin library pangocairo - # Plugin library poppler -RUN yum -y install poppler-glib-devel -RUN yum -y install poppler-qt5 - +poppler-glib-devel \ +poppler-qt5 \ # Plugin library rsvg -RUN yum -y install librsvg2-devel - +librsvg2-devel \ # Plugin library webp - # Language extension gv_sharp & gv_ruby - # Language extension gv_go -RUN yum -y install golang -RUN yum -y install gcc-go - +golang \ +gcc-go \ # Language extension gv_guile -RUN yum -y install guile-devel - +guile-devel \ # Language extension gv_java -RUN yum -y install java-devel - +java-devel \ # Language extension gv_lua -RUN yum -y install lua-devel - +lua-devel \ # Language extension gv_ocaml -RUN yum -y install ocaml - -# Language extension gv_perl -RUN yum -y install perl-ExtUtils-Embed - +ocaml \ +# Language extension gv_perl \ +perl-ExtUtils-Embed \ # Language extension gv_php -RUN yum -y install php-devel -RUN yum -y install krb5-devel -RUN yum -y install openssl-devel -RUN yum -y install libargon2-devel - +php-devel \ +krb5-devel \ +openssl-devel \ +libargon2-devel \ # Language extension gv_python & gv_python2 -RUN yum -y install python2-devel - +python2-devel \ # Language extension gv_python3 -RUN yum -y install python3-devel - +python3-devel \ # Language extension gv_R -RUN yum -y install R-devel - +R-devel \ # Language extension gv_ruby -RUN yum -y install ruby-devel - +ruby-devel \ # Language extension gv_tcl - # Required in redhat/graphviz.spec.fedora.in -RUN yum -y install libXaw-devel -RUN yum -y install glade3-libgladeui-devel -RUN yum -y install libglade2-devel -RUN yum -y install mono-core - +libXaw-devel \ +glade3-libgladeui-devel \ +libglade2-devel \ +mono-core \ # Test utilities -RUN yum -y install -y python-pytest -RUN yum -y install -y python3-pytest - +python-pytest \ +python3-pytest \ # Clean up -RUN yum clean all && rm -rf /var/cache/yum +&& yum clean all && rm -rf /var/cache/yum diff --git a/ci/fedora30/Dockerfile b/ci/fedora30/Dockerfile index be2da0fa1..64827aff7 100644 --- a/ci/fedora30/Dockerfile +++ b/ci/fedora30/Dockerfile @@ -1,111 +1,77 @@ FROM fedora:30 - # Development tools -RUN yum -y groupinstall 'Development Tools' -RUN ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so -RUN yum -y install rpm-build -RUN yum -y install bison -RUN yum -y install byacc -RUN yum -y install flex - +RUN yum -y groupinstall 'Development Tools' \ +&& ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so \ +&& yum -y install rpm-build \ +bison \ +byacc \ +flex \ # Centos build utilities -RUN yum -y install libtool-ltdl-devel -RUN yum -y install ksh -RUN yum -y install cmake - +libtool-ltdl-devel \ +ksh \ +cmake \ # Option glut -RUN yum -y install freeglut-devel - +freeglut-devel \ # Option ann -RUN yum -y install ann-devel - +ann-devel \ # Option gts -RUN yum -y install gts-devel - +gts-devel \ # Option swig -RUN yum -y install swig - +swig \ # Command lefty - # Command smyra - # Command gvedit -RUN yum -y install qt5-devel -RUN yum -y install ncurses-devel - +qt5-devel \ +ncurses-devel \ # Plugin library devil -RUN yum -y install DevIL-devel - +DevIL-devel \ # Plugin library gd -RUN yum -y install gd-devel - +gd-devel \ # Documentation and Plugin library ghostscipt -RUN yum -y install ghostscript ghostscript-devel - +ghostscript ghostscript-devel \ # Plugin library gtk -RUN yum -y install gtkglext-devel - +gtkglext-devel \ # Plugin library lasi -RUN yum -y install lasi-devel - +lasi-devel \ # Plugin library pangocairo - # Plugin library poppler -RUN yum -y install poppler-glib-devel -RUN yum -y install poppler-qt5 - +poppler-glib-devel \ +poppler-qt5 \ # Plugin library rsvg -RUN yum -y install librsvg2-devel - +librsvg2-devel \ # Plugin library webp - # Language extension gv_sharp & gv_ruby - # Language extension gv_go -RUN yum -y install golang -RUN yum -y install gcc-go - +golang \ +gcc-go \ # Language extension gv_guile -RUN yum -y install guile-devel - +guile-devel \ # Language extension gv_java -RUN yum -y install java-devel - +java-devel \ # Language extension gv_lua -RUN yum -y install lua-devel - +lua-devel \ # Language extension gv_ocaml -RUN yum -y install ocaml - +ocaml \ # Language extension gv_perl -RUN yum -y install perl-ExtUtils-Embed - +perl-ExtUtils-Embed \ # Language extension gv_php -RUN yum -y install php-devel - +php-devel \ # Language extension gv_python & gv_python2 -RUN yum -y install python2-devel - +python2-devel \ # Language extension gv_python3 -RUN yum -y install python3-devel - +python3-devel \ # Language extension gv_R -RUN yum -y install R-devel - +R-devel \ # Language extension gv_ruby -RUN yum -y install ruby-devel - +ruby-devel \ # Language extension gv_tcl - # Required in redhat/graphviz.spec.fedora.in -RUN yum -y install libXaw-devel -RUN yum -y install glade3-libgladeui-devel -RUN yum -y install libglade2-devel -RUN yum -y install mono-core - +libXaw-devel \ +glade3-libgladeui-devel \ +libglade2-devel \ +mono-core \ # Test utilities -RUN yum -y install -y python-pytest -RUN yum -y install -y python3-pytest - +python-pytest \ +python3-pytest \ # Clean up -RUN yum clean all && rm -rf /var/cache/yum +&& yum clean all && rm -rf /var/cache/yum diff --git a/ci/fedora31/Dockerfile b/ci/fedora31/Dockerfile index b23197875..d228c5238 100644 --- a/ci/fedora31/Dockerfile +++ b/ci/fedora31/Dockerfile @@ -1,110 +1,77 @@ FROM fedora:31 # Development tools -RUN yum -y groupinstall 'Development Tools' -RUN ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so -RUN yum -y install rpm-build -RUN yum -y install bison -RUN yum -y install byacc -RUN yum -y install flex - +RUN yum -y groupinstall 'Development Tools' \ +&& ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so \ +&& yum -y install rpm-build \ +bison \ +byacc \ +flex \ # Centos build utilities -RUN yum -y install libtool-ltdl-devel -RUN yum -y install ksh -RUN yum -y install cmake - +libtool-ltdl-devel \ +ksh \ +cmake \ # Option glut -RUN yum -y install freeglut-devel - +freeglut-devel \ # Option ann -RUN yum -y install ann-devel - +ann-devel \ # Option gts -RUN yum -y install gts-devel - +gts-devel \ # Option swig -RUN yum -y install swig - +swig \ # Command lefty - # Command smyra - # Command gvedit -RUN yum -y install qt5-devel -RUN yum -y install ncurses-devel - +qt5-devel \ +ncurses-devel \ # Plugin library devil -RUN yum -y install DevIL-devel - +DevIL-devel \ # Plugin library gd -RUN yum -y install gd-devel - +gd-devel \ # Documentation and Plugin library ghostscipt -RUN yum -y install ghostscript ghostscript-devel - +ghostscript ghostscript-devel \ # Plugin library gtk -RUN yum -y install gtkglext-devel - +gtkglext-devel \ # Plugin library lasi -RUN yum -y install lasi-devel - +lasi-devel \ # Plugin library pangocairo - # Plugin library poppler -RUN yum -y install poppler-glib-devel -RUN yum -y install poppler-qt5 - +poppler-glib-devel \ +poppler-qt5 \ # Plugin library rsvg -RUN yum -y install librsvg2-devel - +librsvg2-devel \ # Plugin library webp - # Language extension gv_sharp & gv_ruby - # Language extension gv_go -RUN yum -y install golang -RUN yum -y install gcc-go - +golang \ +gcc-go \ # Language extension gv_guile -RUN yum -y install guile-devel - +guile-devel \ # Language extension gv_java -RUN yum -y install java-devel - +java-devel \ # Language extension gv_lua -RUN yum -y install lua-devel - +lua-devel \ # Language extension gv_ocaml -RUN yum -y install ocaml - +ocaml \ # Language extension gv_perl -RUN yum -y install perl-ExtUtils-Embed - +perl-ExtUtils-Embed \ # Language extension gv_php -RUN yum -y install php-devel - +php-devel \ # Language extension gv_python & gv_python2 -RUN yum -y install python2-devel - +python2-devel \ # Language extension gv_python3 -RUN yum -y install python3-devel - +python3-devel \ # Language extension gv_R -RUN yum -y install R-devel - +R-devel \ # Language extension gv_ruby -RUN yum -y install ruby-devel - +ruby-devel \ # Language extension gv_tcl - # Required in redhat/graphviz.spec.fedora.in -RUN yum -y install libXaw-devel -RUN yum -y install glade3-libgladeui-devel -RUN yum -y install libglade2-devel -RUN yum -y install mono-core - +libXaw-devel \ +glade3-libgladeui-devel \ +libglade2-devel \ +mono-core \ # Test utilities -RUN yum -y install -y python-pytest - +python-pytest \ # Clean up -RUN yum clean all && rm -rf /var/cache/yum +&& yum clean all && rm -rf /var/cache/yum diff --git a/ci/fedora32/Dockerfile b/ci/fedora32/Dockerfile index ce3d6163f..bda77c5c0 100644 --- a/ci/fedora32/Dockerfile +++ b/ci/fedora32/Dockerfile @@ -1,109 +1,75 @@ FROM fedora:32 - # Development tools -RUN yum -y groupinstall 'Development Tools' -RUN ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so -RUN yum -y install rpm-build -RUN yum -y install bison -RUN yum -y install byacc -RUN yum -y install flex - +RUN yum -y groupinstall 'Development Tools' \ +&& ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so \ +&& yum -y install rpm-build \ +bison \ +byacc \ +flex \ # Centos build utilities -RUN yum -y install libtool-ltdl-devel -RUN yum -y install ksh -RUN yum -y install cmake - +libtool-ltdl-devel \ +ksh \ +cmake \ # Option glut -RUN yum -y install freeglut-devel - +freeglut-devel \ # Option ann -RUN yum -y install ann-devel - +ann-devel \ # Option gts -RUN yum -y install gts-devel - +gts-devel \ # Option swig -RUN yum -y install swig - +swig \ # Command lefty - # Command smyra - # Command gvedit -RUN yum -y install qt5-devel -RUN yum -y install ncurses-devel - +qt5-devel \ +ncurses-devel \ # Plugin library devil -RUN yum -y install DevIL-devel - +DevIL-devel \ # Plugin library gd -RUN yum -y install gd-devel - +gd-devel \ # Documentation and Plugin library ghostscipt -RUN yum -y install ghostscript ghostscript-devel - +ghostscript ghostscript-devel \ # Plugin library gtk -RUN yum -y install gtkglext-devel - +gtkglext-devel \ # Plugin library lasi -RUN yum -y install lasi-devel - +lasi-devel \ # Plugin library pangocairo - # Plugin library poppler -RUN yum -y install poppler-glib-devel -RUN yum -y install poppler-qt5 - +poppler-glib-devel \ +poppler-qt5 \ # Plugin library rsvg -RUN yum -y install librsvg2-devel - +librsvg2-devel \ # Plugin library webp - # Language extension gv_sharp & gv_ruby - # Language extension gv_go -RUN yum -y install golang -RUN yum -y install gcc-go - +golang \ +gcc-go \ # Language extension gv_guile -RUN yum -y install guile-devel - +guile-devel \ # Language extension gv_java -RUN yum -y install java-devel - +java-devel \ # Language extension gv_lua -RUN yum -y install lua-devel - +lua-devel \ # Language extension gv_ocaml -RUN yum -y install ocaml - +ocaml \ # Language extension gv_perl -RUN yum -y install perl-ExtUtils-Embed - +perl-ExtUtils-Embed \ # Language extension gv_php -RUN yum -y install php-devel - +php-devel \ # Language extension gv_python & gv_python2 - # Language extension gv_python3 -RUN yum -y install python3-devel - +python3-devel \ # Language extension gv_R -RUN yum -y install R-devel - +R-devel \ # Language extension gv_ruby -RUN yum -y install ruby-devel - +ruby-devel \ # Language extension gv_tcl - # Required in redhat/graphviz.spec.fedora.in -RUN yum -y install libXaw-devel -RUN yum -y install glade3-libgladeui-devel -RUN yum -y install libglade2-devel -RUN yum -y install mono-core - +libXaw-devel \ +glade3-libgladeui-devel \ +libglade2-devel \ +mono-core \ # Test utilities -RUN yum -y install -y python-pytest - +python-pytest \ # Clean up -RUN yum clean all && rm -rf /var/cache/yum +&& yum clean all && rm -rf /var/cache/yum \ diff --git a/ci/fedora33/Dockerfile b/ci/fedora33/Dockerfile index e7dc62086..2656f3db2 100644 --- a/ci/fedora33/Dockerfile +++ b/ci/fedora33/Dockerfile @@ -1,111 +1,77 @@ FROM fedora:33 # Development tools -RUN yum -y groupinstall 'Development Tools' -RUN ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so -RUN yum -y install rpm-build -RUN yum -y install bison -RUN yum -y install byacc -RUN yum -y install flex - +RUN yum -y groupinstall 'Development Tools' \ +&& ln -s /usr/lib64/libedit.so.0 /usr/lib64/libedit.so \ +&& yum -y install rpm-build \ +bison \ +byacc \ +flex \ # Centos build utilities -RUN yum -y install libtool-ltdl-devel -RUN yum -y install ksh -RUN yum -y install cmake - +libtool-ltdl-devel \ +ksh \ +cmake \ # Option xpat -RUN yum -y install expat-devel - +expat-devel \ # Option glut -RUN yum -y install freeglut-devel - +freeglut-devel \ # Option ann -RUN yum -y install ann-devel - +ann-devel \ # Option gts -RUN yum -y install gts-devel - +gts-devel \ # Option swig -RUN yum -y install swig - +swig \ # Command lefty - # Command smyra - # Command gvedit -RUN yum -y install qt5-qtbase-devel -RUN yum -y install ncurses-devel - +qt5-qtbase-devel \ +ncurses-devel \ # Plugin library devil -RUN yum -y install DevIL-devel - +DevIL-devel \ # Plugin library gd -RUN yum -y install gd-devel - +gd-devel \ # Documentation and Plugin library ghostscipt -RUN yum -y install ghostscript ghostscript-devel - +ghostscript ghostscript-devel \ # Plugin library gtk -RUN yum -y install gtkglext-devel - +gtkglext-devel \ # Plugin library lasi -RUN yum -y install lasi-devel - +lasi-devel \ # Plugin library pangocairo - # Plugin library poppler -RUN yum -y install poppler-glib-devel -RUN yum -y install poppler-qt5 - +poppler-glib-devel \ +poppler-qt5 \ # Plugin library rsvg -RUN yum -y install librsvg2-devel - +librsvg2-devel \ # Plugin library webp - # Language extension gv_sharp & gv_ruby - # Language extension gv_go -RUN yum -y install golang -RUN yum -y install gcc-go - +golang \ +gcc-go \ # Language extension gv_guile -RUN yum -y install guile-devel - +guile-devel \ # Language extension gv_java -RUN yum -y install java-devel - +java-devel \ # Language extension gv_lua -RUN yum -y install lua-devel - +lua-devel \ # Language extension gv_ocaml -RUN yum -y install ocaml - +ocaml \ # Language extension gv_perl -RUN yum -y install perl-ExtUtils-Embed - +perl-ExtUtils-Embed \ # Language extension gv_php -RUN yum -y install php-devel - +php-devel \ # Language extension gv_python & gv_python2 - # Language extension gv_python3 -RUN yum -y install python3-devel - +python3-devel \ # Language extension gv_R -RUN yum -y install R-devel - +R-devel \ # Language extension gv_ruby -RUN yum -y install ruby-devel - +ruby-devel \ # Language extension gv_tcl - # Required in redhat/graphviz.spec.fedora.in -RUN yum -y install libXaw-devel -RUN yum -y install libglade2-devel -RUN yum -y install mono-core - +libXaw-devel \ +libglade2-devel \ +mono-core \ # Test utilities -RUN yum -y install -y python-pytest - +python-pytest \ # Clean up -RUN yum clean all && rm -rf /var/cache/yum +&& yum clean all && rm -rf /var/cache/yum \