Merge pull request #268 from thecodingmachine/support-node-v16

Support node v16

Author: mistraloz

.github/workflows/workflow.yml

@@ -67,6 +67,7 @@ jobs:
           docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node10
           docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node12
           docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node14
+          docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node16
           # Let's also tag PHP patch releases
           PHP_PATCH_VERSION=`docker run --rm thecodingmachine/php:${{ matrix.php_version }}-v4-slim-${BRANCH_VARIANT} php -v | head -n1 | grep -P '\d+\.\d+\.\d+' -o | head -n1`
           echo "Tagging patch release $PHP_PATCH_VERSION"
@@ -75,8 +76,10 @@ jobs:
           docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node10 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node10
           docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node12 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node12
           docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node14 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node14
+          docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node16 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node16
           docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-slim-${BRANCH_VARIANT}
           docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}
           docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node10
           docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node12
           docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node14
+          docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node16

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Minor changes
 
 * **2021-09-22** 
+  * Support for Node v16 | Version LTS
   * Support more PHP 8.0 extensions | Added : mongodb, swoole, zip and blackfire.
   * Enhance builder | Use BuildKit, add header to blueprint exported files and start a Makefile for common build usages.
 

Dockerfile.apache.node16

@@ -0,0 +1,21 @@
+# 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
+
+LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
+
+USER root
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends gnupg && \
+    curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends nodejs && \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends yarn && \
+    npm install -g npm
+
+USER docker

Dockerfile.cli.node16

@@ -0,0 +1,21 @@
+# 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
+
+LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
+
+USER root
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends gnupg && \
+    curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends nodejs && \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends yarn && \
+    npm install -g npm
+
+USER docker

Dockerfile.fpm.node16

@@ -0,0 +1,21 @@
+# 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
+
+LABEL authors="Julien Neuhart <[email protected]>, David Négrier <[email protected]>"
+
+USER root
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends gnupg && \
+    curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends nodejs && \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends yarn && \
+    npm install -g npm
+
+USER docker

build-and-test.sh

@@ -221,5 +221,6 @@ docker rmi test/composer_with_gd
 docker build -t thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}-node10 --build-arg PHP_VERSION=${PHP_VERSION} --build-arg GLOBAL_VERSION=${BRANCH} -f Dockerfile.${VARIANT}.node10 .
 docker build -t thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}-node12 --build-arg PHP_VERSION=${PHP_VERSION} --build-arg GLOBAL_VERSION=${BRANCH} -f Dockerfile.${VARIANT}.node12 .
 docker build -t thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}-node14 --build-arg PHP_VERSION=${PHP_VERSION} --build-arg GLOBAL_VERSION=${BRANCH} -f Dockerfile.${VARIANT}.node14 .
+docker build -t thecodingmachine/php:${PHP_VERSION}-${BRANCH}-${BRANCH_VARIANT}-node16 --build-arg PHP_VERSION=${PHP_VERSION} --build-arg GLOBAL_VERSION=${BRANCH} -f Dockerfile.${VARIANT}.node16 .
 
 echo "Tests passed with success"

orbit.yml

@@ -26,12 +26,15 @@ tasks:
       - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.apache.node10 -p "variant,apache;node_version,10"
       - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.apache.node12 -p "variant,apache;node_version,12"
       - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.apache.node14 -p "variant,apache;node_version,14"
+      - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.apache.node16 -p "variant,apache;node_version,16"
       - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.cli -p "variant,cli;node_version,"
       - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.cli.node10 -p "variant,cli;node_version,10"
       - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.cli.node12 -p "variant,cli;node_version,12"
       - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.cli.node14 -p "variant,cli;node_version,14"
+      - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.cli.node16 -p "variant,cli;node_version,16"
       - orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.fpm -p "variant,fpm;node_version,"
       - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node10 -p "variant,fpm;node_version,10"
       - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node12 -p "variant,fpm;node_version,12"
       - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node14 -p "variant,fpm;node_version,14"
+      - orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node16 -p "variant,fpm;node_version,16"
       - orbit generate -f utils/README.blueprint.md -o README.md