Merge pull request #266 from thecodingmachine/enhance-builder

mistraloz · web-flow · commit 6132554fc19c · 2021-09-27T10:46:06.000+02:00
Enhance builder
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,37 +1,58 @@
-# v4
+# Change Log
 
-## New features
+## Version 4
+
+### Minor changes
+
+* **2021-09-22** 
+  * Enhance builder | Use BuildKit, add header to blueprint exported files and start a Makefile for common build usages.
+
+### Initial
+
+#### New features
 
 - Support for PHP 8.0
 - Support for Node 14
 
-## Breaking changes
+#### Breaking changes
 
 - Base image is Ubuntu 20.04
 - Dropped Node 8 images
 - Dropped PHP 7.1
 
-# v3
+### Version 3
+
+### Initial
+
+#### Important changes
+
+v2 images are based on a Debian Stretch. v3 images are based on Ubuntu 18.04.
+Interally, v3 images are built from the Ondrej PPA. This is a radical change from v2 that was built from the official PHP Docker image. As a result, the v3 image do not have PECL installed, nor a build environment. This makes the v3 images ~200MB lighter.
+
+#### Changes in extensions
+
+The following extensions are now enabled by default: calendar exif pcntl shmop sockets sysvmsg sysvsem sysvshm wddx zip
+The sqlite3 extension was previously enabled by default, but must now be enabled manually
 
-See MIGRATING.md
+### Version 2
 
-# v2
+### Initial
 
-## New features
+#### New features
 
 - thecodingmachine/php image now has a "slim" variant that does not contain any extension but that can be used
   to [build the extensions very easily](https://github.com/thecodingmachine/docker-images-php/blob/dfdaa984f0fcc3d66a1b9fef5a6643582deb4d0d/README.md#compiling-extensions-in-the-slim-image).
 
-## Breaking changes
+#### Breaking changes
 
 - PHP 7.1 base image is now **Debian Stretch**
 - Dropped Node 6 images
 
-## New extensions
+#### New extensions
 
 - Imagick
 
-## Organization
+#### Organization
 
 The project layout has been deeply changed. There is now only one branch for all the PHP versions.
 Each extension now has its own installation script in the `/extensions/core` directory with symlinks for the 
diff --git a/Dockerfile.apache b/Dockerfile.apache
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
diff --git a/Dockerfile.apache.node10 b/Dockerfile.apache.node10
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
diff --git a/Dockerfile.apache.node12 b/Dockerfile.apache.node12
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
diff --git a/Dockerfile.apache.node14 b/Dockerfile.apache.node14
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
diff --git a/Dockerfile.cli b/Dockerfile.cli
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
diff --git a/Dockerfile.cli.node10 b/Dockerfile.cli.node10
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
diff --git a/Dockerfile.cli.node12 b/Dockerfile.cli.node12
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
diff --git a/Dockerfile.cli.node14 b/Dockerfile.cli.node14
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
diff --git a/Dockerfile.fpm b/Dockerfile.fpm
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG INSTALL_CRON=1
 ARG INSTALL_COMPOSER=1
 ARG PHP_VERSION
diff --git a/Dockerfile.fpm.node10 b/Dockerfile.fpm.node10
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
diff --git a/Dockerfile.fpm.node12 b/Dockerfile.fpm.node12
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
diff --git a/Dockerfile.fpm.node14 b/Dockerfile.fpm.node14
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 ARG PHP_VERSION
 ARG GLOBAL_VERSION
 FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
diff --git a/Dockerfile.slim.apache b/Dockerfile.slim.apache
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 FROM ubuntu:20.04
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
diff --git a/Dockerfile.slim.cli b/Dockerfile.slim.cli
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 FROM ubuntu:20.04
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
diff --git a/Dockerfile.slim.fpm b/Dockerfile.slim.fpm
@@ -1,3 +1,4 @@
+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
 FROM ubuntu:20.04
 
 LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
diff --git a/README.md b/README.md
diff --git a/build-and-test.sh b/build-and-test.sh
diff --git a/extensions/8.0/rdfafka b/extensions/8.0/rdfafka
diff --git a/images.yml b/images.yml
diff --git a/tests/slim_onbuild/Dockerfile b/tests/slim_onbuild/Dockerfile
diff --git a/utils/README.blueprint.md b/utils/README.blueprint.md
diff --git a/utils/setup_extensions.php b/utils/setup_extensions.php

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)`
`1`	`2`	`ARG INSTALL_CRON=1`
`2`	`3`	`ARG INSTALL_COMPOSER=1`
`3`	`4`	`ARG PHP_VERSION`