[2.x] Updated platforms & testing

.dockerignore

@@ -0,0 +1,3 @@
+.git/**/*
+.github/**/*
+examples/**/*

.github/workflows/docker-commit.yml

@@ -9,27 +9,37 @@ on:
       - "*"
 
 jobs:
-  fpm_push:
+  push_fpm:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
 
     runs-on: ubuntu-latest
 
-    name: Tag Commit (PHP-FPM, ${{ matrix.base-tag }})
+    name: Tag Commit (PHP-FPM with PHP${{ matrix.php }})
 
     strategy:
       fail-fast: false
       matrix:
-        base-tag:
-          - 7.4-fpm-alpine
-          - 8.0-fpm-alpine
-          - 8.1-fpm-alpine
+        php:
+          - "8.1"
+          - "8.0"
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
+      - name: Docker meta
+        id: docker_meta
+        uses: docker/metadata-action@v4.0.1
+        with:
+          images: quay.io/renokico/laravel-base
+          tags: |
+            type=ref,event=pr,suffix=-${{ matrix.php }}
+            type=raw,value=${{ github.sha }}-${{ matrix.php }}-fpm
+          labels: |
+            quay.expires-after=7d
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -46,35 +56,63 @@ jobs:
         with:
           push: true
           context: .
-          tags: quay.io/renokico/laravel-base:${{ github.sha }}-${{ matrix.base-tag }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
           file: Dockerfile.fpm
           build-args: |
-            BASE_TAG=${{ matrix.base-tag }}
-
-  octane_push:
+            PHP_VERSION=${{ matrix.php }}
+          cache-from: |
+            type=gha,scope=php-fpm
+          cache-to: |
+            type=gha,scope=php-fpm
+          platforms: |
+            linux/amd64
+            linux/arm64
+            linux/arm/v7
+
+  push_swoole:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
 
     runs-on: ubuntu-latest
 
-    name: Tag Commit (Octane, ${{ matrix.base-tag }})
+    name: Tag Commit (${{ matrix.swoole }}/v${{ matrix.swoole-version }} with PHP${{ matrix.php }})
 
     strategy:
       fail-fast: false
       matrix:
-        base-tag:
-          - 4.8-php8.0-alpine
-          - 4.7-php8.0-alpine
-          - 4.6-php8.0-alpine
-          - 4.8-php8.1-alpine
-          # - 4.7-php8.1-alpine
-          # - 4.6-php8.1-alpine
+        php:
+          - "8.1"
+          - "8.0"
+        swoole:
+          - openswoole
+          - swoole
+        include:
+          - swoole: openswoole
+            swoole-version: "4.12.0"
+          - swoole: openswoole
+            swoole-version: "4.11.1"
+          - swoole: swoole
+            swoole-version: "4.8.9"
+          - swoole: swoole
+            swoole-version: "5.0.1"
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
+      - name: Docker meta
+        id: docker_meta
+        uses: docker/metadata-action@v4.0.1
+        with:
+          images: quay.io/renokico/laravel-base
+          tags: |
+            type=ref,event=pr,suffix=-php${{ matrix.php }}-${{ matrix.swoole }}${{ matrix.swoole-version }}
+            type=raw,value=${{ github.sha }}-php${{ matrix.php }}-${{ matrix.swoole }}${{ matrix.swoole-version }}
+          labels: |
+            quay.expires-after=7d
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -91,32 +129,53 @@ jobs:
         with:
           push: true
           context: .
-          tags: quay.io/renokico/laravel-base:octane-${{ github.sha }}-${{ matrix.base-tag }}
-          file: Dockerfile.octane
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          file: Dockerfile.swoole
           build-args: |
-            BASE_TAG=${{ matrix.base-tag }}
-
-  worker_push:
+            SWOOLE=${{ matrix.swoole }}
+            SWOOLE_VERSION=${{ matrix.swoole-version }}
+            PHP_VERSION=${{ matrix.php }}
+          cache-from: |
+            type=gha,scope=swoole
+          cache-to: |
+            type=gha,scope=swoole
+          platforms: |
+            linux/amd64
+            linux/arm64
+            linux/arm/v7
+
+  push_worker:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
 
     runs-on: ubuntu-latest
 
-    name: Tag Commit (Worker, ${{ matrix.base-tag }})
+    name: Tag Commit (Worker with PHP${{ matrix.php }} CLI)
 
     strategy:
       fail-fast: false
       matrix:
-        base-tag:
-          - 8.1-cli-alpine
-          - 8.0-cli-alpine
-          - 7.4-cli-alpine
+        php:
+          - "8.1"
+          - "8.0"
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
+      - name: Docker meta
+        id: docker_meta
+        uses: docker/metadata-action@v4.0.1
+        with:
+          images: quay.io/renokico/laravel-base
+          tags: |
+            type=ref,event=pr,suffix=-worker-${{ matrix.php }}
+            type=raw,value=worker-${{ github.sha }}-${{ matrix.php }}
+          labels: |
+            quay.expires-after=7d
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -133,7 +192,16 @@ jobs:
         with:
           push: true
           context: .
-          tags: quay.io/renokico/laravel-base:worker-${{ github.sha }}-${{ matrix.base-tag }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
           file: Dockerfile.worker
           build-args: |
-            BASE_TAG=${{ matrix.base-tag }}
+            PHP_VERSION=${{ matrix.php }}
+          cache-from: |
+            type=gha,scope=worker
+          cache-to: |
+            type=gha,scope=worker
+          platforms: |
+            linux/amd64
+            linux/arm64
+            linux/arm/v7

.github/workflows/docker-latest-tag.yaml

@@ -11,22 +11,29 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    name: Tag Latest (PHP-FPM, ${{ matrix.base-tag }})
+    name: Tag Latest (PHP-FPM with PHP${{ matrix.php }})
 
     strategy:
       fail-fast: false
       matrix:
-        base-tag:
-          - 7.4-fpm-alpine
-          - 8.0-fpm-alpine
-          - 8.1-fpm-alpine
+        php:
+          - "8.1"
+          - "8.0"
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
+      - name: Docker meta
+        id: docker_meta
+        uses: docker/metadata-action@v4.0.1
+        with:
+          images: quay.io/renokico/laravel-base
+          tags: |
+            type=raw,value=latest-${{ matrix.php }}-fpm
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -43,35 +50,60 @@ jobs:
         with:
           push: true
           context: .
-          tags: quay.io/renokico/laravel-base:latest-${{ matrix.base-tag }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
           file: Dockerfile.fpm
           build-args: |
-            BASE_TAG=${{ matrix.base-tag }}
-
-  push_octane:
+            PHP_VERSION=${{ matrix.php }}
+          cache-from: |
+            type=gha,scope=php-fpm
+          cache-to: |
+            type=gha,scope=php-fpm
+          platforms: |
+            linux/amd64
+            linux/arm64
+            linux/arm/v7
+
+  push_swoole:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
 
     runs-on: ubuntu-latest
 
-    name: Tag Latest (Octane, ${{ matrix.base-tag }})
+    name: Tag Latest (${{ matrix.swoole }}/v${{ matrix.swoole-version }} with PHP${{ matrix.php }})
 
     strategy:
       fail-fast: false
       matrix:
-        base-tag:
-          - 4.8-php8.0-alpine
-          - 4.7-php8.0-alpine
-          - 4.6-php8.0-alpine
-          - 4.8-php8.1-alpine
-          # - 4.7-php8.1-alpine
-          # - 4.6-php8.1-alpine
+        php:
+          - "8.1"
+          - "8.0"
+        swoole:
+          - openswoole
+          - swoole
+        include:
+          - swoole: openswoole
+            swoole-version: "4.12.0"
+          - swoole: openswoole
+            swoole-version: "4.11.1"
+          - swoole: swoole
+            swoole-version: "4.8.9"
+          - swoole: swoole
+            swoole-version: "5.0.1"
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
+      - name: Docker meta
+        id: docker_meta
+        uses: docker/metadata-action@v4.0.1
+        with:
+          images: quay.io/renokico/laravel-base
+          tags: |
+            type=raw,value=latest-php${{ matrix.php }}-${{ matrix.swoole }}${{ matrix.swoole-version }}
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -88,32 +120,50 @@ jobs:
         with:
           push: true
           context: .
-          tags: quay.io/renokico/laravel-base:octane-latest-${{ matrix.base-tag }}
-          file: Dockerfile.octane
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          file: Dockerfile.swoole
           build-args: |
-            BASE_TAG=${{ matrix.base-tag }}
+            SWOOLE=${{ matrix.swoole }}
+            SWOOLE_VERSION=${{ matrix.swoole-version }}
+            PHP_VERSION=${{ matrix.php }}
+          cache-from: |
+            type=gha,scope=swoole
+          cache-to: |
+            type=gha,scope=swoole
+          platforms: |
+            linux/amd64
+            linux/arm64
+            linux/arm/v7
 
   push_worker:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
 
     runs-on: ubuntu-latest
 
-    name: Tag Latest (Worker, ${{ matrix.base-tag }})
+    name: Tag Latest (Worker with PHP${{ matrix.php }} CLI)
 
     strategy:
       fail-fast: false
       matrix:
-        base-tag:
-          - 8.1-cli-alpine
-          - 8.0-cli-alpine
-          - 7.4-cli-alpine
+        php:
+          - "8.1"
+          - "8.0"
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
+      - name: Docker meta
+        id: docker_meta
+        uses: docker/metadata-action@v4.0.1
+        with:
+          images: quay.io/renokico/laravel-base
+          tags: |
+            type=raw,value=worker-latest-${{ matrix.php }}-worker
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -130,7 +180,16 @@ jobs:
         with:
           push: true
           context: .
-          tags: quay.io/renokico/laravel-base:worker-latest-${{ matrix.base-tag }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
           file: Dockerfile.worker
           build-args: |
-            BASE_TAG=${{ matrix.base-tag }}
+            PHP_VERSION=${{ matrix.php }}
+          cache-from: |
+            type=gha,scope=worker
+          cache-to: |
+            type=gha,scope=worker
+          platforms: |
+            linux/amd64
+            linux/arm64
+            linux/arm/v7