fix empty continuation line

webdevops · Aug 14, 2020 · 5a2dbf4 · 5a2dbf4
1 parent 5870564
commit 5a2dbf4
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 60 deletions.
diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile
@@ -16,17 +16,6 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
-
-    && apk-install \
-        make \
-        autoconf \
-        g++ \
-    && pickle install xdebug \
-    && apk del -f --purge \
-        autoconf \
-        g++ \
-        make \
-    && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \
     && docker-service enable postfix \

diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2
@@ -7,6 +7,6 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ php.officialDevelopmentAlpine(version="8.0") }} \
+    {{- php.officialDevelopmentAlpine(version="8.0") }} \
     {{ provision.runBootstrap() }} \
     {{ docker.cleanup() }}
diff --git a/docker/php-apache-dev/8.0/Dockerfile b/docker/php-apache-dev/8.0/Dockerfile
@@ -16,9 +16,6 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
-
-    && pickle install xdebug \
-    && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \
     && docker-service enable postfix \

diff --git a/docker/php-apache-dev/8.0/Dockerfile.jinja2 b/docker/php-apache-dev/8.0/Dockerfile.jinja2
@@ -7,6 +7,6 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ php.officialDevelopment(version="8.0") }} \
+    {{- php.officialDevelopment(version="8.0") }} \
     {{ provision.runBootstrap() }} \
     {{ docker.cleanup() }}
diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile
@@ -8,17 +8,6 @@ FROM webdevops/php:8.0-alpine
 COPY conf/ /opt/docker/
 
 RUN set -x \
-
-    && apk-install \
-        make \
-        autoconf \
-        g++ \
-    && pickle install xdebug \
-    && apk del -f --purge \
-        autoconf \
-        g++ \
-        make \
-    && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \
     && docker-service enable postfix \

diff --git a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2
@@ -3,6 +3,6 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ php.officialDevelopmentAlpine(version="8.0") }} \
+    {{- php.officialDevelopmentAlpine(version="8.0") }} \
     {{ provision.runBootstrap() }} \
     {{ docker.cleanup() }}
diff --git a/docker/php-dev/8.0/Dockerfile b/docker/php-dev/8.0/Dockerfile
@@ -8,9 +8,6 @@ FROM webdevops/php:8.0
 COPY conf/ /opt/docker/
 
 RUN set -x \
-
-    && pickle install xdebug \
-    && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \
     && docker-service enable postfix \

diff --git a/docker/php-dev/8.0/Dockerfile.jinja2 b/docker/php-dev/8.0/Dockerfile.jinja2
@@ -3,6 +3,6 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ php.officialDevelopment(version="8.0") }} \
+    {{- php.officialDevelopment(version="8.0") }} \
     {{ provision.runBootstrap() }} \
     {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile
@@ -16,17 +16,6 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
-
-    && apk-install \
-        make \
-        autoconf \
-        g++ \
-    && pickle install xdebug \
-    && apk del -f --purge \
-        autoconf \
-        g++ \
-        make \
-    && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \
     && docker-service enable postfix \

diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2
@@ -7,6 +7,6 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ php.officialDevelopmentAlpine(version="8.0") }} \
+    {{- php.officialDevelopmentAlpine(version="8.0") }} \
     {{ provision.runBootstrap() }} \
     {{ docker.cleanup() }}
diff --git a/docker/php-nginx-dev/8.0/Dockerfile b/docker/php-nginx-dev/8.0/Dockerfile
@@ -16,9 +16,6 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"
 COPY conf/ /opt/docker/
 
 RUN set -x \
-
-    && pickle install xdebug \
-    && docker-php-ext-enable xdebug \
     # Enable php development services
     && docker-service enable syslog \
     && docker-service enable postfix \

diff --git a/docker/php-nginx-dev/8.0/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0/Dockerfile.jinja2
@@ -7,6 +7,6 @@
 {{ docker.copy('conf/', '/opt/docker/') }}
 
 RUN set -x \
-    {{ php.officialDevelopment(version="8.0") }} \
+    {{- php.officialDevelopment(version="8.0") }} \
     {{ provision.runBootstrap() }} \
     {{ docker.cleanup() }}
diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -371,17 +371,17 @@
     && apt-install \
         blackfire-php \
         blackfire-agent \
-{%- endif %}
-{%- if version|int == 5 %}
+    {%- if version|int == 5 %}
     && pecl install xdebug-2.5.5 \
-{%- elif version == '8.0' %}
+    {%- elif version == '8.0' %}
     && pickle install xdebug \
-{%- elif version == '7.0' %}
+    {%- elif version == '7.0' %}
     && pecl install xdebug-2.8.1 \
-{%- else %}
+    {%- else %}
     && pecl install xdebug \
-{%- endif %}
+    {%- endif %}
     && docker-php-ext-enable xdebug \
+{%- endif %}
     {{ services.phpDev() }}
 {%- endmacro %}
 
@@ -394,24 +394,24 @@
     && wget -q -O blackfire.so https://packages.blackfire.io/binaries/blackfire-php/1.33.0/blackfire-php-alpine_amd64-php-{{ version|replace('.', '') }}.so \
     && mv blackfire.so "$(php -r "echo ini_get('extension_dir');")/blackfire.so" \
     && mkdir /var/run/blackfire/ \
-{%- endif %}
     && apk-install \
         make \
         autoconf \
         g++ \
-{%- if version|int == 5 %}
+    {%- if version|int == 5 %}
     && pecl install xdebug-2.5.5 \
-{%- elif version == '7.0' %}
+    {%- elif version == '7.0' %}
     && pecl install xdebug-2.8.1 \
-{%- elif version == '8.0' %}
+    {%- elif version == '8.0' %}
     && pickle install xdebug \
-{%- else %}
+    {%- else %}
     && pecl install xdebug \
-{%- endif %}
+    {%- endif %}
     && apk del -f --purge \
         autoconf \
         g++ \
         make \
     && docker-php-ext-enable xdebug \
+{%- endif %}
     {{ services.phpDev() }}
 {%- endmacro %}