Merge branch '4' into 'master'

添加*-admin容器

Closes #4

See merge request !4

config-server/Dockerfile

@@ -9,3 +9,5 @@ ADD --chown=jboss:jboss https://pilipa-assets.oss-cn-beijing.aliyuncs.com/soft/c
 ENV ENCRYPT_KEY_STORE_PASSWORD=letmein
 ENV ENCRYPT_KEY_STORE_ALIAS=configserver
 ENV ENCRYPT_KEY_STORE_SECRET=changeme
+ENV JAVA_OPTIONS="-server -XX:-HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/pilipa/ -Duser.timezone=Asia/Hong_Kong"
+ENV spring.rabbitmq.addresses=rabbit:5672

docker-admin/Dockerfile

+# https://github.com/portainer/portainer
+# https://hub.docker.com/r/portainer/portainer
+FROM portainer/portainer
+
+EXPOSE 9000
+
+# https://portainer.readthedocs.io/en/stable/configuration.html 
+ENTRYPOINT [ "/portainer","--no-auth" ]
\ No newline at end of file

docker-api/Dockerfile

+FROM alpine:3.9
+
+RUN apk add socat --no-cache
+
+CMD ["TCP-LISTEN:2375,fork,reuseaddr","UNIX-CONNECT:/var/run/docker.sock"]
+
+EXPOSE 2375
+
+ENTRYPOINT ["socat"]
\ No newline at end of file

docker-compose.yml

 version: "3.3"
+
 services:
+
   eureka-server:
-    build: ./eureka-server
-    restart: on-failure
+    build: ./eureka-server/
+    restart: always
     depends_on:
       - config-server
     ports:
       - "8761:8761"
       - "8762:8762"
-    environment:
-      - JAVA_OPTIONS=-server -XX:-HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/pilipa/ -Duser.timezone=Asia/Hong_Kong
-      - CONFIG_SERVER_URL=http://config-server:8888
-    networks:
-      - pilipa-dev
+
   config-server:
-    build: ./config-server
+    build: ./config-server/
+    restart: always
     ports:
       - "8888:8888"
       - "8889:8889"
     volumes:
       - ${configRepo}:/Users/kane/git/pilipa/config-repo
-    environment:
-      - JAVA_OPTIONS=-server -XX:-HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/pilipa/ -Duser.timezone=Asia/Hong_Kong
-      - spring.rabbitmq.addresses=rabbit:5672
-    networks:
-      - pilipa-dev
+
   mongo:
-    image: mongo:3.4.10
+    build: ./mongo/
+    restart: always
+    command: --auth --enableMajorityReadConcern
     ports:
       - "27017:27017"
-    networks:
-      - pilipa-dev
     volumes:
       - mongo_data:/data/db
+      - volume_mongo-configdb:/data/configdb
+
+  mongo-admin:
+    build: ./mongo-admin/
+    restart: always
+    ports:
+      - '27018:8081'
+
   redis:
-    image: redis:3.2-alpine
-    networks:
-      - pilipa-dev
+    build: ./redis/
+    restart: always
     ports:
       - "6379:6379"
     volumes:
       - redis_data:/data
+
+  redis-admin:
+    build: ./redis-admin/
+    restart: always
+    ports:
+      - '16379:5001'
+
   rabbit:
-    build: ./rabbitmq
+    build: ./rabbitmq/
     hostname: rabbit
+    restart: always
     ports:
       - "5672:5672"
       - "15672:15672"
       - "61613:61613"
-    networks:
-      - pilipa-dev
-    environment:
-      - RABBITMQ_DEFAULT_VHOST=pilipa
     volumes:
       - rabbitmq_data:/var/lib/rabbitmq
+  
   zipkin:
-    image: openzipkin/zipkin
-    networks:
-      - pilipa-dev
+    build: ./zipkin/
+    restart: always
     ports:
       - "9411:9411"
 
-networks:
-  pilipa-dev:
-    driver: bridge
+  mysql:
+    build: ./mysql/
+    restart: always
+    ports:
+      - '3306:3306'
+    volumes:
+      - volume_mysql:/var/lib/mysql
+
+  mysql-admin:
+    build: ./mysql-admin/
+    restart: always
+    ports:
+      - '13306:80'
+    volumes:
+      - volume_mysql-admin:/sessions
+
+  docker-admin:
+    build: ./docker-admin/
+    restart: always
+    command: -H unix:///var/run/docker.sock
+    ports:
+      - '9000:9000'
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - volume_docker-admin:/data
+  
+  docker-api:
+    build: ./docker-api/
+    restart: always
+    ports:
+      - '2375:2375'
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
 
 volumes:
   redis_data:
   mongo_data:
   rabbitmq_data:
+  volume_mysql:
+  volume_mysql-admin:
+  volume_mongo-configdb:
+  volume_docker-admin:

eureka-server/Dockerfile

@@ -3,5 +3,7 @@ FROM fabric8/java-jboss-openjdk8-jdk:1.4
 ENV JAVA_APP_JAR="app.jar"
 ENV JAVA_MAX_MEM_RATIO=50
 ENV AB_OFF ""
+ENV JAVA_OPTIONS="-server -XX:-HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/pilipa/ -Duser.timezone=Asia/Hong_Kong"
+ENV CONFIG_SERVER_URL=http://config-server:8888
 
 ADD --chown=jboss:jboss https://pilipa-assets.oss-cn-beijing.aliyuncs.com/soft/eureka-1.0.0.jar /deployments/app.jar

mongo-admin/Dockerfile

+# https://hub.docker.com/_/mongo-express/
+# https://github.com/mongo-express/mongo-express-docker/blob/master/Dockerfile
+FROM mongo-express
+
+ENV ME_CONFIG_BASICAUTH_USERNAME=root \
+    ME_CONFIG_BASICAUTH_PASSWORD=1234 \
+    ME_CONFIG_OPTIONS_EDITORTHEME=default \
+    ME_CONFIG_MONGODB_SERVER=mongo \
+    ME_CONFIG_MONGODB_PORT=27017 \
+    ME_CONFIG_MONGODB_ENABLE_ADMIN=true \
+    ME_CONFIG_MONGODB_ADMINUSERNAME=root \
+    ME_CONFIG_MONGODB_ADMINPASSWORD=1234
+
+EXPOSE 8081
\ No newline at end of file

mongo/Dockerfile

+# https://hub.docker.com/_/mongo/
+FROM mongo:3.4.10
+
+ENV MONGO_INITDB_ROOT_USERNAME=root \
+    MONGO_INITDB_ROOT_PASSWORD=1234 \
+    MONGO_INITDB_DATABASE=default
+
+EXPOSE 27017
\ No newline at end of file

mysql-admin/Dockerfile

+# https://hub.docker.com/r/phpmyadmin/phpmyadmin
+FROM phpmyadmin/phpmyadmin
+
+ENV PMA_HOST=localhost \
+    MYSQL_ROOT_PASSWORD=1234 \
+    PMA_ARBITRARY=1
+
+EXPOSE 80
\ No newline at end of file

mysql/Dockerfile

+# https://hub.docker.com/_/mysql/
+# https://github.com/docker-library/mysql/blob/master/5.7/Dockerfile
+FROM mysql:5
+
+# https://dev.mysql.com/doc/refman/5.7/en/environment-variables.html
+ENV MYSQL_ALLOW_EMPTY_PASSWORD=no \
+    MYSQL_ROOT_PASSWORD=1234 \
+    MYSQL_DATABASE=zipkin \
+    MYSQL_USER=zipkin \
+    MYSQL_PASSWORD=zipkin 
+
+EXPOSE 3306
\ No newline at end of file

rabbitmq/Dockerfile

 FROM rabbitmq:3.6.10-management-alpine
 
 ENV TZ=Asia/Shanghai
+
+ENV RABBITMQ_DEFAULT_VHOST=pilipa
+
 RUN echo "http://mirrors.aliyun.com/alpine/v3.5/main" >/etc/apk/repositories \ 
     && echo "http://mirrors.aliyun.com/alpine/v3.5/community" >>/etc/apk/repositories \
     && apk add --no-cache --update su-exec \
@@ -8,4 +11,4 @@ RUN echo "http://mirrors.aliyun.com/alpine/v3.5/main" >/etc/apk/repositories \
     && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
     && echo $TZ > /etc/timezone
 	
-RUN rabbitmq-plugins enable --offline rabbitmq_shovel rabbitmq_shovel_management rabbitmq_web_stomp 
+RUN rabbitmq-plugins enable --offline rabbitmq_shovel rabbitmq_shovel_management rabbitmq_web_stomp
\ No newline at end of file

rabbitmq/build.sh

-docker build -t pilipa/rabbitmq:3.6.10-management-alpine .
\ No newline at end of file

redis-admin/Dockerfile

+# https://hub.docker.com/r/marian/rebrow/
+# https://github.com/marians/rebrow
+FROM marian/rebrow
+
+EXPOSE 5001
\ No newline at end of file

redis/Dockerfile

+FROM redis:3.2-alpine
+
+EXPOSE 6379
\ No newline at end of file

zipkin/Dockerfile

+FROM openzipkin/zipkin
+
+EXPOSE 9411
\ No newline at end of file