Merge pull request #15 from elecena/python-and-php-upgrade

Python 3.9.5 and PHP 8.0.7

Author: macbre

Dockerfile

@@ -1,61 +1,56 @@
 # elecena.pl (c) 2015-2021
 
 # @see https://hub.docker.com/_/composer
-FROM composer:1.10.20 AS php-composer
+FROM composer:2.1.3 AS php-composer
+RUN /usr/bin/composer -v
+
+# @see https://hub.docker.com/_/php
+FROM php:8.0.7-cli-alpine AS php
+RUN apk add \
+		bzip2-dev \
+		libsodium-dev \
+		libxml2-dev \
+		libxslt-dev
+
+RUN docker-php-ext-install \
+	bz2 \
+	calendar \
+	exif \
+	pcntl \
+	shmop \
+	soap \
+	sockets \
+	sodium \
+	sysvsem \
+	sysvshm \
+	xsl
+
+RUN which php; php -v; php -m; php -i | grep ini
 
 # @see https://hub.docker.com/_/python/
-FROM python:3.9.0-alpine3.12
+FROM python:3.9.5-alpine
 RUN pip install virtualenv && rm -rf /root/.cache
+RUN python -V
 
 # copy composer from the first stage
 COPY --from=php-composer /usr/bin/composer /usr/bin
 
-# set up PHP 8.0 packages repository
-# @see https://github.com/codecasts/php-alpine
-ADD https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub
-RUN echo "https://dl.bintray.com/php-alpine/v3.12/php-8.0" >> /etc/apk/repositories
-
-ENV PHP_VERSION 8.0.1
-
-# install dependencies
-RUN apk update && apk add \
-	php8 \
-	php8-bz2 \
-	php8-calendar \
-	php8-curl \
-	php8-ctype \
-	php8-exif \
-	php8-ftp \
-	php8-gettext \
-	php8-iconv \
-	php8-mbstring \
-	php8-opcache \
-	php8-openssl \
-	php8-pcntl \
-	php8-pdo \
-	php8-phar \
-	php8-posix \
-	php8-session \
-	php8-shmop \
-	php8-soap \
-	php8-sockets \
-	php8-sodium \
-	php8-sysvsem \
-	php8-sysvshm \
-	php8-xmlreader \
-	php8-xml \
-	php8-xsl \
-	php8-zlib \
-	# 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/*
+# copy PHP binary and required libs
+COPY --from=php /usr/local/bin/php /usr/bin
+COPY --from=php /usr/local/etc/php /usr/local/etc/php
+COPY --from=php /usr/lib/*.so.* /usr/lib
+COPY --from=php /usr/local/lib/php /usr/local/lib/php
 
+# 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.
+RUN apk add gnu-libiconv
 # use GNU iconv in php
-ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php-fpm7 php7"
+ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php-fpm php"
+# and test it...
+RUN php -r '$res = iconv("utf-8", "utf-8//IGNORE", "fooą");'
 
-# add a symlink
-RUN ln -s /usr/bin/php8 /usr/bin/php
+RUN php -v; php -m; php -i | grep ini
+ENV PHP_VERSION 8.0.7
 
 # add an info script
 WORKDIR /opt

README.md

@@ -11,8 +11,8 @@ docker pull elecena/python-php
 
 ```
 $ docker images | head
-REPOSITORY                                           TAG                 IMAGE ID            CREATED             SIZE
-elecena/python-php                                   latest              a573fc57ed6a        1 second ago        104MB
+REPOSITORY           TAG         IMAGE ID       CREATED         SIZE
+elecena/python-php   latest      0a1466db6d26   2 seconds ago   104MB
 ```
 
 ## Installed software
@@ -21,15 +21,14 @@ elecena/python-php                                   latest              a573fc5
 $ docker run -it elecena/python-php sh info.sh
 
 ### Python
-Python 3.9.0
-virtualenv 20.4.2 from /usr/local/lib/python3.9/site-packages/virtualenv/__init__.py
+Python 3.9.5
+virtualenv 20.4.7 from /usr/local/lib/python3.9/site-packages/virtualenv/__init__.py
 
 ### PHP
-PHP 8.0.1 (cli) (built: Jan 10 2021 13:43:09) ( NTS )
+PHP 8.0.7 (cli) (built: Jun  4 2021 19:02:30) ( NTS )
 Copyright (c) The PHP Group
-Zend Engine v4.0.1, Copyright (c) Zend Technologies
-    with Zend OPcache v8.0.1, Copyright (c), by Zend Technologies
-Composer version 1.10.20 2021-01-27 15:41:06
+Zend Engine v4.0.7, Copyright (c) Zend Technologies
+Composer version 2.1.3 2021-06-09 16:31:20
 [PHP Modules]
 bz2
 calendar
@@ -42,16 +41,17 @@ exif
 fileinfo
 filter
 ftp
-gettext
 hash
 iconv
 json
 libxml
 mbstring
+mysqlnd
 openssl
 pcntl
 pcre
 PDO
+pdo_sqlite
 Phar
 posix
 readline
@@ -63,6 +63,7 @@ soap
 sockets
 sodium
 SPL
+sqlite3
 standard
 sysvsem
 sysvshm
@@ -71,9 +72,7 @@ xml
 xmlreader
 xmlwriter
 xsl
-Zend OPcache
 zlib
 
 [Zend Modules]
-Zend OPcache
 ```