Merge branch 'master' into fix-3017

.github/workflows/main-ci.yml

@@ -6,7 +6,7 @@ on:
     tags: '**'
   pull_request:
   schedule:
-  - cron: '0 0 * * 0'
+    - cron: '0 0 * * 0'
 
 jobs:
   build-php:
@@ -16,32 +16,33 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php_version: ["5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0"]
+        php_version: [ "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0" ]
-        service: [php-fpm, php-worker, workspace, laravel-horizon]
+        service: [ php-fpm, php-worker, workspace, laravel-horizon ]
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
-    - name: Build the Docker image
+      - name: Build the Docker image
-      env:
+        env:
-        PHP_VERSION: ${{ matrix.php_version }}
+          PHP_VERSION: ${{ matrix.php_version }}
-      run: |
+        run: |
-        set -eux
+          set -eux
-        cp .env.example .env
+          cp .env.example .env
-        sed -i -- 's/=false/=true/g' .env
+          sed -i -- 's/=false/=true/g' .env
-        sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
+          sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
-        sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env
+          sed -i -- 's/PHPDBG=true/PHPDBG=false/g' .env
-        sed -i -- 's/CASSANDRA=true/CASSANDRA=false/g' .env
+          sed -i -- 's/CASSANDRA=true/CASSANDRA=false/g' .env
-        sed -i -- 's/GEARMAN=true/GEARMAN=false/g' .env
+          sed -i -- 's/GEARMAN=true/GEARMAN=false/g' .env
-        sed -i -- 's/AEROSPIKE=true/AEROSPIKE=false/g' .env
+          sed -i -- 's/AEROSPIKE=true/AEROSPIKE=false/g' .env
-        sed -i -- 's/PHALCON=true/PHALCON=false/g' .env
+          sed -i -- 's/PHALCON=true/PHALCON=false/g' .env
-        sed -i -- 's/RDKAFKA=true/RDKAFKA=false/g' .env
+          sed -i -- 's/RDKAFKA=true/RDKAFKA=false/g' .env
-        sed -i -- 's/MAILPARSE=true/MAILPARSE=false/g' .env
+          sed -i -- 's/MAILPARSE=true/MAILPARSE=false/g' .env
-        sed -i -- 's/OCI8=true/OCI8=false/g' .env
+          sed -i -- 's/OCI8=true/OCI8=false/g' .env
-        sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env
+          sed -i -- 's/IONCUBE=true/IONCUBE=false/g' .env
-        sed -i -- 's/V8JS=true/V8JS=false/g' .env
+          sed -i -- 's/V8JS=true/V8JS=false/g' .env
-        docker-compose build ${{ matrix.service }}
+          sed -i -- 's/AUDIOWAVEFORM=true/AUDIOWAVEFORM=false/g' .env
-        docker-compose up -d --no-deps -- ${{ matrix.service }}
+          docker-compose build ${{ matrix.service }}
-        docker-compose exec -T -- ${{ matrix.service }} php -m
+          docker-compose up -d --no-deps -- ${{ matrix.service }}
-        docker-compose down
+          docker-compose exec -T -- ${{ matrix.service }} php -m
+          docker-compose down
 
   build-other:
     # Don't trigger on schedule event when in a fork
@@ -50,12 +51,37 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        service: ['nginx', 'redis', 'mysql', 'mariadb', 'percona', 'minio', 'mongo']
+        service: [ 'nginx', 'redis', 'mysql', 'mariadb', 'percona', 'minio', 'mongo' ]
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
-    - name: Build the Docker image
+      - name: Build the Docker image
-      run: |
+        run: |
-        cp .env.example .env
+          cp .env.example .env
-        sed -i -- 's/=false/=true/g' .env
+          sed -i -- 's/=false/=true/g' .env
-        sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
+          sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
-        docker-compose build ${{ matrix.service }}
+          docker-compose build ${{ matrix.service }}
+
+  build-deploy-docs:
+    runs-on: ubuntu-20.04
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+    defaults:
+      run:
+        working-directory: ./DOCUMENTATION
+    steps:
+      - name: Checkout Source Code
+        uses: actions/checkout@v2
+
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@v2.1.0
+        with:
+          hugo-version: '0.20.2'
+
+      - name: Build Hugo Site
+        run: hugo --minify
+
+      - name: Deploy Hugo Site to Guthub Pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_branch: gh-pages

DOCUMENTATION/content/introduction/index.md

@@ -417,6 +417,9 @@ Sponsoring is an act of giving in a different fashion. 🌱
 
 <p align="center">
 
+<a href="https://veepn.com/vpn-apps/vpn-for-chrome/"  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/VeePN.png"                height="65px"    alt="VeePN Chrome extension"></a>
+
+
 <a href="https://opencollective.com/laradock/tiers/silver-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/0/avatar.svg?button=false&isActive=true" height="65px"></a>
 <a href="https://opencollective.com/laradock/tiers/silver-sponsors/1/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/1/avatar.svg?button=false&isActive=true" height="65px"></a>
 <a href="https://opencollective.com/laradock/tiers/silver-sponsors/2/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/2/avatar.svg?button=false&isActive=true" height="65px"></a>

README.md

@@ -224,6 +224,9 @@ Sponsoring is an act of giving in a different fashion. 🌱
 
 <p align="center">
 
+<a href="https://veepn.com/vpn-apps/vpn-for-chrome/"  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/VeePN.png"                height="65px"    alt="VeePN Chrome extension"></a>
+
+
 <a href="https://opencollective.com/laradock/tiers/silver-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/0/avatar.svg?button=false&isActive=true" height="65px"></a>
 <a href="https://opencollective.com/laradock/tiers/silver-sponsors/1/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/1/avatar.svg?button=false&isActive=true" height="65px"></a>
 <a href="https://opencollective.com/laradock/tiers/silver-sponsors/2/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/2/avatar.svg?button=false&isActive=true" height="65px"></a>