Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

iconv: use GNU version #9

Merged
merged 1 commit into from
Apr 30, 2020
Merged

iconv: use GNU version #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,15 @@ RUN apk update && apk add \
php7-xmlwriter \
php7-xml \
php7-xsl \
# see https://github.com/elecena/python-php/issues/8
# The problem seems to be that iconv in musl is not implemented to support that conversion, when using GNU iconv it works.
gnu-libiconv \
&& rm -rf /tmp/* /var/log/* /var/cache/*

ENV PHP_VERSION 7.3.16
ENV PHP_VERSION 7.3.17

# use GNU iconv in php
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php-fpm7 php"

# add an info script
WORKDIR /opt
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ Python 3.8.2
virtualenv 20.0.17 from /usr/local/lib/python3.8/site-packages/virtualenv/__init__.py

### PHP
PHP 7.3.16 (cli) (built: Mar 20 2020 11:26:40) ( NTS )
PHP 7.3.17 (cli) (built: Apr 16 2020 23:18:12) ( NTS )
Copyright (c) 1997-2018 The PHP Group
Zend Engine v3.3.16, Copyright (c) 1998-2018 Zend Technologies
with Zend OPcache v7.3.16, Copyright (c) 1999-2018, by Zend Technologies
Zend Engine v3.3.17, Copyright (c) 1998-2018 Zend Technologies
with Zend OPcache v7.3.17, Copyright (c) 1999-2018, by Zend Technologies
Composer version 1.10.5 2020-04-10 11:44:22
[PHP Modules]
calendar
Expand Down