[allura] 01/15: [#8378] smaller docker images

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kentontaylor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 869bbeeb9906d010b6bcc4f3b1e54e9da5680b3d
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Tue Oct 6 16:36:32 2020 -0400

    [#8378] smaller docker images
---
 Dockerfile                     | 9 ++++++---
 scm_config/git-http/Dockerfile | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2a5eb55..4bf8dcc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,9 +17,11 @@
 
 FROM ubuntu:18.04
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     git-core \
     python2.7-dev \
+    gcc \
+    libmagic1 \
     libssl-dev \
     libldap2-dev \
     libsasl2-dev \
@@ -31,11 +33,12 @@ RUN apt-get update && apt-get install -y \
     python-svn \
     curl \
     locales \
-    sudo
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
 
 # up-to-date version of node & npm
 RUN curl --silent --location https://deb.nodesource.com/setup_10.x | sudo bash - && \
-    apt-get install --yes nodejs
+    apt-get install --yes --no-install-recommends nodejs
 
 # Snapshot generation for SVN (and maybe other SCMs) might fail without this
 RUN locale-gen en_US.UTF-8
diff --git a/scm_config/git-http/Dockerfile b/scm_config/git-http/Dockerfile
index b2adbc2..7ae87a2 100644
--- a/scm_config/git-http/Dockerfile
+++ b/scm_config/git-http/Dockerfile
@@ -22,12 +22,13 @@
 # match main allura Dockerfile, for shared base
 FROM ubuntu:18.04
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     apache2 \
     libapache2-mod-python \
     git \
     curl \
-    sudo
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
 
 
 ENV APACHE_RUN_USER www-data