initial 2.0.0-b2 commit

This commit is contained in:
jerry 2020-11-08 20:14:08 +08:00
parent 3b90bf6245
commit 7fe405d0af
4 changed files with 21 additions and 23 deletions

View File

@ -8,16 +8,15 @@ ENV LANGUAGE C.UTF-8
RUN apt-get update && apt-get install -y software-properties-common tzdata RUN apt-get update && apt-get install -y software-properties-common tzdata
RUN dpkg-reconfigure -f noninteractive tzdata RUN dpkg-reconfigure -f noninteractive tzdata
VOLUME ["/app/zhamao-framework/"] VOLUME ["/app/zhamao-framework/"]
RUN add-apt-repository ppa:ondrej/php && \ RUN add-apt-repository ppa:ondrej/php &&
apt-get update && \ apt-get update && \
apt-get install php php-dev php-mbstring gcc make openssl \ apt-get install php php-dev php-mbstring gcc make openssl php-mbstring php-json php-curl php-mysql -y && \
php-mbstring php-json php-curl php-mysql -y && \ apt-get install wget composer -y && \
apt-get install wget composer -y && \ wget https://github.com/swoole/swoole-src/archive/v4.5.0.tar.gz && \
wget https://github.com/swoole/swoole-src/archive/v4.5.0.tar.gz && \ tar -zxvf v4.5.0.tar.gz && \
tar -zxvf v4.5.0.tar.gz && \ cd swoole-src-4.5.0/ && \
cd swoole-src-4.5.0/ && \ phpize && ./configure --enable-openssl --enable-mysqlnd && make -j2 && make install && \
phpize && ./configure --enable-openssl --enable-mysqlnd && make -j2 && make install && \ (echo "extension=swoole.so" >> $(php -i | grep "Loaded Configuration File" | awk '{print $5}'))
(echo "extension=swoole.so" >> $(php -i | grep "Loaded Configuration File" | awk '{print $5}'))
ADD . /app/zhamao-framework ADD . /app/zhamao-framework

View File

@ -19,7 +19,7 @@
**2.0 版本开发完毕后,会发布测试版和并入 master 分支,敬请关注。** **2.0 版本开发完毕后,会发布测试版和并入 master 分支,敬请关注。**
[![dev-version2](https://img.shields.io/badge/process-30%25-green)]() [![dev-version2](https://img.shields.io/badge/process-95%25-green)]()

View File

@ -29,10 +29,10 @@
"psy/psysh": "@stable", "psy/psysh": "@stable",
"symfony/console": "^5.1", "symfony/console": "^5.1",
"symfony/polyfill-ctype": "^1.18", "symfony/polyfill-ctype": "^1.18",
"zhamao/connection-manager": "^1.0", "zhamao/connection-manager": "*@dev",
"zhamao/console": "*@dev", "zhamao/console": "*@dev",
"zhamao/config": "^1.0", "zhamao/config": "*@dev",
"zhamao/request": "^1.0", "zhamao/request": "*@dev",
"symfony/routing": "^5.1" "symfony/routing": "^5.1"
}, },
"suggest": { "suggest": {

View File

@ -2,15 +2,14 @@ FROM richardchien/cqhttp:latest
RUN apt-get update && apt-get install -y software-properties-common tzdata RUN apt-get update && apt-get install -y software-properties-common tzdata
RUN dpkg-reconfigure -f noninteractive tzdata RUN dpkg-reconfigure -f noninteractive tzdata
RUN add-apt-repository ppa:ondrej/php && \ RUN add-apt-repository ppa:ondrej/php && \
apt-get update && \ apt-get update && \
apt-get install php php-dev php-mbstring gcc make openssl \ apt-get install php php-dev php-mbstring gcc make openssl php-mbstring php-json php-curl php-mysql -y && \
php-mbstring php-json php-curl php-mysql -y && \ apt-get install wget composer -y && \
apt-get install wget composer -y && \ wget https://github.com/swoole/swoole-src/archive/v4.5.0.tar.gz && \
wget https://github.com/swoole/swoole-src/archive/v4.5.0.tar.gz && \ tar -zxvf v4.5.0.tar.gz && \
tar -zxvf v4.5.0.tar.gz && \ cd swoole-src-4.5.0/ && \
cd swoole-src-4.5.0/ && \ phpize && ./configure --enable-openssl --enable-mysqlnd && make -j2 && make install && \
phpize && ./configure --enable-openssl --enable-mysqlnd && make -j2 && make install && \ (echo "extension=swoole.so" >> $(php -i | grep "Loaded Configuration File" | awk '{print $5}'))
(echo "extension=swoole.so" >> $(php -i | grep "Loaded Configuration File" | awk '{print $5}'))
ADD start.sh /home/user/start.sh ADD start.sh /home/user/start.sh
RUN chown user:user /home/user/start.sh && chmod +x /home/user/start.sh RUN chown user:user /home/user/start.sh && chmod +x /home/user/start.sh
ADD https://github.com/zhamao-robot/zhamao-framework/archive/master.zip /home/user/master.zip ADD https://github.com/zhamao-robot/zhamao-framework/archive/master.zip /home/user/master.zip