fix invalid dockerfiles for alpine

webdevops · Apr 14, 2020 · 3237824 · 3237824
1 parent 87b70d2
commit 3237824
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile
@@ -167,7 +167,7 @@ RUN set -x \
     && make install \
     && libtool --finish /usr/local/lib \
     && cd .. \
-    && rm -rf libiconv-1.14
+    && rm -rf libiconv-1.14 \
     # Install extensions
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap \

diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile
@@ -167,7 +167,7 @@ RUN set -x \
     && make install \
     && libtool --finish /usr/local/lib \
     && cd .. \
-    && rm -rf libiconv-1.14
+    && rm -rf libiconv-1.14 \
     # Install extensions
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap \

diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile
@@ -167,7 +167,7 @@ RUN set -x \
     && make install \
     && libtool --finish /usr/local/lib \
     && cd .. \
-    && rm -rf libiconv-1.14
+    && rm -rf libiconv-1.14 \
     # Install extensions
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/ \
     && docker-php-ext-configure ldap \

diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile
@@ -167,7 +167,7 @@ RUN set -x \
     && make install \
     && libtool --finish /usr/local/lib \
     && cd .. \
-    && rm -rf libiconv-1.14
+    && rm -rf libiconv-1.14 \
     # Install extensions
     && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
     && docker-php-ext-configure ldap \

diff --git a/template/Dockerfile/images/php.jinja2 b/template/Dockerfile/images/php.jinja2
@@ -223,7 +223,7 @@
     && make install \
     && libtool --finish /usr/local/lib \
     && cd .. \
-    && rm -rf libiconv-1.14
+    && rm -rf libiconv-1.14 \
     # Install extensions
 {%- if version == '7.4' %}
     && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \