Mercurial > gemma

changeset 1581:8e8523282853

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 13 Dec 2018 17:34:12 +0100
parents c503d2fa9776 (current diff) 2241f8710dcc (diff)
children dc727824183a
files
diffstat 3 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/docker/Dockerfile.backend	Thu Dec 13 14:06:48 2018 +0100
+++ b/docker/Dockerfile.backend	Thu Dec 13 17:34:12 2018 +0100
@@ -7,7 +7,8 @@
 
 RUN apt-get update &&\
     apt-get -y install --no-install-recommends \
-            make git golang-go golang-github-gorilla-context-dev
+            make git golang-go golang-github-gorilla-context-dev \
+            ca-certificates
 
 WORKDIR /opt/gemma
 
--- a/docker/Dockerfile.db	Thu Dec 13 14:06:48 2018 +0100
+++ b/docker/Dockerfile.db	Thu Dec 13 17:34:12 2018 +0100
@@ -3,14 +3,16 @@
 LABEL description="Contains software from gemma, for right holders and\
  licensing infos, see https://hg.intevation.de/gemma ."
 
+ENV DEBIAN_FRONTEND noninteractive
+
 RUN apt-get update &&\
-    apt-get -y install --no-install-recommends curl gnupg
+    apt-get -y install --no-install-recommends curl ca-certificates gnupg
 
 # Add PostgreSQL's repository for current PostgreSQL release and extensions:
 RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' \
     >> /etc/apt/sources.list &&\
     curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
-    sudo apt-key add - &&\
+    apt-key add - &&\
     apt-get update &&\
     apt-get -y install postgresql-11-postgis-2.5 postgresql-11-pgtap
 
--- a/docker/Dockerfile.spa	Thu Dec 13 14:06:48 2018 +0100
+++ b/docker/Dockerfile.spa	Thu Dec 13 17:34:12 2018 +0100
@@ -6,10 +6,11 @@
 RUN sed -i 's/\(deb.*\)$/\1 universe/' /etc/apt/sources.list
 
 RUN apt-get update &&\
-    apt-get -y install --no-install-recommends curl gnupg nodejs make mercurial
+    apt-get -y install --no-install-recommends \
+            curl ca-certificates gnupg nodejs make mercurial
 
 # Install yarn
-RUN curl https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - &&\
+RUN curl https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - &&\
     echo 'deb https://dl.yarnpkg.com/debian/ stable main' >> \
          /etc/apt/sources.list &&\
     apt-get update &&\