Fixes issues with docker-compose

This commit is contained in:
A. F. Dudley 2020-08-07 22:56:33 -07:00 committed by Ian Norden
parent e2d591b3f7
commit 30b07b8669
2 changed files with 7 additions and 6 deletions

View File

@ -1,4 +1,4 @@
FROM golang:1.12-alpine as builder FROM golang:1.13-alpine as builder
RUN apk --update --no-cache add make git g++ linux-headers RUN apk --update --no-cache add make git g++ linux-headers
# DEBUG # DEBUG
@ -10,6 +10,7 @@ WORKDIR /go/src/github.com/vulcanize/ipfs-blockchain-watcher
RUN GO111MODULE=on GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ipfs-blockchain-watcher . RUN GO111MODULE=on GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ipfs-blockchain-watcher .
# Build migration tool # Build migration tool
WORKDIR /
RUN go get -u -d github.com/pressly/goose/cmd/goose RUN go get -u -d github.com/pressly/goose/cmd/goose
WORKDIR /go/src/github.com/pressly/goose/cmd/goose WORKDIR /go/src/github.com/pressly/goose/cmd/goose
RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -tags='no_mysql no_sqlite' -o goose . RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -tags='no_mysql no_sqlite' -o goose .
@ -45,4 +46,4 @@ COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/environ
EXPOSE $EXPOSE_PORT_1 EXPOSE $EXPOSE_PORT_1
EXPOSE $EXPOSE_PORT_2 EXPOSE $EXPOSE_PORT_2
ENTRYPOINT ["/app/entrypoint.sh"] ENTRYPOINT ["/app/startup_script.sh"]

View File

@ -26,7 +26,7 @@ services:
dockerfile: ./dockerfiles/super_node/Dockerfile dockerfile: ./dockerfiles/super_node/Dockerfile
args: args:
USER: "vdbm" USER: "vdbm"
CONFIG_FILE: ./environments/watcherBTC.toml CONFIG_FILE: ./environments/superNodeBTC.toml
environment: environment:
VDB_COMMAND: "watcher" VDB_COMMAND: "watcher"
DATABASE_NAME: "vulcanize_public" DATABASE_NAME: "vulcanize_public"
@ -49,9 +49,9 @@ services:
dockerfile: ./dockerfiles/super_node/Dockerfile dockerfile: ./dockerfiles/super_node/Dockerfile
args: args:
USER: "vdbm" USER: "vdbm"
CONFIG_FILE: ./environments/watcherETH.toml CONFIG_FILE: ./environments/superNodeETH.toml
environment: environment:
VDB_COMMAND: "watcher" VDB_COMMAND: "watch"
DATABASE_NAME: "vulcanize_public" DATABASE_NAME: "vulcanize_public"
DATABASE_HOSTNAME: "db" DATABASE_HOSTNAME: "db"
DATABASE_PORT: 5432 DATABASE_PORT: 5432