From 1dff72ccfe7446e52e24675f6f85ce1c5f5811ea Mon Sep 17 00:00:00 2001 From: Tony Fahrion Date: Tue, 16 Oct 2018 14:14:32 +0200 Subject: [PATCH 1/6] Update PHP parent image to 7.1.23 and 7.2.11 7.2.11 is the latest image now --- CHANGELOG.md | 5 +++++ bin/ci.sh | 4 ++-- bin/image.sh | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd5c088..48b0dc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 1.1.13 (2018-10-16) + +**UPDATES** +* PHP 7.1.23 and 7.2.11 + # 1.1.12 (2018-10-10) **FIXES** diff --git a/bin/ci.sh b/bin/ci.sh index d8b16ed..d542bab 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -5,8 +5,8 @@ WORKDIR=$(realpath $0 | xargs dirname | xargs dirname) export VERSION=$(cat $WORKDIR/VERSION) export IMAGE_NAME="claranet/php" -FROM_IMAGE_TAGS="7.1.20-fpm-jessie 7.2.8-fpm-stretch" -LATEST_IMAGE="7.2.8-fpm-stretch" +FROM_IMAGE_TAGS="7.1.23-fpm-jessie 7.2.11-fpm-stretch" +LATEST_IMAGE="7.2.11-fpm-stretch" # based on $TRAVIS_BRANCH # we decide to... diff --git a/bin/image.sh b/bin/image.sh index c1f5514..1b76cb1 100755 --- a/bin/image.sh +++ b/bin/image.sh @@ -4,8 +4,8 @@ set -x set -eo pipefail WORKDIR=$(realpath $0 | xargs dirname | xargs dirname) -export FROM_IMAGE=${FROM_IMAGE:-php:7.2.8-fpm-stretch} -PHP_VERSION=${PHP_VERSION:-7.2.8} +export FROM_IMAGE=${FROM_IMAGE:-php:7.2.11-fpm-stretch} +PHP_VERSION=${PHP_VERSION:-7.2.11} VERSION=${VERSION:-`cat $WORKDIR/VERSION`} IMAGE_NAME=${IMAGE_NAME:-local/claranet/php} IMAGE_TAG=${IMAGE_TAG:-$VERSION-php$PHP_VERSION} From 8fa960a5bcabd76d98d5deacccd7713eec1602cd Mon Sep 17 00:00:00 2001 From: Tony Fahrion Date: Tue, 16 Oct 2018 14:15:05 +0200 Subject: [PATCH 2/6] =?UTF-8?q?Bump=20version:=201.1.12=20=E2=86=92=201.1.?= =?UTF-8?q?13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- Dockerfile | 2 +- README.md | 6 +++--- VERSION | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6da4ff6..31d0948 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.12 +current_version = 1.1.13 tag_name = {new_version} commit = True tag = True diff --git a/Dockerfile b/Dockerfile index 5f383ad..9aaf983 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ LABEL org.label-schema.name="php" \ org.label-schema.version="0.1" \ org.label-schema.description="Core PHP image" \ org.label-schema.vendor="Claranet GmbH" \ - org.label-schema.schema-version="1.1.12" \ + org.label-schema.schema-version="1.1.13" \ author1="Fabian Dörk " \ author2="Tony Fahrion " diff --git a/README.md b/README.md index 674c949..1b7dd5a 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ set via environment variables and makes it easy to check external services (like * provides generic build and life cycle infrastructure for containerized PHP applications (well prepared for kubernetes) * shipped as PHP 7.1.x and 7.2.x flavor * there is a (build>base already run / build>base only prepared) flavor for each PHP version -* general run concept: `docker run --rm -t claranet/php:1.1.12-php7.2.5 [subsection] [subsection-args, ...]` -* overview: `docker run --rm -t claranet/php:1.1.12-php7.2.5 help` +* general run concept: `docker run --rm -t claranet/php:1.1.13-php7.2.5 [subsection] [subsection-args, ...]` +* overview: `docker run --rm -t claranet/php:1.1.13-php7.2.5 help` * supplied services - nginx - phpfpm @@ -50,7 +50,7 @@ set via environment variables and makes it easy to check external services (like Build image locally: ```sh -# generates local/claranet/php:1.1.12-php7.2.5 +# generates local/claranet/php:1.1.13-php7.2.5 ./bin/image.sh build ``` diff --git a/VERSION b/VERSION index ccad953..9ea63db 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.12 +1.1.13 From 0c4903ad7c053c2ba91957a02b0fd6b5021912e3 Mon Sep 17 00:00:00 2001 From: Tony Fahrion Date: Thu, 11 Oct 2018 11:33:07 +0200 Subject: [PATCH 3/6] Add contribution guide --- CONTRIBUTING.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..80130ae --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,34 @@ + +# Introduction + +We welcome contributions a lot! You can contribute by telling us what you think will be of benefit for the project. Tell us your +ideas! In addition, we welcome PRs and are happy improve this project further and further. + +By ourselves, we don't have all the time required to make this project shiny; but we are willing to contribute as much as we can. +Therefor it helps us, if you read this, hopfully short, overview how contribution to this project normaly work. + + +# How to contribute via PRs + +## Dependencies + +* we are using [bump2version](https://github.com/c4urself/bump2version) to manage version bumping + +## Flow + +If you created a PR, please be patient with us. We will come for a review ASAP! + +This is how it normally goes: + +1. fork this project + * please make sure indentation matches the style used in the corresponding file + * please track you changes in the `CHANGELOG.md` + * you are allowed to do many unfance commits until this PR is in its final state +1. you create a PR +1. someone from the maintainers will review the PR +1. if there are any things to discuss about, those things need to be sorted out +1. we check if squashing / rebasing is required to clean up history and enable a fast-forward merge with master +1. we will ask to fill the if missing CHANGELOG and after that to bump the version via bump2version +1. PR gets merged +1. we will tag a new release following semver + From b48b2c6b870b56757ab3f3c57e342aa24a09139d Mon Sep 17 00:00:00 2001 From: Maik Wichmann Date: Thu, 11 Oct 2018 18:06:32 +0200 Subject: [PATCH 4/6] Fix name of env var PHP_INI_POST_MAX_SIZE This deprecates the old, misspelled name PHP_INI_POSTMAX_SIZE and introduces the fixed version PHP_INI_POST_MAX_SIZE. It adds a compatibility layer for the old style and outputs a warinig, if usage of the old variant is detected. Thx to @mawich for those fixes! --- CHANGELOG.md | 5 +++++ TODO.md | 1 + docker/start.d/phpfpm/101_fix_php_env.sh | 6 ++++++ docker/usr/local/etc/php/php.ini | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 docker/start.d/phpfpm/101_fix_php_env.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 48b0dc7..62908b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 1.1.14 (2018-10-17) + +**FIXES** +* fix name of env var `PHP_INI_POST_MAX_SIZE` ( from `PHP_INI_POSTMAX_SIZE` ), the old version still works but will be removed with version 2.0.0 + # 1.1.13 (2018-10-16) **UPDATES** diff --git a/TODO.md b/TODO.md index 72de5a9..df50dfe 100644 --- a/TODO.md +++ b/TODO.md @@ -36,3 +36,4 @@ # Version 2.0 of the image * remove ONBUILD gitlab args in favour of more generic args +* remove 101_fix_php_env.sh from start.d diff --git a/docker/start.d/phpfpm/101_fix_php_env.sh b/docker/start.d/phpfpm/101_fix_php_env.sh new file mode 100644 index 0000000..f2a8212 --- /dev/null +++ b/docker/start.d/phpfpm/101_fix_php_env.sh @@ -0,0 +1,6 @@ +#!/bin/sh +sectionText "FIX: env PHP_INI_POSTMAX_SIZE to PHP_INI_POST_MAX_SIZE is set" +if [ ! -z "$PHP_INI_POSTMAX_SIZE" ]; then + warnText "ENV var PHP_INI_POSTMAX_SIZE is deprecated, please use PHP_INI_POST_MAX_SIZE instead" + export PHP_INI_POST_MAX_SIZE="$PHP_INI_POSTMAX_SIZE" +fi diff --git a/docker/usr/local/etc/php/php.ini b/docker/usr/local/etc/php/php.ini index 7c91aaf..febf6fd 100644 --- a/docker/usr/local/etc/php/php.ini +++ b/docker/usr/local/etc/php/php.ini @@ -59,7 +59,7 @@ request_order = "GP" register_argc_argv = Off auto_globals_jit = On -post_max_size = ${PHP_INI_POSTMAX_SIZE} +post_max_size = ${PHP_INI_POST_MAX_SIZE} auto_prepend_file = auto_append_file = From 3fb4d89fd7571a28fc883c0faf94ff5c5601f9c5 Mon Sep 17 00:00:00 2001 From: Tony Fahrion Date: Wed, 17 Oct 2018 12:27:51 +0200 Subject: [PATCH 5/6] =?UTF-8?q?Bump=20version:=201.1.13=20=E2=86=92=201.1.?= =?UTF-8?q?14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- Dockerfile | 2 +- README.md | 6 +++--- VERSION | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 31d0948..c9fbe44 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.13 +current_version = 1.1.14 tag_name = {new_version} commit = True tag = True diff --git a/Dockerfile b/Dockerfile index 9aaf983..5380d46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ LABEL org.label-schema.name="php" \ org.label-schema.version="0.1" \ org.label-schema.description="Core PHP image" \ org.label-schema.vendor="Claranet GmbH" \ - org.label-schema.schema-version="1.1.13" \ + org.label-schema.schema-version="1.1.14" \ author1="Fabian Dörk " \ author2="Tony Fahrion " diff --git a/README.md b/README.md index 1b7dd5a..b345a94 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ set via environment variables and makes it easy to check external services (like * provides generic build and life cycle infrastructure for containerized PHP applications (well prepared for kubernetes) * shipped as PHP 7.1.x and 7.2.x flavor * there is a (build>base already run / build>base only prepared) flavor for each PHP version -* general run concept: `docker run --rm -t claranet/php:1.1.13-php7.2.5 [subsection] [subsection-args, ...]` -* overview: `docker run --rm -t claranet/php:1.1.13-php7.2.5 help` +* general run concept: `docker run --rm -t claranet/php:1.1.14-php7.2.5 [subsection] [subsection-args, ...]` +* overview: `docker run --rm -t claranet/php:1.1.14-php7.2.5 help` * supplied services - nginx - phpfpm @@ -50,7 +50,7 @@ set via environment variables and makes it easy to check external services (like Build image locally: ```sh -# generates local/claranet/php:1.1.13-php7.2.5 +# generates local/claranet/php:1.1.14-php7.2.5 ./bin/image.sh build ``` diff --git a/VERSION b/VERSION index 9ea63db..e9bc149 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.13 +1.1.14 From be670213ea47a8d4c8db7e1ef1dd2cc77fa4da52 Mon Sep 17 00:00:00 2001 From: Maik Wichmann Date: Sun, 16 Dec 2018 20:42:31 +0100 Subject: [PATCH 6/6] prevent SYSTEM_PACKAGES from cleanup --- docker/common.inc.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/common.inc.sh b/docker/common.inc.sh index 6094c85..9b77db2 100644 --- a/docker/common.inc.sh +++ b/docker/common.inc.sh @@ -74,6 +74,10 @@ cleanup_docker_image() { if [ -e '/var/tmp/build-deps.list' ]; then sectionText "APT: remove build packages and caches" + for sp in $SYSTEM_PACKAGES + do + sed -i -e "/$sp/d" /var/tmp/build-deps.list + done local pkg_list=`tr '\n' ' ' < /var/tmp/build-deps.list` if [ ! -z "$pkg_list" ]; then eatmydata apt-get purge -y -qq $pkg_list &>> $BUILD_LOG