Merge pull request #19 from larsnovikov/refactoring_ci

Refactoring ci

Author: larsnovikov

Makefile

@@ -8,7 +8,7 @@ docker-build :
 	sudo docker build -t horgh_replicator -f docker/Dockerfile_prod .
 
 docker-run :
-	sudo docker run -d -P horgh_replicator
+	sudo docker run --restart=on-failure -v $(shell pwd)/src/system/positions:/go/src/horgh-replicator/src/system/positions -d -P horgh_replicator
 
 ### dev mode ###
 start-dev : docker-up
@@ -23,4 +23,4 @@ build-prod : docker-build
 start-prod : docker-run
 
 stop-prod :
-	sudo docker stop ${container} && sudo docker rm ${container}
+	sudo docker stop ${container} && sudo docker rm ${container}

README.md

@@ -59,7 +59,7 @@ Don't forget to set `binlog_do_db=<master_db_name>` and restart MySQL service.
 
 ### Modes
 
-- Prod mode: build app and execute app as supervisor process. 
+- Prod mode: build app and execute listener. 
 
   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. 

docker/Dockerfile_dev

@@ -1,7 +1,7 @@
 FROM golang:1.10
 
 RUN apt-get update
-RUN apt-get -y install curl g++ make bzip2 nano supervisor unixodbc unixodbc-dev mysql-client
+`RUN apt-get -y install curl g++ make bzip2 nano unixodbc unixodbc-dev mysql-client
 
 WORKDIR /go/src/horgh-replicator
 COPY . .

docker/Dockerfile_prod

@@ -1,7 +1,7 @@
 FROM golang:1.10
 
 RUN apt-get update
-RUN apt-get -y install curl g++ make bzip2 nano supervisor unixodbc unixodbc-dev mysql-client
+RUN apt-get -y install curl g++ make bzip2 nano unixodbc unixodbc-dev mysql-client
 
 WORKDIR /go/src/horgh-replicator
 COPY . .
@@ -16,4 +16,4 @@ CMD ["sh", "-c", "cd /go/src/horgh-replicator/src \
     && dep ensure -update \
     && go build main.go \
     && mv main horgh-replicator \
-    && /usr/bin/supervisord"]
+    && ./horgh-replicator listen"]

docker/docker-compose.yml

@@ -7,5 +7,4 @@ services:
       dockerfile: ./docker/Dockerfile_dev
     tty: true
     volumes:
-      - ../:/go/src/horgh-replicator
-      - ../supervisor:/etc/supervisor/conf.d
+      - ../:/go/src/horgh-replicator