You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2020/11/02 21:27:53 UTC

[allura] 02/15: [#8378] prep for ubuntu:20.04

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 cdae9570c7438eda5b28271d6274475c9e265eb3
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Tue Oct 6 16:59:40 2020 -0400

    [#8378] prep for ubuntu:20.04
---
 Dockerfile                     | 4 ++--
 scm_config/git-http/Dockerfile | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4bf8dcc..7181616 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@
 
 FROM ubuntu:18.04
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     git-core \
     python2.7-dev \
     gcc \
@@ -38,7 +38,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 # up-to-date version of node & npm
 RUN curl --silent --location https://deb.nodesource.com/setup_10.x | sudo bash - && \
-    apt-get install --yes --no-install-recommends nodejs
+    DEBIAN_FRONTEND=noninteractive 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 7ae87a2..f2da2d2 100644
--- a/scm_config/git-http/Dockerfile
+++ b/scm_config/git-http/Dockerfile
@@ -22,7 +22,7 @@
 # match main allura Dockerfile, for shared base
 FROM ubuntu:18.04
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     apache2 \
     libapache2-mod-python \
     git \