Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update PHP flavour 7.2.23 -> 7.2.24 #53

Merged
merged 1 commit into from
Jan 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ 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.31-php7.2.23 <main-section> [subsection] [subsection-args, ...]`
* overview: `docker run --rm -t claranet/php:1.1.31-php7.2.23 help`
* general run concept: `docker run --rm -t claranet/php:1.1.31-php7.2.24 <main-section> [subsection] [subsection-args, ...]`
* overview: `docker run --rm -t claranet/php:1.1.31-php7.2.24 help`
* supplied services
- nginx
- phpfpm
- crond

Build image locally:
```sh
# generates local/claranet/php:1.1.31-php7.2.23
# generates local/claranet/php:1.1.31-php7.2.24
./bin/image.sh build
```

Expand Down
4 changes: 2 additions & 2 deletions bin/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.33-fpm-jessie 7.2.23-fpm-stretch"
LATEST_IMAGE="7.2.23-fpm-stretch"
FROM_IMAGE_TAGS="7.1.33-fpm-jessie 7.2.24-fpm-stretch"
LATEST_IMAGE="7.2.24-fpm-stretch"

# based on $TRAVIS_BRANCH
# we decide to...
Expand Down
4 changes: 2 additions & 2 deletions bin/image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ set -x
set -eo pipefail
WORKDIR=$(realpath $0 | xargs dirname | xargs dirname)

export FROM_IMAGE=${FROM_IMAGE:-php:7.2.23-fpm-stretch}
PHP_VERSION=${PHP_VERSION:-7.2.23}
export FROM_IMAGE=${FROM_IMAGE:-php:7.2.24-fpm-stretch}
PHP_VERSION=${PHP_VERSION:-7.2.24}
VERSION=${VERSION:-`cat $WORKDIR/VERSION`}
IMAGE_NAME=${IMAGE_NAME:-local/claranet/php}
IMAGE_TAG=${IMAGE_TAG:-$VERSION-php$PHP_VERSION}
Expand Down