Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
d1c4e28
a
xiaobopang Dec 25, 2017
03c5c85
a
xiaobopang Dec 26, 2017
5af9753
a
xiaobopang Dec 27, 2017
713d944
a
xiaobopang Dec 27, 2017
924fde7
Update docker-compose.yml
Dec 27, 2017
74c9f16
a
xiaobopang Dec 27, 2017
8c65709
a
xiaobopang Dec 27, 2017
5763288
a
xiaobopang Dec 27, 2017
c8029df
test
xiaobopang Dec 27, 2017
85e9e9a
a
xiaobopang Dec 27, 2017
3bfba10
a
xiaobopang Dec 27, 2017
9f75848
a
xiaobopang Dec 27, 2017
df47ae6
a
xiaobopang Dec 27, 2017
3fc6b76
a
xiaobopang Dec 27, 2017
87d67df
a
xiaobopang Dec 27, 2017
6ce9515
a
xiaobopang Dec 28, 2017
a199ca9
a
xiaobopang Dec 28, 2017
02dc48c
a
xiaobopang Jan 23, 2018
d6d63ea
a
xiaobopang Jan 23, 2018
f593cfc
a
xiaobopang Jan 23, 2018
05ad16c
666
xiaobopang Jan 23, 2018
8c5b737
a
xiaobopang Jan 23, 2018
538b1a0
a
xiaobopang Jan 23, 2018
7eabe64
a
xiaobopang Jan 23, 2018
6064483
a
xiaobopang Jan 23, 2018
b6e730b
a
xiaobopang Jan 23, 2018
db0272c
a
xiaobopang Jan 23, 2018
4518f73
a
xiaobopang Jan 23, 2018
f626eb9
a
xiaobopang Jan 23, 2018
8cafa36
a
xiaobopang Jan 23, 2018
ed7ee25
a
xiaobopang Jan 23, 2018
81b0781
a
xiaobopang Jan 23, 2018
4f7accc
a
xiaobopang Jan 24, 2018
7c3dbca
modified Dockerfile.
xiaobopang Jan 24, 2018
1d5012e
a
xiaobopang Jan 24, 2018
07f40fa
a
xiaobopang Jan 24, 2018
c8cc3de
add some files for php-ext
xiaobopang Jan 24, 2018
1c794d7
add some files for php-ext
xiaobopang Jan 24, 2018
ce4538d
add some files for php-ext
xiaobopang Jan 24, 2018
5f0f755
add some files for php-ext
xiaobopang Jan 25, 2018
0471d39
add nginx docker
xiaobopang Feb 6, 2018
39ea468
add nginx docker
xiaobopang Feb 6, 2018
4d412ec
add nginx docker
xiaobopang Feb 6, 2018
ab236c6
add nginx docker
xiaobopang Feb 6, 2018
dd59964
add nginx docker
xiaobopang Feb 6, 2018
e94eb8a
add nginx docker
xiaobopang Feb 6, 2018
463f47c
add nginx docker
xiaobopang Feb 6, 2018
9a9bda7
add nginx docker
xiaobopang Feb 6, 2018
60c637c
add nginx docker
xiaobopang Feb 6, 2018
e8d7310
add nginx docker
xiaobopang Feb 6, 2018
0f3bcfa
add nginx docker
xiaobopang Feb 6, 2018
af50084
add nginx docker
xiaobopang Feb 7, 2018
59e324b
add nginx docker
xiaobopang Feb 7, 2018
70f5307
add nginx docker
xiaobopang Feb 7, 2018
e915e2b
add nginx docker
xiaobopang Feb 7, 2018
e24198d
add nginx docker
xiaobopang Feb 7, 2018
5297e5a
add nginx docker
xiaobopang Feb 7, 2018
e0f1c3d
add nginx docker
xiaobopang Feb 7, 2018
049784e
add nginx docker
xiaobopang Feb 7, 2018
98274f2
add nginx docker
xiaobopang Feb 7, 2018
a71d2c4
add nginx docker
xiaobopang Feb 7, 2018
9cbae86
add nginx docker
xiaobopang Feb 7, 2018
761a9a2
add nginx docker
xiaobopang Feb 7, 2018
1b73d6c
add nginx docker
xiaobopang Feb 7, 2018
8b29618
a
xiaobopang Feb 8, 2018
9bd3de7
a
xiaobopang Feb 8, 2018
77d170d
a
xiaobopang Feb 22, 2018
c02b58d
6
xiaobopang Feb 22, 2018
e0c3b54
a
xiaobopang Feb 22, 2018
8b64b8b
a
xiaobopang Feb 22, 2018
9760123
a
xiaobopang Feb 22, 2018
6d3ac32
a
xiaobopang Feb 22, 2018
cdbfd70
a
xiaobopang Feb 22, 2018
c6b250d
a
xiaobopang Feb 22, 2018
9eea017
a
xiaobopang Feb 22, 2018
8bda6e7
a
xiaobopang Feb 22, 2018
24bc63f
a
xiaobopang Feb 22, 2018
c6deb5e
a
xiaobopang Feb 22, 2018
c87e95f
a
xiaobopang Feb 22, 2018
8d98927
a
xiaobopang Feb 22, 2018
9c5311c
a
xiaobopang Apr 1, 2018
d4ddd88
swoole 1.10.3
xiaobopang Apr 3, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions DEV/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# sd-swoole
FROM php:7.1-cli
MAINTAINER Jincheng Zhang 896369042@qq.com
MAINTAINER peterpang 10846295@qq.com
# 构建swoole环境,在这里安装了php,swoole,composer
COPY sshd_config /etc/ssh/
RUN apt-get update && apt-get install -y \
Expand All @@ -15,17 +15,17 @@ RUN apt-get update && apt-get install -y \
subversion \
supervisor \
--no-install-recommends \
&& docker-php-ext-install zip opcache bcmath pdo_mysql \
&& docker-php-ext-install zip opcache bcmath pdo_mysql mysqli \
&& cd /home && rm -rf temp && mkdir temp && cd temp \
&& wget https://github.com/swoole/swoole-src/archive/v1.9.19.tar.gz \
&& wget https://github.com/swoole/swoole-src/archive/v1.10.3.tar.gz \
https://github.com/redis/hiredis/archive/v0.13.3.tar.gz \
https://github.com/phpredis/phpredis/archive/3.1.3.tar.gz \
&& tar -xzvf 3.1.3.tar.gz \
&& tar -xzvf v0.13.3.tar.gz \
&& tar -xzvf v1.9.19.tar.gz \
&& tar -xzvf v1.10.3.tar.gz \
&& cd /home/temp/hiredis-0.13.3 \
&& make -j && make install && ldconfig \
&& cd /home/temp/swoole-src-1.9.19 \
&& cd /home/temp/swoole-src-1.10.3 \
&& phpize && ./configure --enable-async-redis --enable-openssl && make \
&& make install \
&& pecl install inotify \
Expand All @@ -50,9 +50,9 @@ RUN apt-get update && apt-get install -y \
&& apt-get autoclean \
&& apt-get autoremove \
&& rm -rf /var/lib/apt/lists/* \
#添加ssh用户
#添加ssh用户
&& useradd admin \
&& echo 'root:123' | chpasswd \
&& echo 'root:123456' | chpasswd \
&& /etc/init.d/ssh restart

COPY ./config/* /usr/local/etc/php/conf.d/
Expand Down
76 changes: 27 additions & 49 deletions DEV/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ services:
container_name: mysql
image: mysql:5.7
environment:
MYSQL_ROOT_PASSWORD: "root"
MYSQL_USER: "youwo"
MYSQL_PASSWORD: "123456"
MYSQL_DATABASE: "youwo_dliao"
MYSQL_ROOT_PASSWORD: "ecube123"
MYSQL_USER: "root"
MYSQL_PASSWORD: "ecube123"
MYSQL_DATABASE: "one"
volumes:
- /home/docker/mysql:/var/lib/mysql
ports:
Expand All @@ -23,81 +23,59 @@ services:
ports:
- "16379:6379"

# SD框架阿里云内网registry-internal.cn-hangzhou.aliyuncs.com/youwoxing/dev
ojl:
container_name: ojl
image: registry.cn-hangzhou.aliyuncs.com/youwoxing/dev
# SD框架阿里云内网 registry.cn-hangzhou.aliyuncs.com/peterpang/dev
peter:
container_name: peter
image: registry-internal.cn-hangzhou.aliyuncs.com/peterpang/dev
links:
- mysql
- redis
volumes:
- /home/docker_user/ojl:/home
ports:
- /home/docker_user/peter:/home
ports:
- "10181:8081"
- "10183:8083"
- "10193:9093"
- "10122:22"

zch:
container_name: zch
image: registry.cn-hangzhou.aliyuncs.com/youwoxing/dev
ljj:
container_name: ljj
image: registry-internal.cn-hangzhou.aliyuncs.com/peterpang/dev
links:
- mysql
- redis
volumes:
- /home/docker_user/zch:/home
- /home/docker_user/ljj:/home
ports:
- "10281:8081"
- "10283:8083"
- "10293:9093"
- "10222:22"

ln:
container_name: ln
image: registry.cn-hangzhou.aliyuncs.com/youwoxing/dev
hy:
container_name: hy
image: registry-internal.cn-hangzhou.aliyuncs.com/peterpang/dev
links:
- mysql
- redis
volumes:
- /home/docker_user/ln:/home
- /home/docker_user/hy:/home
ports:
- "10381:8081"
- "10383:8083"
- "10393:9093"
- "10322:22"

dwx:
container_name: dwx
image: registry.cn-hangzhou.aliyuncs.com/youwoxing/dev
jm:
container_name: jm
image: registry-internal.cn-hangzhou.aliyuncs.com/peterpang/dev
links:
- mysql
- redis
volumes:
- /home/docker_user/dwx:/home
- /home/docker_user/jm:/home
ports:
- "10481:8081"
- "10483:8083"
- "10493:9093"
- "10422:22"

lc:
container_name: lc
image: registry.cn-hangzhou.aliyuncs.com/youwoxing/dev
links:
- mysql
- redis
volumes:
- /home/docker_user/lc:/home
ports:
- "10583:8083"
- "10593:9093"
- "10522:22"

jxy:
container_name: jxy
image: registry.cn-hangzhou.aliyuncs.com/youwoxing/dev
links:
- mysql
- redis
volumes:
- /home/docker_user/jxy:/home
ports:
- "10683:8083"
- "10693:9093"
- "10622:22"
68 changes: 68 additions & 0 deletions NODE/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
FROM alpine:3.6

ENV NODE_VERSION 9.5.0

RUN addgroup -g 1000 node \
&& adduser -u 1000 -G node -s /bin/sh -D node \
&& apk add --no-cache \
libstdc++ \
&& apk add --no-cache --virtual .build-deps \
binutils-gold \
curl \
g++ \
gcc \
gnupg \
libgcc \
linux-headers \
make \
python \
# gpg keys listed at https://github.com/nodejs/node#release-team
&& for key in \
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
FD3A5288F042B6850C66B31F09FE44734EB7990E \
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
56730D5401028683275BD23C23EFEFE93C4CFFFE \
77984A986EBC2AA786BC0F66B01FBB92821C587A \
; do \
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
done \
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION.tar.xz" \
&& curl -SLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
&& gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
&& grep " node-v$NODE_VERSION.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
&& tar -xf "node-v$NODE_VERSION.tar.xz" \
&& cd "node-v$NODE_VERSION" \
&& ./configure \
&& make -j$(getconf _NPROCESSORS_ONLN) \
&& make install \
&& apk del .build-deps \
&& cd .. \
&& rm -Rf "node-v$NODE_VERSION" \
&& rm "node-v$NODE_VERSION.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt

ENV YARN_VERSION 1.3.2

RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
&& for key in \
6A010C5166006599AA17F08146C2130DFD2497F5 \
; do \
gpg --keyserver pgp.mit.edu --recv-keys "$key" || \
gpg --keyserver keyserver.pgp.com --recv-keys "$key" || \
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
done \
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
&& curl -fSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
&& mkdir -p /opt/yarn \
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/yarn --strip-components=1 \
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
&& apk del .build-deps-yarn

CMD [ "node" ]
4 changes: 2 additions & 2 deletions SD/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# sd-swoole
FROM registry.cn-hangzhou.aliyuncs.com/youwoxing/swoole
MAINTAINER Jincheng Zhang 896369042@qq.com
FROM registry.cn-hangzhou.aliyuncs.com/youwoxing/sd
MAINTAINER peterpang 10846295@qq.com
RUN mkdir /apps
COPY composer.json /apps/composer.json
# 安装SD框架
Expand Down
2 changes: 1 addition & 1 deletion SD/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"tmtbe/swooledistributed":">=2.5.0"
"tmtbe/swooledistributed":">=2.7.3"
},
"autoload": {
"psr-4": {
Expand Down
1 change: 1 addition & 0 deletions docker-lemp
Submodule docker-lemp added at 6148b5
15 changes: 15 additions & 0 deletions nginx-php7/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
services:
- docker

env:
global:
- COMMIT=${TRAVIS_COMMIT::8}
- REPO=trafex/alpine-nginx-php7

script:
- docker --version
- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi`
- docker login -u $DOCKER_USER -p $DOCKER_PASS
- docker build -t $REPO:$COMMIT .
- docker tag $REPO:$COMMIT $REPO:$TAG
- docker push $REPO
43 changes: 43 additions & 0 deletions nginx-php7/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
FROM ubuntu:16.04

MAINTAINER peterpang [email protected]
# 构建swoole环境,在这里安装了php,swoole,composer
COPY sshd_config /etc/ssh/

ENV DEBIAN_FRONTEND noninteractive

## Install php nginx mysql supervisor
RUN apt update && \
apt install -y php7.0-fpm php7.0-mysql php7.0-gd php7.0-mcrypt php7.0-mysql php7.0-curl \
php7.0-phalcon \
nginx \
curl \
zlib1g-dev \
vim \
libssl-dev \
unzip \
wget \
git \
make \
openssh-server \
subversion \
supervisor \
--no-install-recommends \
#添加ssh用户
&& useradd admin \
&& echo 'root:123456' | chpasswd \
&& /etc/init.d/ssh restart

## Configuration
RUN sed -i 's/^listen\s*=.*$/listen = 127.0.0.1:9000/' /etc/php/7.0/fpm/pool.d/www.conf && \
sed -i 's/^\;error_log\s*=\s*syslog\s*$/error_log = \/var\/log\/php\/cgi.log/' /etc/php/7.0/fpm/php.ini && \
sed -i 's/^\;error_log\s*=\s*syslog\s*$/error_log = \/var\/log\/php\/cli.log/' /etc/php/7.0/cli/php.ini && \
COPY files/root /

WORKDIR /var/www/

VOLUME ["/var/www/"]

EXPOSE 80

ENTRYPOINT ["/entrypoint.sh", "/usr/sbin/sshd","-D"]
38 changes: 38 additions & 0 deletions nginx-php7/config/fpm-pool.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[global]
; Log to stderr
error_log = /dev/stderr

[www]
; Enable status page
pm.status_path = /fpm-status

; Ondemand process manager
pm = ondemand

; The number of child processes to be created when pm is set to 'static' and the
; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
; This value sets the limit on the number of simultaneous requests that will be
; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
; CGI. The below defaults are based on a server without much resources. Don't
; forget to tweak pm.* to fit your needs.
; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
; Note: This value is mandatory.
pm.max_children = 50

; The number of seconds after which an idle process will be killed.
; Note: Used only when pm is set to 'ondemand'
; Default Value: 10s
pm.process_idle_timeout = 10s;

; The number of requests each child process should execute before respawning.
; This can be useful to work around memory leaks in 3rd party libraries. For
; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
; Default Value: 0
pm.max_requests = 500

; Make sure the FPM workers can reach the environment variables for configuration
clear_env = no

; Catch output from PHP
catch_workers_output = yes
Loading