docker: reorginisartion && comments

Author: andrewshvv

docker/docker-compose.yml

@@ -1,5 +1,6 @@
-version: '2.1'
+version: '3.4'
 services:
+
  mysql:
  build: mysql
  image: bitlum/exchange-mysql
@@ -13,6 +14,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.10
+
  kafka:
  build: kafka
  image: bitlum/exchange-kafka
@@ -27,6 +29,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.20
+
  redis-master:
  build:
  context: redis
@@ -43,6 +46,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.36
+
  redis-replica-1:
  build:
  context: redis
@@ -62,6 +66,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.37
+
  redis-replica-2:
  build:
  context: redis
@@ -81,6 +86,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.38
+
  sentinel1:
  build:
  context: sentinel
@@ -100,6 +106,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.31
+
  sentinel2:
  build:
  context: sentinel
@@ -120,6 +127,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.32
+
  sentinel3:
  build:
  context: sentinel
@@ -141,6 +149,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.33
+
  alertcenter:
  build:
  context: ..
@@ -161,6 +170,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.41
+
  matchengine:
  build:
  context: ..
@@ -181,6 +191,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.42
+
  marketprice:
  build:
  context: ..
@@ -203,6 +214,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.43
+
  readhistory:
  build:
  context: ..
@@ -222,6 +234,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.44
+
  accesshttp:
  build:
  context: ..
@@ -246,6 +259,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.45
+
  accessws:
  build:
  context: ..
@@ -271,6 +285,7 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.46
+
  cli:
  build: cli
  image: bitlum/exchange-cli
@@ -293,12 +308,11 @@ services:
  networks:
  exchange_net:
  ipv4_address: 192.168.18.50
+
 networks:
  exchange_net:
  driver: bridge
- enable_ipv6: false
  ipam:
  driver: default
  config:
  - subnet: 192.168.18.0/24
- gateway: 192.168.18.254

docker/exchange/Dockerfile

@@ -1,7 +1,8 @@
 FROM ubuntu:16.04 AS BUILDSTEP
-LABEL BUILDSTEP NNNN
 MAINTAINER Sergey Dolin <sergey@s4y.solutions>
 
+# Install all necessary for building dependecnies, read more about
+# depencensies in readme section in the root of the repo.
 RUN apt-get update && \
  apt-get upgrade -y && \
  apt-get install -y \
@@ -32,65 +33,106 @@ RUN apt-get update && \
 librtmp-dev &&\
  rm -rf /var/lib/apt/lists/* 
 
-RUN git clone https://github.com/edenhill/librdkafka.git && cd librdkafka && ./configure && make && make install && cd / && rm -rf librdkafka
+RUN git clone https://github.com/edenhill/librdkafka.git \
+ && cd librdkafka \
+ && ./configure \
+ && make \
+ && make install \
+ && cd / \
+ && rm -rf librdkafka
 
 RUN mkdir viabtc_exchange_server
-COPY depends viabtc_exchange_server/depends
-COPY network viabtc_exchange_server/network
-COPY utils viabtc_exchange_server/utils
-COPY alertcenter viabtc_exchange_server/alertcenter
-COPY matchengine viabtc_exchange_server/matchengine
-COPY marketprice viabtc_exchange_server/marketprice
-COPY readhistory viabtc_exchange_server/readhistory
-COPY accesshttp viabtc_exchange_server/accesshttp
-COPY accessws viabtc_exchange_server/accessws
-COPY docker/exchange/makefile.inc.ubuntu viabtc_exchange_server/makefile.inc
-
-RUN cd viabtc_exchange_server/depends/hiredis && make && mv libhiredis.* /usr/lib && cd .. && mv hiredis /usr/include 
-RUN cd viabtc_exchange_server/network && make
-RUN cd viabtc_exchange_server/utils && make
-RUN cd viabtc_exchange_server/alertcenter && make
-RUN cd viabtc_exchange_server/matchengine && make
-COPY docker/exchange/makefile.marketprice.ubuntu viabtc_exchange_server/marketprice/makefile
-RUN cd viabtc_exchange_server/marketprice && make
-RUN cd viabtc_exchange_server/readhistory && make 
-RUN cd viabtc_exchange_server/accesshttp && make
-COPY docker/exchange/makefile.accessws.ubuntu viabtc_exchange_server/accessws/makefile
-RUN cd viabtc_exchange_server/accessws && make
 
+# Copy all necessary files and directories for build process, basically we
+# recreate the root repository directory, but with tham we could ensure that
+# nothing
+COPY depends viabtc_exchange_server/depends
+COPY network viabtc_exchange_server/network
+COPY utils viabtc_exchange_server/utils
+
+COPY alertcenter viabtc_exchange_server/alertcenter
+COPY matchengine viabtc_exchange_server/matchengine
+COPY marketprice viabtc_exchange_server/marketprice
+COPY readhistory viabtc_exchange_server/readhistory
+COPY accesshttp viabtc_exchange_server/accesshttp
+COPY accessws viabtc_exchange_server/accessws
+
+COPY makefile.inc viabtc_exchange_server/makefile.inc
+
+# Do the actial build of the microservices.
+RUN cd viabtc_exchange_server/depends/hiredis \
+ && make \
+ && mv libhiredis.* /usr/lib \
+ && cd .. \
+ && mv hiredis /usr/include
+
+RUN cd viabtc_exchange_server/network \
+ && make
+
+RUN cd viabtc_exchange_server/utils \
+ && make
+
+RUN cd viabtc_exchange_server/alertcenter \
+ && make
+
+RUN cd viabtc_exchange_server/matchengine \
+ && make
+
+RUN cd viabtc_exchange_server/marketprice \
+ && make
+
+RUN cd viabtc_exchange_server/readhistory \
+ && make
+
+RUN cd viabtc_exchange_server/accesshttp \
+ && make
+
+RUN cd viabtc_exchange_server/accessws \
+ && make
+
+# Multi-stage builds are a new feature requiring Docker 17.05 or higher on the
+# daemon and client. Multistage builds are useful to anyone who has struggled
+# to optimize Dockerfiles while keeping them easy to read and maintain.
+# With this we ensure that previous build layers are not stored and we grab
+# only what we need.
 FROM ubuntu:16.04
 
-RUN apt-get update \
- && apt-get upgrade -y \
- && apt-get install -y \
- libldap-2.4 \
- libgss3 \
- librtmp1 \
- libmysqlclient20 \
- jq \
- netcat \
- && rm -rf /var/lib/apt/lists/* 
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install -y \
+libldap-2.4 \
+libgss3 \
+librtmp1 \
+libmysqlclient20 \
+jq \
+netcat
+RUN rm -rf /var/lib/apt/lists/*
 
 RUN mkdir /viabtc_exchange_server
 # keep .exe for better grep of ps output
-COPY --from=BUILDSTEP /viabtc_exchange_server/alertcenter/alertcenter /viabtc_exchange_server/alertcenter.exe
-COPY docker/exchange/alertcenter.json /viabtc_exchange_server
+COPY --from=BUILDSTEP /viabtc_exchange_server/alertcenter/alertcenter \
+ /viabtc_exchange_server/alertcenter.exe
+COPY docker/exchange/configs/alertcenter.json /viabtc_exchange_server
 
-COPY --from=BUILDSTEP /viabtc_exchange_server/matchengine/matchengine /viabtc_exchange_server/matchengine.exe
-COPY docker/exchange/matchengine.json /viabtc_exchange_server
+COPY --from=BUILDSTEP /viabtc_exchange_server/matchengine/matchengine \
+ /viabtc_exchange_server/matchengine.exe
+COPY docker/exchange/configs/matchengine.json /viabtc_exchange_server
 
-COPY --from=BUILDSTEP /viabtc_exchange_server/marketprice/marketprice /viabtc_exchange_server/marketprice.exe
-COPY docker/exchange/marketprice.json /viabtc_exchange_server
+COPY --from=BUILDSTEP /viabtc_exchange_server/marketprice/marketprice \
+ /viabtc_exchange_server/marketprice.exe
+COPY docker/exchange/configs/marketprice.json /viabtc_exchange_server
 
-COPY --from=BUILDSTEP /viabtc_exchange_server/readhistory/readhistory /viabtc_exchange_server/readhistory.exe
-COPY docker/exchange/readhistory.json /viabtc_exchange_server
+COPY --from=BUILDSTEP /viabtc_exchange_server/readhistory/readhistory \
+ /viabtc_exchange_server/readhistory.exe
+COPY docker/exchange/configs/readhistory.json /viabtc_exchange_server
 
-COPY --from=BUILDSTEP /viabtc_exchange_server/accesshttp/accesshttp /viabtc_exchange_server/accesshttp.exe
-COPY docker/exchange/accesshttp.json /viabtc_exchange_server
+COPY --from=BUILDSTEP /viabtc_exchange_server/accesshttp/accesshttp \
+ /viabtc_exchange_server/accesshttp.exe
+COPY docker/exchange/configs/accesshttp.json /viabtc_exchange_server
 
-COPY --from=BUILDSTEP /viabtc_exchange_server/accessws/accessws /viabtc_exchange_server/accessws.exe
-COPY docker/exchange/accessws.json /viabtc_exchange_server
+COPY --from=BUILDSTEP /viabtc_exchange_server/accessws/accessws \
+ /viabtc_exchange_server/accessws.exe
+COPY docker/exchange/configs/accessws.json /viabtc_exchange_server
 
 COPY docker/exchange/entrypoint.sh /docker-entrypoint.sh
-
 ENTRYPOINT [ "/docker-entrypoint.sh" ]

docker/exchange/Dockerfile.alpine

@@ -46,4 +46,4 @@
  ],
  "max_pkg_size": 2000000
  }
-}
+}