Skip to content

Commit 28447a2

Browse files
authored
Merge pull request #23 from elecena/php-8.1.2-python-3.10.2
PHP 8.1.2 and Python 3.10.2
2 parents c2057ee + 4870b32 commit 28447a2

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

Dockerfile

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
# elecena.pl (c) 2015-2021
1+
# elecena.pl (c) 2015-2022
22

33
# https://hub.docker.com/_/php
4-
ARG PHP_VERSION=8.1.0
4+
ARG PHP_VERSION=8.1.2
55

66
# https://hub.docker.com/_/python/
7-
ARG PYTHON_VERSION=3.10.1
7+
ARG PYTHON_VERSION=3.10.2
88

99
# https://hub.docker.com/_/composer
10-
FROM composer:2 AS php-composer
10+
ARG COMPOSER_VERSION=2.2.6
11+
12+
FROM composer:$COMPOSER_VERSION AS php-composer
1113
RUN /usr/bin/composer -v
1214

1315
#
@@ -20,6 +22,12 @@ RUN apk add \
2022
libxml2-dev \
2123
libxslt-dev
2224

25+
# fixes "sockets" compilation issues
26+
# sendrecvmsg.c:128:19: error: invalid application of 'sizeof' to incomplete type 'struct cmsgcred'
27+
#
28+
# see https://github.com/docker-library/php/issues/1245#issuecomment-1019957169
29+
ENV CFLAGS="$CFLAGS -D_GNU_SOURCE"
30+
2331
RUN docker-php-ext-install \
2432
bz2 \
2533
calendar \
@@ -41,6 +49,7 @@ RUN which php; php -v; php -m; php -i | grep ini
4149
#
4250
FROM python:$PYTHON_VERSION-alpine
4351
ARG PHP_VERSION
52+
ARG COMPOSER_VERSION
4453

4554
RUN pip install virtualenv && rm -rf /root/.cache
4655
RUN python -V
@@ -64,6 +73,7 @@ RUN php -r '$res = iconv("utf-8", "utf-8//IGNORE", "fooą");'
6473

6574
RUN php -v; php -m; php -i | grep ini
6675
ENV PHP_VERSION $PHP_VERSION
76+
ENV COMPOSER_VERSION $COMPOSER_VERSION
6777

6878
# add an info script
6979
WORKDIR /opt

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ elecena/python-php latest 4eb6703d62df 2 seconds ago 105MB
2121
$ docker run -it elecena/python-php sh info.sh
2222
2323
### Python
24-
Python 3.10.1
25-
virtualenv 20.10.0 from /usr/local/lib/python3.10/site-packages/virtualenv/__init__.py
24+
Python 3.10.2
25+
virtualenv 20.13.1 from /usr/local/lib/python3.10/site-packages/virtualenv/__init__.py
2626
2727
### PHP
28-
PHP 8.1.0 (cli) (built: Nov 30 2021 07:15:23) (NTS)
28+
PHP 8.1.2 (cli) (built: Jan 21 2022 21:38:22) (NTS)
2929
Copyright (c) The PHP Group
30-
Zend Engine v4.1.0, Copyright (c) Zend Technologies
31-
with Zend OPcache v8.1.0, Copyright (c), by Zend Technologies
32-
Composer version 2.1.14 2021-11-30 10:51:43
30+
Zend Engine v4.1.2, Copyright (c) Zend Technologies
31+
with Zend OPcache v8.1.2, Copyright (c), by Zend Technologies
32+
Composer version 2.2.6 2022-02-04 17:00:38
3333
[PHP Modules]
3434
bz2
3535
calendar

0 commit comments

Comments
 (0)