diff --git a/README.md b/README.md index f7861ef..d24679e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# DNMP 1.4 +# DNMP 1.4.2 DNMP 可以构建出基于 Docker 的 PHP 开发环境,其优势有在短时间内随意构建不同版本的相关服务、环境统一分布在不同服务器等,使开发者能够更专注于开发业务本身。 @@ -14,12 +14,12 @@ DNMP 可以构建出基于 Docker 的 PHP 开发环境,其优势有在短时 * Ningx:latest * PHP56:php-fpm 5.6.x `composer:1.8.0 swoole:1.10.5 redis:4.3.0` -* PHP74:php-fpm 7.4.x `composer:2.1.11 swoole:4.8.5 redis:5.3.5` -* PHP80:php-fpm 8.0.x `composer:2.1.11 swoole:4.8.5 redis:5.3.5` -* PHP81:php-fpm 8.1.x `composer:2.1.11 swoole:4.8.5 redis:5.3.5` +* PHP74:php-fpm 7.4.x `composer:2.1.11 swoole:4.8.7 redis:5.3.7 mongodb:1.12.1` +* PHP80:php-fpm 8.0.x `composer:2.1.11 swoole:4.8.7 redis:5.3.7 mongodb:1.12.1` +* PHP81:php-fpm 8.1.x `composer:2.1.11 swoole:4.8.7 redis:5.3.7 mongodb:1.12.1` * MySQL:5.7 * Redis:latest `默认密码:dnmp` -* Mogodb: latest `默认验证数据库:admin;账号:admin;密码:admin` +* Mogodb: latest `默认验证数据库:admin 账号:admin 密码:admin` * ~~ElasticSearch:7.1.1~~ ### 目录结构 diff --git a/build/php74/Dockerfile b/build/php74/Dockerfile index 7666296..3fe0218 100644 --- a/build/php74/Dockerfile +++ b/build/php74/Dockerfile @@ -5,9 +5,12 @@ COPY resource /home/resource ARG CHANGE_SOURCE=true ARG TIME_ZONE=UTC -ARG SWOOLE=swoole-4.8.5.tgz -ARG REDIS=redis-5.3.5.tgz +ARG MongoDB=mongodb-1.12.1.tgz +ARG OPEN_SWOOLE=openswoole-4.10.0.tgz +ARG SWOOLE=swoole-4.8.7.tgz +ARG REDIS=redis-5.3.7.tgz ARG MCRYPT=mcrypt-1.0.4.tgz +ARG XDEBUG=xdebug-3.1.3.tgz ENV TIME_ZONE=${TIME_ZONE} LC_ALL=C.UTF-8 @@ -88,11 +91,16 @@ RUN docker-php-ext-configure gd \ pecl install imagick && docker-php-ext-enable imagick; \ \ # ⬇ MongoDB - pecl install mongodb && docker-php-ext-enable mongodb; \ + pecl install /home/resource/$MongoDB ; \ + echo "extension=mongodb.so" > /usr/local/etc/php/conf.d/mongodb.ini ; \ \ # ⬇ Redis pecl install /home/resource/$REDIS ; \ echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini ; \ + # \ + # # ⬇ Open Swoole + # pecl install /home/resource/$OPEN_SWOOLE ; \ + # echo "extension=openswoole.so" > /usr/local/etc/php/conf.d/openswoole.ini ; \ \ # ⬇ Swoole pecl install /home/resource/$SWOOLE ; \ diff --git a/build/php74/resource/mongodb-1.12.1.tgz b/build/php74/resource/mongodb-1.12.1.tgz new file mode 100644 index 0000000..cc7434f Binary files /dev/null and b/build/php74/resource/mongodb-1.12.1.tgz differ diff --git a/build/php74/resource/openswoole-4.10.0.tgz b/build/php74/resource/openswoole-4.10.0.tgz new file mode 100644 index 0000000..20b1d6b Binary files /dev/null and b/build/php74/resource/openswoole-4.10.0.tgz differ diff --git a/build/php74/resource/redis-5.3.5.tgz b/build/php74/resource/redis-5.3.5.tgz deleted file mode 100644 index f3bfc2a..0000000 Binary files a/build/php74/resource/redis-5.3.5.tgz and /dev/null differ diff --git a/build/php74/resource/redis-5.3.7.tgz b/build/php74/resource/redis-5.3.7.tgz new file mode 100644 index 0000000..db2187b Binary files /dev/null and b/build/php74/resource/redis-5.3.7.tgz differ diff --git a/build/php74/resource/swoole-4.8.5.tgz b/build/php74/resource/swoole-4.8.5.tgz deleted file mode 100644 index 1b063cd..0000000 Binary files a/build/php74/resource/swoole-4.8.5.tgz and /dev/null differ diff --git a/build/php74/resource/swoole-4.8.7.tgz b/build/php74/resource/swoole-4.8.7.tgz new file mode 100644 index 0000000..86d40ba Binary files /dev/null and b/build/php74/resource/swoole-4.8.7.tgz differ diff --git a/build/php74/resource/xdebug-3.1.2.tgz b/build/php74/resource/xdebug-3.1.2.tgz deleted file mode 100644 index 3b888d4..0000000 Binary files a/build/php74/resource/xdebug-3.1.2.tgz and /dev/null differ diff --git a/build/php74/resource/xdebug-3.1.3.tgz b/build/php74/resource/xdebug-3.1.3.tgz new file mode 100644 index 0000000..f2e139b Binary files /dev/null and b/build/php74/resource/xdebug-3.1.3.tgz differ diff --git a/build/php80/Dockerfile b/build/php80/Dockerfile index 16ef622..49663d6 100644 --- a/build/php80/Dockerfile +++ b/build/php80/Dockerfile @@ -5,9 +5,12 @@ COPY resource /home/resource ARG CHANGE_SOURCE=true ARG TIME_ZONE=UTC -ARG SWOOLE=swoole-4.8.5.tgz -ARG REDIS=redis-5.3.5.tgz +ARG MongoDB=mongodb-1.12.1.tgz +ARG OPEN_SWOOLE=openswoole-4.10.0.tgz +ARG SWOOLE=swoole-4.8.7.tgz +ARG REDIS=redis-5.3.7.tgz ARG MCRYPT=mcrypt-1.0.4.tgz +ARG XDEBUG=xdebug-3.1.3.tgz ENV TIME_ZONE=${TIME_ZONE} LC_ALL=C.UTF-8 @@ -88,11 +91,16 @@ RUN docker-php-ext-configure gd \ pecl install imagick && docker-php-ext-enable imagick; \ \ # ⬇ MongoDB - pecl install mongodb && docker-php-ext-enable mongodb; \ + pecl install /home/resource/$MongoDB ; \ + echo "extension=mongodb.so" > /usr/local/etc/php/conf.d/mongodb.ini ; \ \ # ⬇ Redis pecl install /home/resource/$REDIS ; \ echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini ; \ + # \ + # # ⬇ Open Swoole + # pecl install /home/resource/$OPEN_SWOOLE ; \ + # echo "extension=openswoole.so" > /usr/local/etc/php/conf.d/openswoole.ini ; \ \ # ⬇ Swoole pecl install /home/resource/$SWOOLE ; \ diff --git a/build/php80/resource/mongodb-1.12.1.tgz b/build/php80/resource/mongodb-1.12.1.tgz new file mode 100644 index 0000000..cc7434f Binary files /dev/null and b/build/php80/resource/mongodb-1.12.1.tgz differ diff --git a/build/php80/resource/openswoole-4.10.0.tgz b/build/php80/resource/openswoole-4.10.0.tgz new file mode 100644 index 0000000..20b1d6b Binary files /dev/null and b/build/php80/resource/openswoole-4.10.0.tgz differ diff --git a/build/php80/resource/redis-5.3.5.tgz b/build/php80/resource/redis-5.3.5.tgz deleted file mode 100644 index f3bfc2a..0000000 Binary files a/build/php80/resource/redis-5.3.5.tgz and /dev/null differ diff --git a/build/php80/resource/redis-5.3.7.tgz b/build/php80/resource/redis-5.3.7.tgz new file mode 100644 index 0000000..db2187b Binary files /dev/null and b/build/php80/resource/redis-5.3.7.tgz differ diff --git a/build/php80/resource/swoole-4.8.5.tgz b/build/php80/resource/swoole-4.8.5.tgz deleted file mode 100644 index 1b063cd..0000000 Binary files a/build/php80/resource/swoole-4.8.5.tgz and /dev/null differ diff --git a/build/php80/resource/swoole-4.8.7.tgz b/build/php80/resource/swoole-4.8.7.tgz new file mode 100644 index 0000000..86d40ba Binary files /dev/null and b/build/php80/resource/swoole-4.8.7.tgz differ diff --git a/build/php80/resource/xdebug-3.1.2.tgz b/build/php80/resource/xdebug-3.1.2.tgz deleted file mode 100644 index 3b888d4..0000000 Binary files a/build/php80/resource/xdebug-3.1.2.tgz and /dev/null differ diff --git a/build/php80/resource/xdebug-3.1.3.tgz b/build/php80/resource/xdebug-3.1.3.tgz new file mode 100644 index 0000000..f2e139b Binary files /dev/null and b/build/php80/resource/xdebug-3.1.3.tgz differ diff --git a/build/php81/Dockerfile b/build/php81/Dockerfile index 927302e..0f5bfbb 100644 --- a/build/php81/Dockerfile +++ b/build/php81/Dockerfile @@ -5,9 +5,12 @@ COPY resource /home/resource ARG CHANGE_SOURCE=true ARG TIME_ZONE=UTC -ARG SWOOLE=swoole-4.8.5.tgz -ARG REDIS=redis-5.3.5.tgz +ARG MongoDB=mongodb-1.12.1.tgz +ARG OPEN_SWOOLE=openswoole-4.10.0.tgz +ARG SWOOLE=swoole-4.8.7.tgz +ARG REDIS=redis-5.3.7.tgz ARG MCRYPT=mcrypt-1.0.4.tgz +ARG XDEBUG=xdebug-3.1.3.tgz ENV TIME_ZONE=${TIME_ZONE} LC_ALL=C.UTF-8 @@ -88,11 +91,16 @@ RUN docker-php-ext-configure gd \ pecl install imagick && docker-php-ext-enable imagick; \ \ # ⬇ MongoDB - pecl install mongodb && docker-php-ext-enable mongodb; \ + pecl install /home/resource/$MongoDB ; \ + echo "extension=mongodb.so" > /usr/local/etc/php/conf.d/mongodb.ini ; \ \ # ⬇ Redis pecl install /home/resource/$REDIS ; \ echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini ; \ + # \ + # # ⬇ Open Swoole + # pecl install /home/resource/$OPEN_SWOOLE ; \ + # echo "extension=openswoole.so" > /usr/local/etc/php/conf.d/openswoole.ini ; \ \ # ⬇ Swoole pecl install /home/resource/$SWOOLE ; \ diff --git a/build/php81/resource/mongodb-1.12.1.tgz b/build/php81/resource/mongodb-1.12.1.tgz new file mode 100644 index 0000000..cc7434f Binary files /dev/null and b/build/php81/resource/mongodb-1.12.1.tgz differ diff --git a/build/php81/resource/openswoole-4.10.0.tgz b/build/php81/resource/openswoole-4.10.0.tgz new file mode 100644 index 0000000..20b1d6b Binary files /dev/null and b/build/php81/resource/openswoole-4.10.0.tgz differ diff --git a/build/php81/resource/redis-5.3.5.tgz b/build/php81/resource/redis-5.3.5.tgz deleted file mode 100644 index f3bfc2a..0000000 Binary files a/build/php81/resource/redis-5.3.5.tgz and /dev/null differ diff --git a/build/php81/resource/redis-5.3.7.tgz b/build/php81/resource/redis-5.3.7.tgz new file mode 100644 index 0000000..db2187b Binary files /dev/null and b/build/php81/resource/redis-5.3.7.tgz differ diff --git a/build/php81/resource/swoole-4.8.5.tgz b/build/php81/resource/swoole-4.8.5.tgz deleted file mode 100644 index 1b063cd..0000000 Binary files a/build/php81/resource/swoole-4.8.5.tgz and /dev/null differ diff --git a/build/php81/resource/swoole-4.8.7.tgz b/build/php81/resource/swoole-4.8.7.tgz new file mode 100644 index 0000000..86d40ba Binary files /dev/null and b/build/php81/resource/swoole-4.8.7.tgz differ diff --git a/build/php81/resource/xdebug-3.1.2.tgz b/build/php81/resource/xdebug-3.1.2.tgz deleted file mode 100644 index 3b888d4..0000000 Binary files a/build/php81/resource/xdebug-3.1.2.tgz and /dev/null differ diff --git a/build/php81/resource/xdebug-3.1.3.tgz b/build/php81/resource/xdebug-3.1.3.tgz new file mode 100644 index 0000000..f2e139b Binary files /dev/null and b/build/php81/resource/xdebug-3.1.3.tgz differ diff --git a/www/index.php b/www/index.php index d6b28ab..b4fdba4 100755 --- a/www/index.php +++ b/www/index.php @@ -49,7 +49,7 @@

DNMP - v1.4 + v1.4.2