Merge pull request #2953 from laradock/enchant

feat(support enchant extension): php-fpm

.env.example

@@ -38,7 +38,7 @@ COMPOSE_PROJECT_NAME=laradock
 ### PHP Version ###########################################
 
 # Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
-# Accepted values: 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
+# Accepted values: 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
 PHP_VERSION=7.3
 
 ### Phalcon Version ###########################################
@@ -215,6 +215,7 @@ PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=true
 PHP_FPM_INSTALL_PHPREDIS=true
 PHP_FPM_INSTALL_MEMCACHED=false
 PHP_FPM_INSTALL_BZ2=false
+PHP_FPM_INSTALL_ENCHANT=false
 PHP_FPM_INSTALL_GMP=false
 PHP_FPM_INSTALL_GNUPG=false
 PHP_FPM_INSTALL_XDEBUG=false
@@ -288,6 +289,7 @@ PHP_WORKER_INSTALL_GNUPG=false
 PHP_WORKER_INSTALL_PGSQL=false
 PHP_WORKER_INSTALL_MONGO=false
 PHP_WORKER_INSTALL_BCMATH=false
+PHP_WORKER_INSTALL_MEMCACHED=false
 # PHP_WORKER_INSTALL_OCI8 Does not work in php5.6 version
 PHP_WORKER_INSTALL_OCI8=false
 PHP_WORKER_INSTALL_PHALCON=false

.github/workflows/main-ci.yml

@@ -10,6 +10,8 @@ on:
 
 jobs:
   build-php:
+    # Don't trigger on schedule event when in a fork
+    if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'laradock/laradock')
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -23,7 +25,7 @@ jobs:
         PHP_VERSION: ${{ matrix.php_version }}
       run: |
         set -eux
-        cp env-example .env
+        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
@@ -42,6 +44,8 @@ jobs:
         docker-compose down
 
   build-other:
+    # Don't trigger on schedule event when in a fork
+    if: github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository == 'laradock/laradock')
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -51,7 +55,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Build the Docker image
       run: |
-        cp env-example .env
+        cp .env.example .env
         sed -i -- 's/=false/=true/g' .env
         sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env
         docker-compose build ${{ matrix.service }}

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "files.associations": {
-        "env-example": "dotenv",
+        ".env.example": "dotenv",
         "Dockerfile-*": "dockerfile"
     }
 }

DOCUMENTATION/content/contributing/index.md

@@ -81,7 +81,7 @@ To update the sidebar or add a new section to it, you can edit this `DOCUMENTATI
 
 * Make sure you follow the same code/comments style.
 
-* Add the environment variables to the `env-example` if you have any.
+* Add the environment variables to the `.env.example` if you have any.
 
 * **MOST IMPORTANTLY** update the `Documentation`, add as much information.
 

DOCUMENTATION/content/getting-started/index.md

@@ -75,7 +75,7 @@ Your folder structure should look like this:
 We'll need to do step 1 of the [Usage](#Usage) section now to make this happen.
 
 ```
-cp env-example .env
+cp .env.example .env
 ```
 
 At the top, change the `APP_CODE_PATH_HOST` variable to your project path.
@@ -155,10 +155,10 @@ We recommend using a Docker version which is newer than 1.13.
 
 <br>
 
-1 - Enter the laradock folder and copy `env-example` to `.env`
+1 - Enter the laradock folder and copy `.env.example` to `.env`
 
 ```shell
-cp env-example .env
+cp .env.example .env
 ```
 
 You can edit the `.env` file to choose which software's you want to be installed in your environment. You can always refer to the `docker-compose.yml` file to see how those variables are being used.

DOCUMENTATION/content/introduction/index.md

@@ -46,10 +46,10 @@ Let's see how easy it is to setup our demo stack `PHP`, `NGINX`, `MySQL`, `Redis
 git clone https://github.com/Laradock/laradock.git
 ```
 
-2 - Enter the laradock folder and rename `env-example` to `.env`.
+2 - Enter the laradock folder and rename `.env.example` to `.env`.
 
 ```shell
-cp env-example .env
+cp .env.example .env
 ```
 
 3 - Run your containers:

README-zh.md

@@ -70,7 +70,7 @@ git clone https://github.com/laradock/laradock.git
 
 2. 进入 Laradock 目录
  ```bash
-cp env-example .env
+cp .env.example .env
 ```
 
 3. 运行这些容器。

docker-compose.yml

@@ -209,6 +209,7 @@ services:
           - LARADOCK_PHP_VERSION=${PHP_VERSION}
           - LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
           - INSTALL_BZ2=${PHP_FPM_INSTALL_BZ2}
+          - INSTALL_ENCHANT=${PHP_FPM_INSTALL_ENCHANT}
           - INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
           - INSTALL_GNUPG=${PHP_FPM_INSTALL_GNUPG}
           - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
@@ -318,6 +319,7 @@ services:
           - INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL}
           - INSTALL_MONGO=${PHP_WORKER_INSTALL_MONGO}
           - INSTALL_BCMATH=${PHP_WORKER_INSTALL_BCMATH}
+          - INSTALL_MEMCACHED=${PHP_WORKER_INSTALL_MEMCACHED}
           - INSTALL_OCI8=${PHP_WORKER_INSTALL_OCI8}
           - INSTALL_PHALCON=${PHP_WORKER_INSTALL_PHALCON}
           - INSTALL_SOAP=${PHP_WORKER_INSTALL_SOAP}

laravel-horizon/Dockerfile

@@ -23,7 +23,6 @@ RUN apk --update add wget \
   curl \
   git \
   build-base \
-  libmemcached-dev \
   libmcrypt-dev \
   libxml2-dev \
   pcre-dev \
@@ -40,13 +39,6 @@ RUN apk --update add wget \
 RUN pecl channel-update pecl.php.net; \
     docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl
 
-RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
-      pecl install memcached-2.2.0 mcrypt-1.0.1; \
-    else \
-      pecl install memcached mcrypt-1.0.1; \
-    fi; \
-    docker-php-ext-enable memcached
-
 # Add a non-root user to help install ffmpeg:
 ARG PUID=1000
 ENV PUID ${PUID}
@@ -270,25 +262,20 @@ RUN if [ ${INSTALL_YAML} = true ]; then \
 ARG INSTALL_MEMCACHED=false
 
 RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
+  apk --update add libmemcached-dev; \
   # Install the php memcached extension
   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"; \
+    pecl install memcached-2.2.0; \
   else \
-  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 \
-  && ( \
-  cd memcached \
-  && phpize \
-  && ./configure \
-  && make -j$(nproc) \
-  && make install \
-  ) \
-  && rm -r memcached \
-  && rm /tmp/memcached.tar.gz \
-  && docker-php-ext-enable memcached \
-  ;fi
+    pecl install memcached; \
+  fi; \
+  docker-php-ext-enable memcached; \
+  php -m | grep -r 'memcached'; \
+fi
+
+#--------------------------------------------------------------------------
+# Clean up
+#--------------------------------------------------------------------------
 
 RUN rm /var/cache/apk/* \
   && mkdir -p /var/www

php-fpm/Dockerfile

@@ -83,6 +83,17 @@ RUN if [ ${INSTALL_BZ2} = true ]; then \
   docker-php-ext-install bz2 \
 ;fi
 
+###########################################################################
+# Enchant:
+###########################################################################
+
+ARG INSTALL_ENCHANT=false
+RUN if [ ${INSTALL_ENCHANT} = true ]; then \
+  apt-get install -yqq libenchant-dev; \
+  docker-php-ext-install enchant; \
+  php -m | grep -oiE '^enchant$'; \
+fi
+
 ###########################################################################
 # GMP (GNU Multiple Precision):
 ###########################################################################

php-worker/Dockerfile

@@ -23,7 +23,6 @@ RUN apk --update add wget \
   curl \
   git \
   build-base \
-  libmemcached-dev \
   libmcrypt-dev \
   libxml2-dev \
   pcre-dev \
@@ -40,13 +39,6 @@ RUN apk --update add wget \
 RUN pecl channel-update pecl.php.net; \
     docker-php-ext-install mysqli mbstring pdo pdo_mysql tokenizer xml pcntl
 
-RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
-      pecl install memcached-2.2.0 mcrypt-1.0.1; \
-    else \
-      pecl install memcached mcrypt-1.0.1; \
-    fi; \
-    docker-php-ext-enable memcached
-
 # Add a non-root user:
 ARG PUID=1000
 ENV PUID ${PUID}
@@ -404,6 +396,24 @@ RUN if [ ${INSTALL_XMLRPC} = true ]; then \
       php -m | grep -r 'xmlrpc'; \
     fi
 
+###########################################################################
+# PHP Memcached:
+###########################################################################
+
+ARG INSTALL_MEMCACHED=false
+
+RUN if [ ${INSTALL_MEMCACHED} = true ]; then \
+  apk --update add libmemcached-dev; \
+  # Install the php memcached extension
+  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
+    pecl install memcached-2.2.0; \
+  else \
+    pecl install memcached; \
+  fi; \
+  docker-php-ext-enable memcached; \
+  php -m | grep -r 'memcached'; \
+fi
+
 #
 #--------------------------------------------------------------------------
 # Optional Supervisord Configuration

travis-build.sh

@@ -11,7 +11,7 @@ env | sort
 
 #### Build the Docker Images
 if [ -n "${PHP_VERSION}" ]; then
-    cp env-example .env
+    cp .env.example .env
     sed -i -- "s/PHP_VERSION=.*/PHP_VERSION=${PHP_VERSION}/g" .env
     sed -i -- 's/=false/=true/g' .env
     sed -i -- 's/CHANGE_SOURCE=true/CHANGE_SOURCE=false/g' .env