Merge pull request #14 from larsnovikov/init-table

Makefile and modes

Author: larsnovikov

Makefile

@@ -0,0 +1,26 @@
+docker-up :
+	cd docker && sudo docker-compose up -d
+
+docker-down :
+	cd docker && sudo docker-compose down
+
+docker-build :
+	sudo docker build -t horgh_replicator -f docker/Dockerfile_prod .
+
+docker-run :
+	sudo docker run -d -P horgh_replicator
+
+### dev mode ###
+start-dev : docker-up
+
+restart-dev : docker-down docker-up
+
+stop-dev : docker-down
+
+### prod mode ###
+build-prod : docker-build
+
+start-prod : docker-run
+
+stop-prod :
+	sudo docker stop ${container} && sudo docker rm ${container}

README.md

@@ -17,7 +17,7 @@
 Don't forget to set `binlog_do_db=<master_db_name>` and restart MySQL service.
 - Execute `sql/structure.sql` in your MySQL master and slave.
 - Execute `sql/replicator.sql` in your MySQL. It will create database for system values.
-- Start Docker as `cd docker` and `docker-compose up -d --build`
+- Start Docker as `make start-dev`
 - Run as `cd src` and `go run main.go listen` in docker container.
 
 ### Testing
@@ -59,7 +59,9 @@ Don't forget to set `binlog_do_db=<master_db_name>` and restart MySQL service.
 
 ### Container mode
 
-Where are 2 modes of docker container in Dockerfile:
-
-- Prod mode: build app and execute app as supervisor process
-- Dev mode: provides the opportunity for manual start and debug
+- Prod mode: build app and execute app as supervisor process. 
+  
+  Use `make build-prod` and `make start-prod` to start and `make stop-prod` to stop.
+- Dev mode: provides the opportunity for manual start and debug. 
+  
+  Use `make start-dev` to start and `make stop-dev` to stop.

docker/Dockerfile renamed to docker/Dockerfile_dev

@@ -12,12 +12,4 @@ RUN tar -xvf /vertica-client.tar.gz -C /
 #installing dep and vendors
 RUN go get -u github.com/golang/dep/...
 
-# dev mode
-CMD ["sh", "-c", "cd /go/src/horgh-replicator/src && dep ensure -update && /bin/bash"]
-
-# prod mode
-# CMD ["sh", "-c", "cd /go/src/horgh-replicator/src \
-#    && dep ensure -update \
-#    && go build main.go \
-#    && mv main horgh-replicator \
-#    && /usr/bin/supervisord"]
+CMD ["sh", "-c", "cd /go/src/horgh-replicator/src && dep ensure -update && /bin/bash"]

docker/Dockerfile_prod

@@ -0,0 +1,19 @@
+FROM golang:1.10
+
+RUN apt-get update
+RUN apt-get -y install curl g++ make bzip2 nano supervisor unixodbc unixodbc-dev mysql-client
+
+WORKDIR /go/src/horgh-replicator
+COPY . .
+
+COPY files/vertica-client-7.2.0-0.x86_64.tar.gz /vertica-client.tar.gz
+RUN tar -xvf /vertica-client.tar.gz -C /
+
+#installing dep and vendors
+RUN go get -u github.com/golang/dep/...
+
+CMD ["sh", "-c", "cd /go/src/horgh-replicator/src \
+    && dep ensure -update \
+    && go build main.go \
+    && mv main horgh-replicator \
+    && /usr/bin/supervisord"]

docker/docker-compose.yml

@@ -4,7 +4,7 @@ services:
     container_name: horgh_replicator
     build:
       context: ../
-      dockerfile: ./docker/Dockerfile
+      dockerfile: ./docker/Dockerfile_dev
     tty: true
     volumes:
       - ../:/go/src/horgh-replicator