Skip to content

Commit

Permalink
remove supervisor, fix docker
Browse files Browse the repository at this point in the history
  • Loading branch information
larsnovikov committed May 1, 2019
1 parent cbbbd1d commit 07be533
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 -d -P horgh_replicator

### dev mode ###
start-dev : docker-up
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_dev
Original file line number Diff line number Diff line change
@@ -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 . .
Expand Down
6 changes: 4 additions & 2 deletions docker/Dockerfile_prod
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
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 . .

COPY files/vertica-client-7.2.0-0.x86_64.tar.gz /vertica-client.tar.gz
RUN tar -xvf /vertica-client.tar.gz -C /

VOLUME ../src/system/positions /go/src/horgh-replicator/src/system/positions

#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"]
&& ./horgh-replicator listen"]
3 changes: 1 addition & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions supervisor/bash.conf

This file was deleted.

9 changes: 0 additions & 9 deletions supervisor/replicator.conf

This file was deleted.

0 comments on commit 07be533

Please sign in to comment.