Run php-fpm with LD_PRELOAD for iconv lib #25

wodby · Apr 11, 2018 · 16743d6 · 16743d6
1 parent d3391ac
commit 16743d6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 12 deletions.
diff --git a/5.3/Dockerfile b/5.3/Dockerfile
@@ -103,8 +103,7 @@ RUN set -xe; \
         postgresql-dev \
         yaml-dev; \
     \
-    apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted; \
-    \
+    apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted;  \
     # Temporary install additional packages to keep client bins.
     apk add --update --no-cache -t .bins-only \
         postgresql \
@@ -288,4 +287,4 @@ COPY docker-entrypoint.sh /
 COPY bin /usr/local/bin/
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["sudo", "-E", "php-fpm"]
+CMD ["sudo", "-E", "LD_PRELOAD=/usr/lib/preloadable_libiconv.so", "php-fpm"]
diff --git a/5.3/templates/zz-www.conf.tpl b/5.3/templates/zz-www.conf.tpl
@@ -34,7 +34,6 @@ php_value[always_populate_raw_post_data] = {{ getenv "PHP_ALWAYS_POPULATE_RAW_PO
 user = {{ getenv "PHP_FPM_USER" "www-data" }}
 group = {{ getenv "PHP_FPM_GROUP" "www-data" }}
 
-env[LD_PRELOAD] = {{ getenv "LD_PRELOAD" }}
 {{ if getenv "PHP_FPM_ENV_VARS" }}{{ range jsonArray (getenv "PHP_FPM_ENV_VARS") }}{{ if getenv . }}
 env[{{.}}] = {{ getenv . }}{{ end }}{{ end }}{{ end }}
 

diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -129,8 +129,7 @@ RUN set -xe; \
         rabbitmq-c-dev \
         yaml-dev; \
     \
-    apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted; \
-    \
+    apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted;  \
     # Install redis-cli.
     apk add --update --no-cache redis; \
     mkdir -p /tmp/pkgs-bins; \
@@ -315,4 +314,4 @@ COPY docker-entrypoint.sh /
 COPY bin /usr/local/bin/
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["sudo", "-E", "php-fpm"]
+CMD ["sudo", "-E", "LD_PRELOAD=/usr/lib/preloadable_libiconv.so", "php-fpm"]
diff --git a/5.6/templates/zz-www.conf.tpl b/5.6/templates/zz-www.conf.tpl
@@ -35,7 +35,6 @@ php_value[always_populate_raw_post_data] = {{ getenv "PHP_ALWAYS_POPULATE_RAW_PO
 user = {{ getenv "PHP_FPM_USER" "www-data" }}
 group = {{ getenv "PHP_FPM_GROUP" "www-data" }}
 
-env[LD_PRELOAD] = {{ getenv "LD_PRELOAD" }}
 {{ if getenv "PHP_FPM_ENV_VARS" }}{{ range jsonArray (getenv "PHP_FPM_ENV_VARS") }}{{ if getenv . }}
 env[{{.}}] = {{ getenv . }}{{ end }}{{ end }}{{ end }}
 

diff --git a/7/Dockerfile b/7/Dockerfile
@@ -132,7 +132,7 @@ RUN set -xe; \
         rabbitmq-c-dev \
         yaml-dev; \
     \
-    apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted; \
+    apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted;
     \
     # Install redis-cli.
     apk add --update --no-cache redis; \
@@ -328,7 +328,7 @@ RUN set -xe; \
     \
     if [[ -z "${PHP_DEV}" ]]; then \
         rm -rf /usr/src/php.tar.xz; \
-    fi;
+    fi
 
 USER wodby
 
@@ -340,4 +340,4 @@ COPY docker-entrypoint.sh /
 COPY bin /usr/local/bin/
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["sudo", "-E", "php-fpm"]
+CMD ["sudo", "-E", "LD_PRELOAD=/usr/lib/preloadable_libiconv.so", "php-fpm"]
diff --git a/7/templates/zz-www.conf.tpl b/7/templates/zz-www.conf.tpl
@@ -34,7 +34,6 @@ php_value[output_buffering] = {{ getenv "PHP_OUTPUT_BUFFERING" "4096" }}
 user = {{ getenv "PHP_FPM_USER" "www-data" }}
 group = {{ getenv "PHP_FPM_GROUP" "www-data" }}
 
-env[LD_PRELOAD] = {{ getenv "LD_PRELOAD" }}
 {{ if getenv "PHP_FPM_ENV_VARS" }}{{ range jsonArray (getenv "PHP_FPM_ENV_VARS") }}{{ if getenv . }}
 env[{{.}}] = {{ getenv . }}{{ end }}{{ end }}{{ end }}