Merge branch 'develop' into 'master'

Develop

See merge request pub/docker!1

redis/4.0.10/Dockerfile

@@ -0,0 +1,34 @@
+FROM centos:7
+
+MAINTAINER Yang <yangyufans@qq.com>
+
+ENV REDIS_VERSION=4.0.10
+
+RUN yum install -y wget gcc make
+
+RUN cd / && wget http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz \
+ && tar -zxvf redis-$REDIS_VERSION.tar.gz \
+ && rm -rf redis-$REDIS_VERSION.tar.gz \
+ && cd /redis-$REDIS_VERSION \
+ && make MALLOC=libc \
+ && make install \
+ && cp /redis-$REDIS_VERSION/redis.conf /usr/local/bin/ \
+ && cd / \
+ && rm -rf redis-$REDIS_VERSION
+
+RUN mkdir /redis /redis/conf /redis/logs
+
+RUN sed -i 's/logfile ""/logfile "\/redis\/logs\/redis.log"/' /usr/local/bin/redis.conf && \
+    sed -i 's/bind 127.0.0.1/#bind 127.0.0.1/' /usr/local/bin/redis.conf
+
+RUN echo "ZONE=Asia/Shanghai" > /etc/sysconfig/clock && \
+    rm -rf /etc/localtime && \
+    ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+COPY start.sh /
+
+RUN chmod 777 /start.sh
+
+EXPOSE 6379
+
+ENTRYPOINT ["/start.sh"]

redis/4.0.10/start.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ ! -e /redis/conf/redis.conf ]; then
+  cp /usr/local/bin/redis.conf /redis/conf
+fi
+
+if [ -n "$PASSWORD" ]; then
+    echo "requirepass $PASSWORD" >> /redis/conf/redis.conf
+fi
+
+redis-server /redis/conf/redis.conf

redis/README.md

@@ -0,0 +1,16 @@
+# redis 搭建
+## 创建镜像
+```bash
+docker build -t redis:4.0.10 .
+```
+## 创建容器
+```bash
+docker run -d \
+    --privileged=true \
+    -p 6379:6379 \
+    -v /data/redis/conf:/redis/conf \
+    -v /data/redis/logs:/redis/logs \
+    -e PASSWORD=123456 \
+    --name redis-4.0.10 \
+    redis:4.0.10
+```

zookeeper/3.4.12/Dockerfile

@@ -0,0 +1,38 @@
+FROM centos:7
+
+MAINTAINER Yang <yangyufans@qq.com>
+
+ENV ZOOKEEPER_VERSION=3.4.12
+
+RUN yum install -y wget java-1.8.0-openjdk.x86_64
+
+RUN cd / && wget http://mirror.bit.edu.cn/apache/zookeeper/zookeeper-$ZOOKEEPER_VERSION/zookeeper-$ZOOKEEPER_VERSION.tar.gz \
+ && tar -zxvf zookeeper-$ZOOKEEPER_VERSION.tar.gz \
+ && rm -rf zookeeper-$ZOOKEEPER_VERSION.tar.gz \
+ && mv zookeeper-$ZOOKEEPER_VERSION zookeeper
+
+RUN mkdir /data /dataLogs /logs
+
+RUN echo "ZONE=Asia/Shanghai" > /etc/sysconfig/clock && \
+    rm -rf /etc/localtime && \
+    ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+RUN echo "tickTime=2000" >> /zookeeper/conf/zoo.cfg && \
+    echo "dataDir=/data" >> /zookeeper/conf/zoo.cfg && \
+    echo "dataDir=/dataLogs" >> /zookeeper/conf/zoo.cfg && \
+    echo "clientPort=2181" >> /zookeeper/conf/zoo.cfg && \
+    echo "initLimit=5" >> /zookeeper/conf/zoo.cfg && \
+    echo "syncLimit=2" >> /zookeeper/conf/zoo.cfg
+
+RUN sed -i 's/ZOO_LOG_DIR="."/ZOO_LOG_DIR="\/logs"/' /zookeeper/bin/zkEnv.sh && \
+    sed -i 's/ZOO_LOG4J_PROP="INFO,CONSOLE"/ZOO_LOG4J_PROP="INFO,ROLLINGFILE"/' /zookeeper/bin/zkEnv.sh && \
+    sed -i 's/zookeeper.root.logger=INFO, CONSOLE/zookeeper.root.logger=INFO,ROLLINGFILE/' /zookeeper/conf/log4j.properties && \
+    sed -i 's/zookeeper.log.dir=./zookeeper.log.dir=\/logs/' /zookeeper/conf/log4j.properties
+
+COPY start.sh /
+
+RUN chmod 777 /start.sh
+
+EXPOSE 2181 2888 3888
+
+ENTRYPOINT ["/start.sh"]

zookeeper/3.4.12/start.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+echo "$ZOO_MY_ID" > /data/myid
+
+if [ -n "$SERVICE_1" ]; then
+    echo "service.1=$SERVICE_1" >> /zookeeper/conf/zoo.cfg
+fi
+
+if [ -n "$SERVICE_2" ]; then
+    echo "service.1=$SERVICE_2" >> /zookeeper/conf/zoo.cfg
+fi
+
+if [ -n "$SERVICE_3" ]; then
+    echo "service.1=$SERVICE_3" >> /zookeeper/conf/zoo.cfg
+fi
+
+if [ -n "$SERVICE_4" ]; then
+    echo "service.1=$SERVICE_4" >> /zookeeper/conf/zoo.cfg
+fi
+
+if [ -n "$SERVICE_5" ]; then
+    echo "service.1=$SERVICE_5" >> /zookeeper/conf/zoo.cfg
+fi
+
+if [ -n "$SERVICE_6" ]; then
+    echo "service.1=$SERVICE_6" >> /zookeeper/conf/zoo.cfg
+fi
+
+if [ -n "$SERVICE_7" ]; then
+    echo "service.1=$SERVICE_7" >> /zookeeper/conf/zoo.cfg
+fi
+
+
+
+/zookeeper/bin/zkServer.sh start-foreground

zookeeper/README.md

@@ -0,0 +1,23 @@
+# zookeeper 集群搭建
+## 创建镜像
+进入相应版本文件夹
+```bash
+docker build -t zookeeper:3.4.12 .
+```
+## 生成容器
+```bash
+docker run -d \
+    --privileged=true \
+    -p 2181:2181 \
+    -p 2888:2888 \
+    -p 3888:3888 \
+    -v /data/zookeeper/data:/data \
+    -v /data/zookeeper/dataLogs:/dataLogs \
+    -v /data/zookeeper/logs:/logs \
+    -e ZOO_MY_ID=1 \
+    -e SERVICE_1=10.211.55.11:2888:3888 \
+    -e SERVICE_2=10.211.55.12:2888:3888 \
+    -e SERVICE_3=10.211.55.13:2888:3888 \
+    --name zookeeper \
+    zookeeper:3.4.12
+```