Skip to content

Commit 405bd23

Browse files
authored
Merge pull request #10 from elecena/python-php-3.8-7.4.3-alpine-composer
Use PHP 7.4.3
2 parents c397eb7 + 9b33ca7 commit 405bd23

File tree

3 files changed

+40
-17
lines changed

3 files changed

+40
-17
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Check if a Docker image can be built
2+
3+
on: [push]
4+
5+
jobs:
6+
7+
build:
8+
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/checkout@v1
13+
- name: Build the Docker image
14+
run: docker build . --tag ${{ github.repository }}
15+
16+
- name: Run info.sh
17+
run: docker run -t ${{ github.repository }} sh info.sh

Dockerfile

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,25 @@
44
FROM composer:1.10.5 AS php-composer
55

66
# @see https://hub.docker.com/_/python/
7-
FROM python:3.8-alpine
7+
FROM python:3.8-alpine3.10
88
RUN pip install virtualenv && rm -rf /root/.cache
99

1010
# copy composer from the first stage
1111
COPY --from=php-composer /usr/bin/composer /usr/bin
1212

13+
# set up PHP 7.4 packages repository
14+
# @see https://github.com/codecasts/php-alpine
15+
ADD https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub
16+
RUN echo "https://dl.bintray.com/php-alpine/v3.10/php-7.4" >> /etc/apk/repositories
17+
1318
# install dependencies
1419
RUN apk update && apk add \
1520
php7 \
21+
php7-bz2 \
1622
php7-calendar \
1723
php7-curl \
1824
php7-ctype \
1925
php7-exif \
20-
php7-fileinfo \
2126
php7-ftp \
2227
php7-gettext \
2328
php7-iconv \
@@ -31,28 +36,28 @@ RUN apk update && apk add \
3136
php7-posix \
3237
php7-session \
3338
php7-shmop \
34-
php7-simplexml \
3539
php7-soap \
3640
php7-sockets \
3741
php7-sodium \
3842
php7-sysvmsg \
3943
php7-sysvsem \
4044
php7-sysvshm \
41-
php7-tokenizer \
42-
php7-wddx \
4345
php7-xmlreader \
44-
php7-xmlwriter \
4546
php7-xml \
4647
php7-xsl \
48+
php7-zlib \
4749
# see https://github.com/elecena/python-php/issues/8
4850
# The problem seems to be that iconv in musl is not implemented to support that conversion, when using GNU iconv it works.
4951
gnu-libiconv \
5052
&& rm -rf /tmp/* /var/log/* /var/cache/*
5153

52-
ENV PHP_VERSION 7.3.17
54+
ENV PHP_VERSION 7.4.3
5355

5456
# use GNU iconv in php
55-
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php-fpm7 php"
57+
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php-fpm7 php7"
58+
59+
# add a symlink
60+
RUN ln -s /usr/bin/php7 /usr/bin/php
5661

5762
# add an info script
5863
WORKDIR /opt

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
python-php
22
==========
33

4-
Python and PHP under the same roof (in **under 150 MB Docker image**).
4+
Python and PHP under the same roof (in **160 MB Docker image**).
55

66
https://hub.docker.com/r/elecena/python-php
77

@@ -10,8 +10,9 @@ docker pull elecena/python-php
1010
```
1111

1212
```
13-
REPOSITORY TAG IMAGE ID CREATED SIZE
14-
elecena/python-php 3.8-7.3.17-alpine-composer 021594026c49 6 minutes ago 143MB
13+
$ docker images | head
14+
REPOSITORY TAG IMAGE ID CREATED SIZE
15+
elecena/python-php latest 5f03eb6d7605 About a minute ago 160MB
1516
```
1617

1718
## Installed software
@@ -21,15 +22,16 @@ $ docker run -it elecena/python-php sh info.sh
2122
2223
### Python
2324
Python 3.8.2
24-
virtualenv 20.0.17 from /usr/local/lib/python3.8/site-packages/virtualenv/__init__.py
25+
virtualenv 20.0.20 from /usr/local/lib/python3.8/site-packages/virtualenv/__init__.py
2526
2627
### PHP
27-
PHP 7.3.17 (cli) (built: Apr 16 2020 23:18:12) ( NTS )
28-
Copyright (c) 1997-2018 The PHP Group
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
28+
PHP 7.4.3 (cli) (built: Mar 20 2020 07:14:36) ( NTS )
29+
Copyright (c) The PHP Group
30+
Zend Engine v3.4.0, Copyright (c) Zend Technologies
31+
with Zend OPcache v7.4.3, Copyright (c), by Zend Technologies
3132
Composer version 1.10.5 2020-04-10 11:44:22
3233
[PHP Modules]
34+
bz2
3335
calendar
3436
Core
3537
ctype
@@ -66,7 +68,6 @@ sysvmsg
6668
sysvsem
6769
sysvshm
6870
tokenizer
69-
wddx
7071
xml
7172
xmlreader
7273
xmlwriter

0 commit comments

Comments
 (0)