From 1dd6315073651858096abf6eed3d9ca37f715680 Mon Sep 17 00:00:00 2001
From: Millyn <millyn@qq.com>
Date: Fri, 6 Mar 2020 14:52:48 +0800
Subject: [PATCH] fix php7.4 issue , and add docker

---
 application/common.php  |  2 +-
 docker/README.md        | 23 ++++++++++++++++++++++
 docker/php72/Dockerfile | 41 ++++++++++++++++++++++++++++++++++++++++
 docker/php74/Dockerfile | 42 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 docker/README.md
 create mode 100644 docker/php72/Dockerfile
 create mode 100644 docker/php74/Dockerfile

diff --git a/application/common.php b/application/common.php
index e44c04c..e9dbadb 100644
--- a/application/common.php
+++ b/application/common.php
@@ -87,7 +87,7 @@ function setCurrentOrganization($data)
 function p($data, $force = false, $file = null)
 {
     is_null($file) && $file = env('runtime_path') . date('Ymd') . '.txt';
-    $str = (is_string($data) ? $data : (is_array($data) || is_object($data)) ? print_r($data, true) : var_export($data, true)) . PHP_EOL;
+    $str = (is_string($data) ? $data : ((is_array($data) || is_object($data)) ? print_r($data, true) : var_export($data, true))) . PHP_EOL;
     $force ? file_put_contents($file, $str) : file_put_contents($file, $str, FILE_APPEND);
 }
 
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000..e5225c9
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,23 @@
+# How to use ?
+
+You need build PearProject docker image.
+
+choise php version , and `cd` to dir.
+
+```
+# build
+docker build -t pear-docker:1.0.0 .
+
+# cd to root path
+cd ../..
+
+# attach container install composer vendor
+docker run --rm -it --mount type=bind,source="$(pwd)",target=/app pear-docker:1.0.0 /bin/bash
+composer install
+exit
+
+# run your docker
+docker run --mount type=bind,source="$(pwd)",target=/app -p 1234:8081 pear-docker:1.0.0
+```
+
+Right , now visit http://127.0.0.1:1234 
\ No newline at end of file
diff --git a/docker/php72/Dockerfile b/docker/php72/Dockerfile
new file mode 100644
index 0000000..1e93f4c
--- /dev/null
+++ b/docker/php72/Dockerfile
@@ -0,0 +1,41 @@
+FROM php:7.2-cli
+
+# change package source for aliyun
+run cp /etc/apt/sources.list /etc/apt/sources.list.bak \
+  && echo "deb http://mirrors.aliyun.com/debian buster main" > /etc/apt/sources.list \
+  && echo "deb http://mirrors.aliyun.com/debian buster-updates main" >> /etc/apt/sources.list \
+  && apt clean;
+
+# update package
+RUN apt-get update;
+
+# install php ext
+RUN apt-get install -y libzip-dev libzip4 \
+  && pecl install redis-5.2.0 \
+  && pecl install igbinary-3.1.2 \
+  && pecl install zip-1.17.2 \
+  && docker-php-ext-enable redis igbinary zip
+
+# install php ext PDO
+RUN docker-php-ext-install pdo pdo_mysql
+
+# install php gd ext
+RUN apt-get install -y libwebp-dev libjpeg-dev libpng-dev libfreetype6-dev libjpeg62-turbo-dev \
+  && docker-php-ext-configure gd --with-gd --with-webp-dir --with-jpeg-dir --with-png-dir --with-zlib-dir --with-freetype-dir \
+  && docker-php-ext-install -j$(nproc) gd
+
+# install wget
+RUN apt-get install wget -y
+
+# install composer
+RUN cd /tmp \
+  && wget https://mirrors.aliyun.com/composer/composer.phar \
+  && mv composer.phar /usr/local/bin/composer \
+  && chmod +x /usr/local/bin/composer \
+  && composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/ \
+  && composer self-update \
+  && composer clear
+
+WORKDIR /app
+
+CMD ["php", "-S", "0.0.0.0:8081"]
\ No newline at end of file
diff --git a/docker/php74/Dockerfile b/docker/php74/Dockerfile
new file mode 100644
index 0000000..d568eb6
--- /dev/null
+++ b/docker/php74/Dockerfile
@@ -0,0 +1,42 @@
+FROM php:7.4-cli
+
+
+# change package source for aliyun
+run cp /etc/apt/sources.list /etc/apt/sources.list.bak \
+  && echo "deb http://mirrors.aliyun.com/debian buster main" > /etc/apt/sources.list \
+  && echo "deb http://mirrors.aliyun.com/debian buster-updates main" >> /etc/apt/sources.list \
+  && apt clean;
+
+# update package
+RUN apt-get update;
+
+# install php gd ext
+RUN apt-get install -y libwebp-dev libjpeg-dev libpng-dev libfreetype6-dev libjpeg62-turbo-dev\
+  && docker-php-ext-configure gd --with-freetype --with-jpeg \
+  && docker-php-ext-install -j$(nproc) gd
+
+# install php ext
+RUN apt-get install -y libzip-dev libzip4 \
+  && pecl install redis-5.2.0 \
+  && pecl install igbinary-3.1.2 \
+  && pecl install zip-1.17.2 \
+  && docker-php-ext-enable redis igbinary zip
+
+# install php ext PDO
+RUN docker-php-ext-install pdo pdo_mysql
+
+# install wget
+RUN apt-get install wget -y
+
+# install composer
+RUN cd /tmp \
+  && wget https://mirrors.aliyun.com/composer/composer.phar \
+  && mv composer.phar /usr/local/bin/composer \
+  && chmod +x /usr/local/bin/composer \
+  && composer config -g repo.packagist composer https://mirrors.aliyun.com/composer/ \
+  && composer self-update \
+  && composer clear
+
+WORKDIR /app
+
+CMD ["php", "-S", "0.0.0.0:8081"]
\ No newline at end of file