firethorn

changeset 4244:8dbad0ec9b89 2.1.32-zrq-thread-pools

Updated Docker containers
author Dave Morris <dmr@roe.ac.uk>
date Tue Jun 04 01:27:46 2019 +0100 (2019-06-04)
parents 0421694773a1
children 1789c8114edc
files docker/fedora/Dockerfile docker/postgres/Dockerfile docker/tomcat/Dockerfile
line diff
     1.1 --- a/docker/fedora/Dockerfile	Mon Jun 03 19:01:47 2019 +0100
     1.2 +++ b/docker/fedora/Dockerfile	Tue Jun 04 01:27:46 2019 +0100
     1.3 @@ -15,9 +15,10 @@
     1.4  # You should have received a copy of the GNU General Public License
     1.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     1.6  
     1.7 -# FROM fedora:28
     1.8 -# https://github.com/docker-library/repo-info/blob/master/repos/fedora/tag-details.md#fedora28
     1.9 -FROM fedora@sha256:7ae08e5637170eb47c01e315b6e64e0d48c6200d2942c695d0bee61b38c65b39
    1.10 +# FROM latest (fedora:29)
    1.11 +# https://github.com/docker-library/repo-info/blob/master/repos/fedora/tag-details.md#fedoralatest
    1.12 +FROM fedora@sha256:2a60898a6dd7da9964b0c59fedcf652e24bfff04142e5488f793c9e8156afd33
    1.13 +
    1.14  MAINTAINER [Dave Morris <docker-admin@metagrid.co.uk>]
    1.15  
    1.16  #
    1.17 @@ -35,6 +36,7 @@
    1.18  #
    1.19  # Install common admin tools.
    1.20  RUN dnf install -y \
    1.21 +    findutils  \
    1.22      gnupg \
    1.23      gzip  \
    1.24      less  \
    1.25 @@ -47,7 +49,7 @@
    1.26      zip
    1.27  
    1.28  #
    1.29 -# Add our install scripts. 
    1.30 +# Add our install scripts.
    1.31  COPY bin /usr/local/bin/
    1.32  RUN chmod a+x /usr/local/bin/*.sh
    1.33  
     2.1 --- a/docker/postgres/Dockerfile	Mon Jun 03 19:01:47 2019 +0100
     2.2 +++ b/docker/postgres/Dockerfile	Tue Jun 04 01:27:46 2019 +0100
     2.3 @@ -15,7 +15,7 @@
     2.4  # You should have received a copy of the GNU General Public License
     2.5  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     2.6  
     2.7 -FROM postgres:10
     2.8 +FROM postgres:11
     2.9  MAINTAINER Dave Morris <docker-admin@metagrid.co.uk>
    2.10  
    2.11  #
     3.1 --- a/docker/tomcat/Dockerfile	Mon Jun 03 19:01:47 2019 +0100
     3.2 +++ b/docker/tomcat/Dockerfile	Tue Jun 04 01:27:46 2019 +0100
     3.3 @@ -19,8 +19,7 @@
     3.4  MAINTAINER [Dave Morris <docker-admin@metagrid.co.uk>]
     3.5  
     3.6  # https://tomcat.apache.org/whichversion.html
     3.7 -#NV TOMCAT_VERSION 8.5.32
     3.8 -ENV TOMCAT_VERSION 9.0.10
     3.9 +ENV TOMCAT_VERSION 9.0.20
    3.10  ENV TOMCAT_MAJOR  9
    3.11  
    3.12  ENV TOMCAT_DIRNAME apache-tomcat-${TOMCAT_VERSION}