Skip to content

Commit e1ef3e9

Browse files
authored
Merge pull request #9 from elecena/gnu-iconv
iconv: use GNU version
2 parents 64815c0 + a892d1e commit e1ef3e9

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,15 @@ RUN apk update && apk add \
4444
php7-xmlwriter \
4545
php7-xml \
4646
php7-xsl \
47+
# see https://github.com/elecena/python-php/issues/8
48+
# The problem seems to be that iconv in musl is not implemented to support that conversion, when using GNU iconv it works.
49+
gnu-libiconv \
4750
&& rm -rf /tmp/* /var/log/* /var/cache/*
4851

49-
ENV PHP_VERSION 7.3.16
52+
ENV PHP_VERSION 7.3.17
53+
54+
# use GNU iconv in php
55+
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php-fpm7 php"
5056

5157
# add an info script
5258
WORKDIR /opt

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ Python 3.8.2
2424
virtualenv 20.0.17 from /usr/local/lib/python3.8/site-packages/virtualenv/__init__.py
2525
2626
### PHP
27-
PHP 7.3.16 (cli) (built: Mar 20 2020 11:26:40) ( NTS )
27+
PHP 7.3.17 (cli) (built: Apr 16 2020 23:18:12) ( NTS )
2828
Copyright (c) 1997-2018 The PHP Group
29-
Zend Engine v3.3.16, Copyright (c) 1998-2018 Zend Technologies
30-
with Zend OPcache v7.3.16, Copyright (c) 1999-2018, by Zend Technologies
29+
Zend Engine v3.3.17, Copyright (c) 1998-2018 Zend Technologies
30+
with Zend OPcache v7.3.17, Copyright (c) 1999-2018, by Zend Technologies
3131
Composer version 1.10.5 2020-04-10 11:44:22
3232
[PHP Modules]
3333
calendar

0 commit comments

Comments
 (0)