Separate build and test stages (with bake)

Author: mistraloz

.github/workflows/workflow.yml

@@ -24,11 +24,11 @@ jobs:
         uses: docker/setup-buildx-action@v1
       - name: Checkout
         uses: actions/checkout@v1
-      - name: Build
+      - name: Build locally
         run: |
           PHP_VERSION="${{ matrix.php_version }}"
           docker buildx bake --load \
-            --platform=${PLATFORM:$(uname -p)}} \
+            --set "*.platform=$(uname -p)" \
             php${PHP_VERSION//.}-${{ matrix.variant }} 
           docker images --filter=reference=thecodingmachine/php
       - name: Login to DockerHub
@@ -38,14 +38,11 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Release
+      - name: Build and push to repository
         # Merge ~ push.
         if: ${{ github.event_name == 'push' || github.event_name == 'schedule' }}
         run: |
           PHP_VERSION="${{ matrix.php_version }}"
           PHP_PATCH_VERSION=`docker run --rm thecodingmachine/php:${PHP_VERSION}-v4-slim-${BRANCH_VARIANT} php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
           TAG=${PHP_PATCH_VERSION} docker buildx bake --push \
-            --cache-from=type=local,src=/tmp/buildx-cache \
-            --cache-to=type=local,dest=/tmp/buildx-cache \
-            --platform=${PLATFORM:$(uname -p)}} \
             php${PHP_VERSION//.}-${{ matrix.variant }} 

Makefile

@@ -1,3 +1,5 @@
+SHELL=/bin/bash
+
 blueprint: ## Generate all blueprints file
 	@if ! type orbit >/dev/null 2>&1; then echo "Missing orbit dependency, please install from https://github.com/gulien/orbit/"; exit 1; fi
 	orbit run generate
@@ -8,21 +10,21 @@ _test-prerequisites: blueprint
 	docker pull ubuntu:20.04
 
 test-quick:  ## Test 8.0 and 8.1 quickly
-	PHP_VERSION=8.0 VARIANT=cli $(MAKE) _test-version
-	PHP_VERSION=8.1 VARIANT=cli $(MAKE) _test-version
+	VERSION=8.0 VARIANT=cli $(MAKE) _test-version
+	VERSION=8.1 VARIANT=cli $(MAKE) _test-version
 
 test-8.1:  ## Test php8.1 build only
-	PHP_VERSION=8.1 VARIANT=cli $(MAKE) _test-version
-	PHP_VERSION=8.1 VARIANT=apache $(MAKE) _test-version
+	VERSION=8.1 VARIANT=cli $(MAKE) _test-version
+	VERSION=8.1 VARIANT=apache $(MAKE) _test-version
 
 test-8.0:  ## Test php8.0 build only
-	PHP_VERSION=8.0 VARIANT=cli $(MAKE) _test-version
-	PHP_VERSION=8.0 VARIANT=apache $(MAKE) _test-version
+	VERSION=8.0 VARIANT=cli $(MAKE) _test-version
+	VERSION=8.0 VARIANT=apache $(MAKE) _test-version
 
 _test-version: _test-prerequisites ## Test php build for VERSION="" and VARIANT=""
 	docker buildx bake --load \
-		--platform=${PLATFORM:$(uname -p)}} \
-		php${VERSION//.}-cli
+	    --set "*.platform=$$(uname -p)" \
+		php$${VERSION//.}-cli
 	PHP_VERSION="$(VERSION)" BRANCH=v4 VARIANT=cli ./test-image.sh || (notify-send -u critical "Tests failed ($(VERSION)-$(VARIANT))" && exit 1)
 	notify-send -u critical "Tests passed with success ($(VERSION)-$(VARIANT))"
 

README.md

@@ -132,26 +132,26 @@ These images are based on the [official PHP image](https://hub.docker.com/_/php/
 Example with CLI:
 
 ```bash
-$ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/app thecodingmachine/php:8.0-v4-cli php your-script.php
+$ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/app thecodingmachine/php:8.1-v4-cli php your-script.php
 ```
 
 Example with Apache:
 
 ```bash
-$ docker run -p 80:80 --rm --name my-apache-php-app -v "$PWD":/var/www/html thecodingmachine/php:8.0-v4-apache
+$ docker run -p 80:80 --rm --name my-apache-php-app -v "$PWD":/var/www/html thecodingmachine/php:8.1-v4-apache
 ```
 
 Example with PHP-FPM:
 
 ```bash
-$ docker run -p 9000:9000 --rm --name my-php-fpm -v "$PWD":/var/www/html thecodingmachine/php:8.0-v4-fpm
+$ docker run -p 9000:9000 --rm --name my-php-fpm -v "$PWD":/var/www/html thecodingmachine/php:8.1-v4-fpm
 ```
 
 Example with Apache + Node 14.x in a Dockerfile:
 
 **Dockerfile**
 ```Dockerfile
-FROM thecodingmachine/php:8.0-v4-apache-node14
+FROM thecodingmachine/php:8.1-v4-apache-node14
 
 COPY src/ /var/www/html/
 RUN composer install
@@ -165,7 +165,7 @@ This image comes with 2 "types": the *slim* and the **fat** image.
 
 These extensions are enabled by default in slim image: `calendar` `ctype` `curl` `date` `dom` `exif` `fileinfo` `filter` `ftp` `gettext` `iconv` `json` `mbstring` `opcache` `openssl` `pcntl` `pcre` `PDO` `Phar` `posix` `readline` `shmop` `Reflection` `session` `shmop` `SimpleXML` `sockets` `sodium` `SPL` `sysvmsg` `sysvsem` `sysvshm` `tokenizer` `xml` `xmlreader` `xmlwriter` `xsl` `zip`
 
-This list can be outdated, you can verify by executing : `docker run --rm -it thecodingmachine/php:8.0-v4-slim-cli php -m`
+This list can be outdated, you can verify by executing : `docker run --rm -it thecodingmachine/php:8.1-v4-slim-cli php -m`
 
 The slim image provides a simple way to install the other extensions. You would typically use the "slim" image in a `Dockerfile` when building your own custom image.
 
@@ -179,7 +179,7 @@ Below is a list of extensions available in this image:
 
 **Available (can be enabled using environment variables):** `amqp` `ast` `bcmath` `blackfire` `bz2` `dba` `ds` `enchant` `ev` `event` `exif` `mailparse` `msgpack` `gd` `gettext` `gmp` `gnupg` `grpc` `igbinary` `imagick` `imap` `intl` `ldap` `mcrypt` `memcached` `mongodb` `pcov` `pdo_dblib` `pdo_pgsql` `pdo_sqlite` `pgsql` `pspell` `shmop` `snmp` `sockets` `sqlite3` `swoole` `tidy` `uploadprogress` `uuid` `weakref(-beta)` `xdebug` `xmlrpc` `xsl` `yaml`
 
-This list can be outdated, you can verify by executing : `docker run --rm -it thecodingmachine/php:8.0-v4-cli php -m`
+This list can be outdated, you can verify by executing : `docker run --rm -it thecodingmachine/php:8.1-v4-cli php -m`
 
 **Note**:
 
@@ -199,7 +199,7 @@ For instance:
 version: '3'
 services:
   my_app:
-    image: thecodingmachine/php:8.0-v4-apache-node16
+    image: thecodingmachine/php:8.1-v4-apache-node16
     environment:
       # Enable the PostgreSQL extension
       PHP_EXTENSION_PGSQL: 1
@@ -219,7 +219,7 @@ If you are using the slim image, you can automatically compile the extensions us
 
 ```Dockerfile
 ARG PHP_EXTENSIONS="apcu mysqli pdo_mysql redis soap"
-FROM thecodingmachine/php:8.0-v4-slim-apache
+FROM thecodingmachine/php:8.1-v4-slim-apache
 # The build will automatically trigger the download and compilation
 # of the extensions (thanks to a ONBUILD hook in the slim image)
 ```
@@ -235,7 +235,7 @@ first FROM):
 # The PHP_EXTENSIONS ARG will apply to the "slim" image
 ARG PHP_EXTENSIONS="apcu mysqli pdo_mysql soap"
 
-FROM thecodingmachine/php:8.0-v4-apache-node16 AS builder
+FROM thecodingmachine/php:8.1-v4-apache-node16 AS builder
 
 COPY --chown=docker:docker sources/web .
 RUN composer install &&\
@@ -256,7 +256,7 @@ not contain Node, and contains only required extensions.
 
 ## Setting parameters in php.ini
 
-By default, the base `php.ini` file used is the [*development* php.ini](https://github.com/php/php-src/blob/PHP-8.0/php.ini-development) file that comes with PHP. 
+By default, the base `php.ini` file used is the [*development* php.ini](https://github.com/php/php-src/blob/PHP-8.1/php.ini-development) file that comes with PHP. 
 
 You can use the production `php.ini` file using the `TEMPLATE_PHP_INI` environment variable:
 
@@ -271,7 +271,7 @@ You can override parameters in `php.ini` using the PHP_INI_XXX environment varia
 version: '3'
 services:
   my_app:
-    image: thecodingmachine/php:8.0-v4-apache-node16
+    image: thecodingmachine/php:8.1-v4-apache-node16
     environment:
       # set the parameter memory_limit=1g
       PHP_INI_MEMORY_LIMIT: 1g
@@ -333,7 +333,7 @@ For instance:
 version: '3'
 services:
   my_app:
-    image: thecodingmachine/php:8.0-v4-apache-node16
+    image: thecodingmachine/php:8.1-v4-apache-node16
     environment:
       # Enable the DAV extension for Apache
       APACHE_EXTENSION_DAV: 1
@@ -351,7 +351,7 @@ APACHE_EXTENSIONS="dav ssl"
 
 **Apache modules available:** `access_compat` `actions` `alias` `allowmethods` `asis` `auth_basic` `auth_digest` `auth_form` `authn_anon` `authn_core` `authn_dbd` `authn_dbm` `authn_file` `authn_socache` `authnz_fcgi` `authnz_ldap` `authz_core` `authz_dbd` `authz_dbm` `authz_groupfile` `authz_host` `authz_owner` `authz_user` `autoindex` `brotli` `buffer` `cache` `cache_disk` `cache_socache` `cern_meta` `cgi` `cgid` `charset_lite` `data` `dav` `dav_fs` `dav_lock` `dbd` `deflate` `dialup` `dir` `dump_io` `echo` `env` `ext_filter` `expires` `file_cache` `filter` `headers` `heartbeat` `heartmonitor` `http2` `ident` `imagemap` `include` `info` `lbmethod_bybusyness` `lbmethod_byrequests` `lbmethod_bytraffic` `lbmethod_heartbeat` `ldap` `log_debug` `log_forensic` `lua` `macro` `md` `mime` `mime_magic` `mpm_event` `mpm_prefork` `mpm_worker` `negotiation` `php8.0 (depend of your active version)` `proxy` `proxy_ajp` `proxy_balancer` `proxy_connect` `proxy_express` `proxy_fcgi` `proxy_fdpass` `proxy_ftp` `proxy_hcheck` `proxy_html` `proxy_http` `proxy_http2` `proxy_scgi` `proxy_wstunnel` `ratelimit` `reflector` `remoteip` `reqtimeout` `request` `rewrite` `sed` `session` `session_cookie` `session_crypto` `session_dbd` `setenvif` `slotmem_plain` `slotmem_shm` `socache_dbm` `socache_memcache` `socache_redis` `socache_shmcb` `speling` `ssl` `status` `substitute` `suexec` `unique_id` `userdir` `usertrack` `vhost_alias` `xml2enc`
 
-This list can be outdated, you can verify by executing : `docker run --rm -it thecodingmachine/php:8.0-v4-slim-apache a2enmod`
+This list can be outdated, you can verify by executing : `docker run --rm -it thecodingmachine/php:8.1-v4-slim-apache a2enmod`
 
 
 ## Debugging
@@ -386,7 +386,7 @@ If you use the *slim* images, you can install a NodeJS version with a simple ARG
 
 ```Dockerfile
 ARG NODE_VERSION=14
-FROM thecodingmachine/php:8.0-v4-slim-apache
+FROM thecodingmachine/php:8.1-v4-slim-apache
 # The build will automatically trigger the download of Node 14
 # (thanks to a ONBUILD hook in the slim image)
 ```
@@ -439,7 +439,7 @@ This can be done easily:
 
 **Dockerfile**
 ```Dockerfile
-FROM thecodingmachine/php:8.0-v4-apache
+FROM thecodingmachine/php:8.1-v4-apache
 
 # ...
 
@@ -483,7 +483,7 @@ a single argument before the "FROM" clause in your Dockerfile:
 
 ```Dockerfile
 ARG INSTALL_CRON=1
-FROM thecodingmachine/php:8.0-v4-slim-apache
+FROM thecodingmachine/php:8.1-v4-slim-apache
 # The build triggers automatically the installation of Cron
 ```
 
@@ -536,20 +536,20 @@ If such a file is mounted in the image, it will be executed on container startup
 
 ```bash
 docker run -it --rm --name my-running-script -v "$PWD":/usr/src/myapp -w /usr/src/myapp \ 
-       -v $PWD/my-startup-script.sh:/etc/container/startup.sh thecodingmachine/php:8.0-v4-cli php your-script.php 
+       -v $PWD/my-startup-script.sh:/etc/container/startup.sh thecodingmachine/php:8.1-v4-cli php your-script.php 
 ```
 
 ## Using the CLI variant
 
-The CLI images (thecodingmachine/php:8.0-v4-cli) expect a command to be passed in parameter.
+The CLI images (thecodingmachine/php:8.1-v4-cli) expect a command to be passed in parameter.
 You should override the Docker "command".
 
 Important! You should not override the Docker "entrypoint".
 
 **Usage in a Dockerfile:**
 
 ```Dockerfile
-FROM thecodingmachine/php:8.0-v4-cli
+FROM thecodingmachine/php:8.1-v4-cli
 
 CMD ["php", "myprogram.php", "some_param"]
 ```
@@ -561,7 +561,7 @@ CMD ["php", "myprogram.php", "some_param"]
 version: '3'
 services:
   my_app:
-    image: thecodingmachine/php:8.0-v4-cli
+    image: thecodingmachine/php:8.1-v4-cli
     command: php myprogram.php some_param
 ```
 
@@ -581,7 +581,7 @@ This option is the easiest way to go if you are using the image on a development
 version: '3'
 services:
   my_app:
-    image: thecodingmachine/php:8.0-v4-apache-node16
+    image: thecodingmachine/php:8.1-v4-apache-node16
     volumes:
       - ~/.ssh:/home/docker/.ssh
 ```
@@ -602,7 +602,7 @@ Now, let's write a Dockerfile.
 
 **Dockerfile**
 ```yml
-FROM thecodingmachine/php:8.0-v4-apache
+FROM thecodingmachine/php:8.1-v4-apache
 
 ARG SSH_PRIVATE_KEY
 ARG SSH_KNOWN_HOSTS
@@ -640,7 +640,7 @@ kind: Pod
 spec:
   containers:
   - name: foobar
-    image: thecodingmachine/php:8.0-v4-apache
+    image: thecodingmachine/php:8.1-v4-apache
     securityContext:
       allowPrivilegeEscalation: true # never use "false" here.
 ```
@@ -662,7 +662,7 @@ Your `docker-compose.yml` file will typically look like this:
 version: '3.3'
 services:
   php:
-    image: thecodingmachine/php:8.0-v4-apache
+    image: thecodingmachine/php:8.1-v4-apache
     ports:
       - "80:80"
     environment:
@@ -688,7 +688,7 @@ If for some reason, the container name is not "blackfire", you can customize the
 version: '3.3'
 services:
   php:
-    image: thecodingmachine/php:8.0-v4-apache
+    image: thecodingmachine/php:8.1-v4-apache
     environment:
       PHP_EXTENSION_BLACKFIRE: 1
       BLACKFIRE_AGENT: myblackfire
@@ -723,7 +723,7 @@ This command will generate all the files from the "blueprint" templates.
 You can then test your changes using the `build-and-test.sh` command:
 
 ```bash
-PHP_VERSION=8.0 BRANCH=v4 VARIANT=apache ./build-and-test.sh
+PHP_VERSION=8.1 BRANCH=v4 VARIANT=apache ./build-and-test.sh
 ```
 
 ### Additional environment in build-and-test.sh

test-image.sh

@@ -10,7 +10,7 @@ failure() {
 trap 'failure ${LINENO} "$BASH_COMMAND"' ERR
 
 # Use either docker's 'build' command or 'buildx '
-export BUILDTOOL="buildx build --load --cache-from=type=local,src=/tmp/buildx-cache --cache-to=type=local,dest=/tmp/buildx-cache --platform=${PLATFORM:$(uname -p)}}"
+export BUILDTOOL="buildx build --load --platform=${PLATFORM:-$(uname -p)}"
 
 # Let's replace the "." by a "-" with some bash magic
 export BRANCH_VARIANT="${VARIANT//./-}"