Add gpg to base

mblaschke · mblaschke · commit b0d5ef7c2eeb · 2016-07-30T14:08:55.000+02:00
Needed for apt-key adding of gpg keys
diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile
@@ -23,6 +23,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         sed \
+        gnupg \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile
@@ -24,6 +24,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg2 \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile
@@ -25,6 +25,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile
@@ -25,6 +25,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile
@@ -25,6 +25,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile
@@ -25,6 +25,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile
@@ -25,6 +25,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile
@@ -25,6 +25,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile
@@ -25,6 +25,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile
@@ -25,6 +25,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile
@@ -82,6 +82,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/template/Dockerfile/images/base.jinja2 b/template/Dockerfile/images/base.jinja2
@@ -10,6 +10,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         sed \
+        gnupg \
     {{ provision.runRoleInline('base', role) }}
 {%- endmacro %}
 
@@ -25,6 +26,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg2 \
     {{ provision.runRoleInline('base', role) }}
 {%- endmacro %}
 
@@ -41,6 +43,7 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     {{ provision.runRoleInline('base', role) }}
 {%- endmacro %}
 
@@ -57,5 +60,6 @@ RUN chmod +x /opt/docker/bin/* \
         wget \
         curl \
         net-tools \
+        gnupg \
     {{ provision.runRoleInline('base', role) }}
 {%- endmacro %}
