Merge branch 'master' of github.com:laradock/laradock into master

.github/workflows/main-ci.yml

@@ -1,13 +1,19 @@
 name: CI
 
-on: [push, pull_request]
+on: 
+  push:
+    branches: '**'
+    tags: '**'
+  pull_request:
+  schedule:
+  - cron: '0 0 * * 0'
 
 jobs:
-  build:
+  build-php:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php_version: ["7.1", "7.2", "7.3", "7.4", "8.0"]
+        php_version: ["7.2", "7.3", "7.4", "8.0"]
         service: [php-fpm, php-worker, workspace, laravel-horizon]
     steps:
     - uses: actions/checkout@v2
@@ -16,4 +22,22 @@ jobs:
         PHP_VERSION: ${{ matrix.php_version }}
       run: |
         cp env-example .env
+        # sed -i -- '201,272s/=false/=true/g' .env
+        sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
+        sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env
+        docker-compose build ${{ matrix.service }}
+
+  build-other:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        service: ['nginx', 'redis', 'mysql', 'mariadb', 'percona', 'minio', 'mongo']
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build the Docker image
+      run: |
+        cp env-example .env
+        sed -i -- 's/=false/=true/g' .env
+        sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
+        sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env
         docker-compose build ${{ matrix.service }}

laravel-horizon/Dockerfile

@@ -235,7 +235,7 @@ RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
   if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
   curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/2.2.0.tar.gz"; \
   else \
-  curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/v3.1.3.tar.gz"; \
+  curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/v3.1.4.tar.gz"; \
   fi \
   && mkdir -p memcached \
   && tar -C memcached -zxvf /tmp/memcached.tar.gz --strip 1 \

php-fpm/Dockerfile

@@ -285,24 +285,21 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
 ###########################################################################
 
 ARG INSTALL_SWOOLE=false
-RUN if [ ${INSTALL_SWOOLE} = true ]; then \
+RUN set -eux; \
+    if [ ${INSTALL_SWOOLE} = true ]; then \
       # Install Php Swoole Extension
-    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+      if   [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \
-      pecl -q install swoole-2.0.11; \
+        pecl install swoole-2.0.11; \
+      elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \
+        pecl install swoole-4.3.5; \
+      elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \
+        pecl install swoole-4.6.0; \
       else \
-      if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
+        pecl install swoole; \
-        echo '' | pecl install swoole-4.3.5; \
+      fi; \
-      else \
+      docker-php-ext-enable swoole; \
-        if [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
+      php -m | grep -q 'swoole'; \
-          echo '' | pecl install swoole-4.6.0; \
+    fi
-        else \
-          echo '' | pecl install swoole; \
-        fi \
-      fi \
-    fi && \
-    docker-php-ext-enable swoole \
-    && php -m | grep -q 'swoole' \
-;fi
 
 ###########################################################################
 # Taint EXTENSION