diff --git a/dockerfiles/super_node/Dockerfile b/dockerfiles/super_node/Dockerfile index 84ebe54e..4ed122f1 100644 --- a/dockerfiles/super_node/Dockerfile +++ b/dockerfiles/super_node/Dockerfile @@ -1,25 +1,14 @@ -FROM golang:alpine +FROM golang:alpine as builder RUN apk --update --no-cache add make git g++ linux-headers # DEBUG RUN apk add busybox-extras -# this is probably a noob move, but I want apk from alpine for the above but need to avoid Go 1.13 below as this error still occurs https://github.com/ipfs/go-ipfs/issues/6603 -FROM golang:1.12.4 as builder - # Get and build vulcanizedb ADD . /go/src/github.com/vulcanize/vulcanizedb WORKDIR /go/src/github.com/vulcanize/vulcanizedb RUN GO111MODULE=on GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o vulcanizedb . -# Get and build vulcanize's go-ipfs fork -RUN go get -u -d github.com/ipfs/go-ipfs -WORKDIR /go/src/github.com/ipfs/go-ipfs -RUN git remote add vulcanize https://github.com/vulcanize/go-ipfs.git -RUN git fetch vulcanize -RUN git checkout -b pg_ipfs vulcanize/postgres_update -RUN GO111MODULE=on GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ipfs ./cmd/ipfs - # Build migration tool RUN go get -u -d github.com/pressly/goose/cmd/goose WORKDIR /go/src/github.com/pressly/goose/cmd/goose @@ -52,7 +41,6 @@ COPY --from=builder /go/src/github.com/vulcanize/vulcanizedb/vulcanizedb vulcani COPY --from=builder /go/src/github.com/pressly/goose/cmd/goose/goose goose COPY --from=builder /go/src/github.com/vulcanize/vulcanizedb/db/migrations migrations/vulcanizedb COPY --from=builder /go/src/github.com/vulcanize/vulcanizedb/environments environments -COPY --from=builder /go/src/github.com/ipfs/go-ipfs/ipfs ipfs EXPOSE $EXPOSE_PORT_1 EXPOSE $EXPOSE_PORT_2 diff --git a/dockerfiles/super_node/docker-compose.yml b/dockerfiles/super_node/docker-compose.yml index b12a514e..4487be47 100644 --- a/dockerfiles/super_node/docker-compose.yml +++ b/dockerfiles/super_node/docker-compose.yml @@ -29,8 +29,6 @@ services: CONFIG_FILE: ./environments/superNodeBTC.toml environment: VDB_COMMAND: "superNode" - IPFS_INIT: "true" - IPFS_PATH: "/root/.btc/.ipfs" DATABASE_NAME: "vulcanize_public" DATABASE_HOSTNAME: "db" DATABASE_PORT: 5432 @@ -54,8 +52,6 @@ services: CONFIG_FILE: ./environments/superNodeETH.toml environment: VDB_COMMAND: "superNode" - IPFS_INIT: "true" - IPFS_PATH: "/root/.eth/.ipfs" DATABASE_NAME: "vulcanize_public" DATABASE_HOSTNAME: "db" DATABASE_PORT: 5432 diff --git a/dockerfiles/super_node/entrypoint.sh b/dockerfiles/super_node/entrypoint.sh index 77fa4778..a4a1de6b 100755 --- a/dockerfiles/super_node/entrypoint.sh +++ b/dockerfiles/super_node/entrypoint.sh @@ -31,27 +31,6 @@ if [ $rv != 0 ]; then exit 1 fi -# Export our database variables so that the IPFS Postgres plugin can use them -export IPFS_PGHOST=$DATABASE_HOSTNAME -export IPFS_PGUSER=$DATABASE_USER -export IPFS_PGDATABASE=$DATABASE_NAME -export IPFS_PGPORT=$DATABASE_PORT -export IPFS_PGPASSWORD=$DATABASE_PASSWORD - - -if [ ! -d "$HOME/.ipfs" ]; then - # initialize PG-IPFS - echo "Initializing Postgres-IPFS profile" - ./ipfs init --profile=postgresds - - rv=$? - if [ $rv != 0 ]; then - echo "Could not initialize ipfs" - exit 1 - fi -fi - - echo "Beginning the vulcanizedb process" VDB_CONFIG_FILE=${VDB_CONFIG_FILE:-config.toml} DEFAULT_OPTIONS="--config=$VDB_CONFIG_FILE"