From 30b07b8669905c56d02bbb1afa2c95fb1cf0d88d Mon Sep 17 00:00:00 2001 From: "A. F. Dudley" Date: Fri, 7 Aug 2020 22:56:33 -0700 Subject: [PATCH] Fixes issues with docker-compose --- dockerfiles/super_node/Dockerfile | 5 +++-- dockerfiles/super_node/docker-compose.yml | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dockerfiles/super_node/Dockerfile b/dockerfiles/super_node/Dockerfile index ef6a3cf7..03c7aded 100644 --- a/dockerfiles/super_node/Dockerfile +++ b/dockerfiles/super_node/Dockerfile @@ -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 # 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 . # Build migration tool +WORKDIR / RUN go get -u -d 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 . @@ -45,4 +46,4 @@ COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/environ EXPOSE $EXPOSE_PORT_1 EXPOSE $EXPOSE_PORT_2 -ENTRYPOINT ["/app/entrypoint.sh"] +ENTRYPOINT ["/app/startup_script.sh"] diff --git a/dockerfiles/super_node/docker-compose.yml b/dockerfiles/super_node/docker-compose.yml index 0011928e..c0b03e23 100644 --- a/dockerfiles/super_node/docker-compose.yml +++ b/dockerfiles/super_node/docker-compose.yml @@ -26,7 +26,7 @@ services: dockerfile: ./dockerfiles/super_node/Dockerfile args: USER: "vdbm" - CONFIG_FILE: ./environments/watcherBTC.toml + CONFIG_FILE: ./environments/superNodeBTC.toml environment: VDB_COMMAND: "watcher" DATABASE_NAME: "vulcanize_public" @@ -49,9 +49,9 @@ services: dockerfile: ./dockerfiles/super_node/Dockerfile args: USER: "vdbm" - CONFIG_FILE: ./environments/watcherETH.toml + CONFIG_FILE: ./environments/superNodeETH.toml environment: - VDB_COMMAND: "watcher" + VDB_COMMAND: "watch" DATABASE_NAME: "vulcanize_public" DATABASE_HOSTNAME: "db" DATABASE_PORT: 5432 @@ -84,4 +84,4 @@ services: "--append-plugins", "postgraphile-plugin-connection-filter"] volumes: - vulcanizedb_db_data: \ No newline at end of file + vulcanizedb_db_data: