Browse Source

Added node & npm to PHP images #694

Mark Shust 3 years ago
parent
commit
600dd50a8e

+ 1 - 1
.github/workflows/build-php-7.4.yml

@@ -31,4 +31,4 @@ jobs:
           push: true
           tags: |
             markoshust/magento-php:7.4-fpm
-            markoshust/magento-php:7.4-fpm-14
+            markoshust/magento-php:7.4-fpm-15

+ 1 - 1
.github/workflows/build-php-8.1.yml

@@ -31,4 +31,4 @@ jobs:
           push: true
           tags: |
             markoshust/magento-php:8.1-fpm
-            markoshust/magento-php:8.1-fpm-0
+            markoshust/magento-php:8.1-fpm-1

+ 2 - 2
.github/workflows/build-php.yml

@@ -31,7 +31,7 @@ jobs:
           push: true
           tags: |
             markoshust/magento-php:7.4-fpm
-            markoshust/magento-php:7.4-fpm-14
+            markoshust/magento-php:7.4-fpm-15
   php-8-1:
     runs-on: ubuntu-latest
     steps:
@@ -60,4 +60,4 @@ jobs:
           push: true
           tags: |
             markoshust/magento-php:8.1-fpm
-            markoshust/magento-php:8.1-fpm-0
+            markoshust/magento-php:8.1-fpm-1

+ 2 - 2
README.md

@@ -30,8 +30,8 @@ View Dockerfiles for the latest tags:
 - [markoshust/magento-nginx (Docker Hub)](https://hub.docker.com/r/markoshust/magento-nginx/)
   - [`1.18`, `1.18-7`](https://github.com/markshust/docker-magento/tree/master/images/nginx/1.18)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
-  - [`8.1-fpm`, `8.1-fpm-0`](https://github.com/markshust/docker-magento/tree/master/images/php/8.1)
-  - [`7.4-fpm`, `7.4-fpm-14`](https://github.com/markshust/docker-magento/tree/master/images/php/7.4)
+  - [`8.1-fpm`, `8.1-fpm-1`](https://github.com/markshust/docker-magento/tree/master/images/php/8.1)
+  - [`7.4-fpm`, `7.4-fpm-15`](https://github.com/markshust/docker-magento/tree/master/images/php/7.4)
 - [markoshust/magento-elasticsearch (Docker Hub)](https://hub.docker.com/r/markoshust/magento-elasticsearch/)
   - [`7.16`, `7.16-0`](https://github.com/markshust/docker-magento/tree/master/images/elasticsearch/7.16)
 - [markoshust/magento-rabbitmq (Docker Hub)](https://hub.docker.com/r/markoshust/magento-rabbitmq/)

+ 3 - 0
images/php/7.4/Dockerfile

@@ -8,6 +8,8 @@ RUN groupadd -g "$APP_ID" app \
 RUN mkdir -p /etc/nginx/html /var/www/html /sock \
   && chown -R app:app /etc/nginx /var/www /usr/local/etc/php/conf.d /sock
 
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
+
 RUN apt-get update && apt-get install -y \
     cron \
     default-mysql-client \
@@ -30,6 +32,7 @@ RUN apt-get update && apt-get install -y \
     lsof \
     mailutils \
     msmtp \
+    nodejs \
     procps \
     vim \
     zip \

+ 3 - 0
images/php/8.1/Dockerfile

@@ -8,6 +8,8 @@ RUN groupadd -g "$APP_ID" app \
 RUN mkdir -p /etc/nginx/html /var/www/html /sock \
   && chown -R app:app /etc/nginx /var/www /usr/local/etc/php/conf.d /sock
 
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
+
 RUN apt-get update && apt-get install -y \
     cron \
     default-mysql-client \
@@ -30,6 +32,7 @@ RUN apt-get update && apt-get install -y \
     lsof \
     mailutils \
     msmtp \
+    nodejs \
     procps \
     vim \
     zip \