Add gpg for php-dev

mblaschke · mblaschke · commit 07a2d9aeedba · 2016-07-30T11:34:04.000+02:00
Fixes blackfire installation which requires gpg
diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile
@@ -16,6 +16,7 @@ COPY conf/ /opt/docker/
 RUN /usr/local/bin/apk-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php7-xdebug \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \
diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile
@@ -16,6 +16,7 @@ COPY conf/ /opt/docker/
 RUN /usr/local/bin/apk-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php5-xdebug \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php-dev \
diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile
@@ -16,6 +16,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y
     && /usr/local/bin/yum-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php56w-pecl-xdebug \
         blackfire-php \
diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile
@@ -17,6 +17,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y
     && /usr/local/bin/yum-install \
         # Install tools
         graphviz \
+        gnupg2 \
         # Install php development stuff
         php-pecl-xdebug \
         blackfire-php \
diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile
@@ -18,6 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php5-xdebug \
         blackfire-php \
diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile
@@ -18,6 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         # php7.0-xdebug \ # Is currently not available
         blackfire-php \
diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile
@@ -18,6 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php5-xdebug \
         blackfire-php \
diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile
@@ -18,6 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php-xdebug \
         blackfire-php \
diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile
@@ -18,6 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php5-xdebug \
         blackfire-php \
diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile
@@ -18,6 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php5-xdebug \
         blackfire-php \
diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile
@@ -18,6 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php5-xdebug \
         blackfire-php \
diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile
@@ -18,6 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php5-xdebug \
         blackfire-php \
diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile
@@ -18,6 +18,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php-xdebug \
         blackfire-php \
diff --git a/template/Dockerfile/images/php5-dev.jinja2 b/template/Dockerfile/images/php5-dev.jinja2
@@ -5,6 +5,7 @@
 RUN /usr/local/bin/apk-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php5-xdebug \
     {{ provision.runRoleInline('php-dev', role) }}
@@ -17,6 +18,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y
     && /usr/local/bin/yum-install \
         # Install tools
         graphviz \
+        gnupg2 \
         # Install php development stuff
         php-pecl-xdebug \
         blackfire-php \
@@ -29,6 +31,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y
     && /usr/local/bin/yum-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php56w-pecl-xdebug \
         blackfire-php \
@@ -43,6 +46,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php5-xdebug \
         blackfire-php \
@@ -58,6 +62,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php5-xdebug \
         blackfire-php \
diff --git a/template/Dockerfile/images/php7-dev.jinja2 b/template/Dockerfile/images/php7-dev.jinja2
@@ -5,6 +5,7 @@
 RUN /usr/local/bin/apk-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php7-xdebug \
     {{ provision.runRoleInline('php-dev', role) }}
@@ -17,6 +18,7 @@ RUN wget -O - "https://packages.blackfire.io/fedora/blackfire.repo" | tee /etc/y
     && /usr/local/bin/yum-install \
         # Install tools
         graphviz \
+        gnupg2 \
         # Install php development stuff
         php7-xdebug \
         blackfire-php \
@@ -32,6 +34,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php-xdebug \
         blackfire-php \
@@ -46,6 +49,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php7.0-xdebug \
         blackfire-php \
@@ -60,6 +64,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         # php7.0-xdebug \ # Is currently not available
         blackfire-php \
@@ -74,6 +79,7 @@ RUN wget -O - https://packagecloud.io/gpg.key | apt-key add - \
     && /usr/local/bin/apt-install \
         # Install tools
         graphviz \
+        gnupg \
         # Install php development stuff
         php-xdebug \
         blackfire-php \
