Merge pull request #93 from kool-dev/8.2-node

Added 8.2-node flavor
kool-dev · Oct 25, 2023 · b957bd5 · b957bd5
2 parents 09d6129 + a964b1d
commit b957bd5
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 4 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -66,6 +66,21 @@ jobs:
           load: true
           tags: kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }}
 
+      - name: Build and export to Docker (Node)
+        uses: docker/build-push-action@v5
+        if: matrix.type  == ''
+        with:
+          context: ${{ matrix.version }}-node${{ matrix.type }}
+          load: true
+          tags: kooldev/php:${{ matrix.version }}-node${{ matrix.type }}
+
+      - name: Tests (Node)
+        if: matrix.type  == ''
+        run: |
+          docker run kooldev/php:${{ matrix.version }}-node${{ matrix.type }} node -v
+          docker run kooldev/php:${{ matrix.version }}-node${{ matrix.type }} npm -v
+          docker run kooldev/php:${{ matrix.version }}-node${{ matrix.type }} yarn -v
+
       - name: Tests (nginx)
         run: |
           docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -v
@@ -89,6 +104,15 @@ jobs:
           push: true
           tags: kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }}
 
+      - name: Build and push (Node)
+        uses: docker/build-push-action@v5
+        if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-php' && matrix.type  == ''
+        with:
+          context: ${{ matrix.version }}-node${{ matrix.type }}
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: kooldev/php:${{ matrix.version }}-node${{ matrix.type }}
+
   trigger-build-wordpress:
     name: Trigger Wordpress Build
     runs-on: ubuntu-latest

diff --git a/8.0-node/Dockerfile b/8.0-node/Dockerfile
@@ -0,0 +1,4 @@
+FROM kooldev/php:8.0
+
+RUN apk add --update --no-cache npm yarn \
+    && rm -rf /var/cache/apk/* /tmp/*
diff --git a/8.1-node/Dockerfile b/8.1-node/Dockerfile
@@ -0,0 +1,4 @@
+FROM kooldev/php:8.1
+
+RUN apk add --update --no-cache npm yarn \
+    && rm -rf /var/cache/apk/* /tmp/*
diff --git a/8.2-node/Dockerfile b/8.2-node/Dockerfile
@@ -0,0 +1,4 @@
+FROM kooldev/php:8.2
+
+RUN apk add --update --no-cache npm yarn \
+    && rm -rf /var/cache/apk/* /tmp/*
diff --git a/fwd-template.json b/fwd-template.json
@@ -109,6 +109,19 @@
                 }
             ]
         },
+        {
+            "name": "8.0-node",
+            "data": {
+                "from": "kooldev/php:8.0",
+                "version": "8.0"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile-node"
+                }
+            ]
+        },
         {
             "name": "8.1",
             "data": {
@@ -217,6 +230,19 @@
                 }
             ]
         },
+        {
+            "name": "8.1-node",
+            "data": {
+                "from": "kooldev/php:8.1",
+                "version": "8.1"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile-node"
+                }
+            ]
+        },
         {
             "name": "8.2",
             "data": {
@@ -324,6 +350,19 @@
                     "path": "template/supervisor-conf"
                 }
             ]
+        },
+        {
+            "name": "8.2-node",
+            "data": {
+                "from": "kooldev/php:8.2",
+                "version": "8.2"
+            },
+            "files": [
+                {
+                    "name": "Dockerfile",
+                    "path": "template/Dockerfile-node"
+                }
+            ]
         }
     ]
 }
diff --git a/kool.yml b/kool.yml
@@ -5,16 +5,19 @@ scripts:
     - docker build --pull -t kooldev/php:8.0-prod 8.0-prod
     - docker build -t kooldev/php:8.0-nginx 8.0-nginx
     - docker build -t kooldev/php:8.0-nginx-prod 8.0-nginx-prod
+    - docker build -t kooldev/php:8.0-node 8.0-node
   build-8.1:
-    - docker build --pull -t kooldev/php:8.1 8.1
-    - docker build --pull -t kooldev/php:8.1-prod 8.1-prod
+    - docker build -t kooldev/php:8.1 8.1
+    - docker build -t kooldev/php:8.1-prod 8.1-prod
     - docker build -t kooldev/php:8.1-nginx 8.1-nginx
     - docker build -t kooldev/php:8.1-nginx-prod 8.1-nginx-prod
+    - docker build -t kooldev/php:8.1-node 8.1-node
   build-8.2:
-    - docker build --pull -t kooldev/php:8.2 8.2
-    - docker build --pull -t kooldev/php:8.2-prod 8.2-prod
+    - docker build -t kooldev/php:8.2 8.2
+    - docker build -t kooldev/php:8.2-prod 8.2-prod
     - docker build -t kooldev/php:8.2-nginx 8.2-nginx
     - docker build -t kooldev/php:8.2-nginx-prod 8.2-nginx-prod
+    - docker build -t kooldev/php:8.2-node 8.2-node
   build:
     # parse templates
     - kool run template

diff --git a/template/Dockerfile-node.blade.php b/template/Dockerfile-node.blade.php
@@ -0,0 +1,4 @@
+FROM {{ $from }}
+
+RUN apk add --update --no-cache npm yarn \
+    && rm -rf /var/cache/apk/* /tmp/*