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 8 flavour properly #78

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/build-and-release-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
push:
branches:
- master
- '**'
tags:
- '*'

Expand All @@ -29,4 +29,4 @@ jobs:
env:
DOCKER_USER: ${{ secrets.DOCKER_USER }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: ./bin/ci.sh run
run: ./bin/ci.sh run
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# 1.1.59 (2022-06-29)

**FIXES**
- Add flavour properly to be generated by CI
- Update docs

**UPDATES**
- Updated nodejs to 18
- Updated new relic agent to php5-9.21.0.311
- Updated framework to symfony4 (previously symfony2)

**REMOVAL**
- Remove flavor and support for PHP 7.x versions (end of life)

# 1.1.58 (2022-06-29)

**UPDATES**
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ENV NGINX_SITES_AVAILABLE="/etc/nginx/sites-available" \

# NODEJS
ENV ENABLE_NODEJS="true" \
NODEJS_VERSION="14" \
NODEJS_VERSION="18" \
ENABLE_BOWER="true" \
NPM="npm" \
NPM_BUILD_PACKAGES="" \
Expand All @@ -57,7 +57,7 @@ ENV ENABLE_NODEJS="true" \
# PHP
ENV PHP="php" \
FPM="php-fpm" \
NEWRELIC_PHP_VERSION="php5-8.0.0.204" \
NEWRELIC_PHP_VERSION="php5-9.21.0.311" \
PHP_EXTENSIONS_STARTUP_ONLY="xdebug APCu imagick redis" \
PHP_EXTENSIONS_STARTUP_ENABLE="" \
PHP_EXTENSIONS="bcmath bz2 gd gmp intl json mbstring opcache dom curl pgsql pdo_pgsql pdo_mysql ldap soap zip xdebug-3.1.5 imagick-3.7.0 redis-5.3.7 APCu" \
Expand Down Expand Up @@ -86,7 +86,7 @@ ENV PHP="php" \
PHP_INI_MAX_FILE_UPLOADS="100" \
PHP_INI_SHORT_OPEN_TAG="False" \
PHP_INI_NEWRELIC_APPNAME="myapp" \
PHP_INI_NEWRELIC_FRAMEWORK="symfony2" \
PHP_INI_NEWRELIC_FRAMEWORK="symfony4" \
PHP_INI_NEWRELIC_LICENSE="xxx" \
BLACKFIRE_AGENT="blackfire:8707" \
CONSOLE="exec_console" \
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ set via environment variables and makes it easy to check external services (like

* extends official docker php images
* provides generic build and life cycle infrastructure for containerized PHP applications (well prepared for kubernetes)
* shipped as PHP 7.1.x, 7.2.x and 7.3.x flavor
* shipped as PHP 8.1.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.58-php7.3.13 <main-section> [subsection] [subsection-args, ...]`
* overview: `docker run --rm -t claranet/php:1.1.58-php7.3.13 help`
* general run concept: `docker run --rm -t claranet/php:1.1.58-php8.1.7 <main-section> [subsection] [subsection-args, ...]`
* overview: `docker run --rm -t claranet/php:1.1.58-php8.1.7 help`
* supplied services
- nginx
- phpfpm
- crond

Build image locally:
```sh
# generates local/claranet/php:1.1.58-php7.3.13
# generates local/claranet/php:1.1.58-php8.1.7
./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-stretch 7.2.34-fpm-stretch 7.3.28-fpm-stretch"
LATEST_IMAGE="7.3.28-fpm-stretch"
FROM_IMAGE_TAGS="8.1.7-fpm-buster"
LATEST_IMAGE="8.1.7-fpm-buster"

# Based on $GITHUB_HEAD_REF which is set fot pull requests
# and $RELEASE_VERSION which holds either the branch name or tag
Expand Down