Skip to content

Commit b770fa9

Browse files
authored
Merge pull request #14 from elecena/php-8.0.1
Bump to v8.0.1
2 parents cc360a2 + f74c735 commit b770fa9

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

.github/workflows/check_docker_build.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v1
1313
- name: Build the Docker image
14+
env:
15+
# @see https://docs.docker.com/develop/develop-images/build_enhancements/
16+
COMPOSE_DOCKER_CLI_BUILD: "1"
17+
DOCKER_BUILDKIT: "1"
1418
run: docker build . --tag ${{ github.repository }}
1519

1620
- name: Image details

Dockerfile

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

33
# @see https://hub.docker.com/_/composer
4-
FROM composer:1.10.13 AS php-composer
4+
FROM composer:1.10.20 AS php-composer
55

66
# @see https://hub.docker.com/_/python/
77
FROM python:3.9.0-alpine3.12
@@ -15,6 +15,8 @@ COPY --from=php-composer /usr/bin/composer /usr/bin
1515
ADD https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub
1616
RUN echo "https://dl.bintray.com/php-alpine/v3.12/php-8.0" >> /etc/apk/repositories
1717

18+
ENV PHP_VERSION 8.0.1
19+
1820
# install dependencies
1921
RUN apk update && apk add \
2022
php8 \
@@ -49,8 +51,6 @@ RUN apk update && apk add \
4951
gnu-libiconv \
5052
&& rm -rf /tmp/* /var/log/* /var/cache/*
5153

52-
ENV PHP_VERSION 8.0.0
53-
5454
# use GNU iconv in php
5555
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php-fpm7 php7"
5656

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ docker pull elecena/python-php
1111

1212
```
1313
$ docker images | head
14-
REPOSITORY TAG IMAGE ID CREATED SIZE
15-
elecena/python-php latest 140a352ef8ee 1 second ago 102MB
14+
REPOSITORY TAG IMAGE ID CREATED SIZE
15+
elecena/python-php latest a573fc57ed6a 1 second ago 104MB
1616
```
1717

1818
## Installed software
@@ -22,14 +22,14 @@ $ docker run -it elecena/python-php sh info.sh
2222
2323
### Python
2424
Python 3.9.0
25-
virtualenv 20.2.2 from /usr/local/lib/python3.9/site-packages/virtualenv/__init__.py
25+
virtualenv 20.4.2 from /usr/local/lib/python3.9/site-packages/virtualenv/__init__.py
2626
2727
### PHP
28-
PHP 8.0.0 (cli) (built: Dec 4 2020 00:28:56) ( NTS )
28+
PHP 8.0.1 (cli) (built: Jan 10 2021 13:43:09) ( NTS )
2929
Copyright (c) The PHP Group
30-
Zend Engine v4.0.0-dev, Copyright (c) Zend Technologies
31-
with Zend OPcache v8.0.0, Copyright (c), by Zend Technologies
32-
Composer version 1.10.13 2020-09-09 11:46:34
30+
Zend Engine v4.0.1, Copyright (c) Zend Technologies
31+
with Zend OPcache v8.0.1, Copyright (c), by Zend Technologies
32+
Composer version 1.10.20 2021-01-27 15:41:06
3333
[PHP Modules]
3434
bz2
3535
calendar

0 commit comments

Comments
 (0)