Skip to content

Commit b022895

Browse files
mistralozmistraloz
authored
Merge pull request #268 from thecodingmachine/support-node-v16
Support node v16
2 parents 8af1c6c + d6e52d2 commit b022895

File tree

7 files changed

+71
-0
lines changed

7 files changed

+71
-0
lines changed

‎.github/workflows/workflow.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node10
6868
docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node12
6969
docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node14
70+
docker push thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node16
7071
# Let's also tag PHP patch releases
7172
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`
7273
echo "Tagging patch release $PHP_PATCH_VERSION"
@@ -75,8 +76,10 @@ jobs:
7576
docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node10 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node10
7677
docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node12 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node12
7778
docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node14 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node14
79+
docker tag thecodingmachine/php:${{ matrix.php_version }}-v4-${BRANCH_VARIANT}-node16 thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node16
7880
docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-slim-${BRANCH_VARIANT}
7981
docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}
8082
docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node10
8183
docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node12
8284
docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node14
85+
docker push thecodingmachine/php:${PHP_PATCH_VERSION}-v4-${BRANCH_VARIANT}-node16

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
### Minor changes
66

77
* **2021-09-22**
8+
* Support for Node v16 | Version LTS
89
* Support more PHP 8.0 extensions | Added : mongodb, swoole, zip and blackfire.
910
* Enhance builder | Use BuildKit, add header to blueprint exported files and start a Makefile for common build usages.
1011

‎Dockerfile.apache.node16‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
2+
ARG PHP_VERSION
3+
ARG GLOBAL_VERSION
4+
FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-apache
5+
6+
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
7+
8+
USER root
9+
10+
RUN apt-get update && \
11+
apt-get install -y --no-install-recommends gnupg && \
12+
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
13+
apt-get update && \
14+
apt-get install -y --no-install-recommends nodejs && \
15+
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
16+
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
17+
apt-get update && \
18+
apt-get install -y --no-install-recommends yarn && \
19+
npm install -g npm
20+
21+
USER docker

‎Dockerfile.cli.node16‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
2+
ARG PHP_VERSION
3+
ARG GLOBAL_VERSION
4+
FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-cli
5+
6+
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
7+
8+
USER root
9+
10+
RUN apt-get update && \
11+
apt-get install -y --no-install-recommends gnupg && \
12+
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
13+
apt-get update && \
14+
apt-get install -y --no-install-recommends nodejs && \
15+
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
16+
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
17+
apt-get update && \
18+
apt-get install -y --no-install-recommends yarn && \
19+
npm install -g npm
20+
21+
USER docker

‎Dockerfile.fpm.node16‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# DO NOT EDIT THIS FILE : Make yours changes in /utils/Dockerfile.*.blueprint)
2+
ARG PHP_VERSION
3+
ARG GLOBAL_VERSION
4+
FROM thecodingmachine/php:${PHP_VERSION}-${GLOBAL_VERSION}-fpm
5+
6+
LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <d.negrier@thecodingmachine.com>"
7+
8+
USER root
9+
10+
RUN apt-get update && \
11+
apt-get install -y --no-install-recommends gnupg && \
12+
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
13+
apt-get update && \
14+
apt-get install -y --no-install-recommends nodejs && \
15+
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
16+
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
17+
apt-get update && \
18+
apt-get install -y --no-install-recommends yarn && \
19+
npm install -g npm
20+
21+
USER docker

‎build-and-test.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,5 +221,6 @@ docker rmi test/composer_with_gd
221221
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 .
222222
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 .
223223
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 .
224+
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 .
224225

225226
echo "Tests passed with success"

‎orbit.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,15 @@ tasks:
2626
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.apache.node10 -p "variant,apache;node_version,10"
2727
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.apache.node12 -p "variant,apache;node_version,12"
2828
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.apache.node14 -p "variant,apache;node_version,14"
29+
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.apache.node16 -p "variant,apache;node_version,16"
2930
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.cli -p "variant,cli;node_version,"
3031
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.cli.node10 -p "variant,cli;node_version,10"
3132
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.cli.node12 -p "variant,cli;node_version,12"
3233
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.cli.node14 -p "variant,cli;node_version,14"
34+
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.cli.node16 -p "variant,cli;node_version,16"
3335
- orbit generate -f utils/Dockerfile.blueprint -o Dockerfile.fpm -p "variant,fpm;node_version,"
3436
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node10 -p "variant,fpm;node_version,10"
3537
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node12 -p "variant,fpm;node_version,12"
3638
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node14 -p "variant,fpm;node_version,14"
39+
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node16 -p "variant,fpm;node_version,16"
3740
- orbit generate -f utils/README.blueprint.md -o README.md

0 commit comments

Comments
 (0)