From 534b0fe31d23921feb7eafc15199d01ef73dfa9a Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Tue, 11 Oct 2022 16:01:30 -0500 Subject: [PATCH 1/6] Add docker-compose.yml --- Dockerfile | 4 +-- docker-compose.yml | 36 ++++++++++++++++++++++++ docker.env | 28 +++++++++++++++++++ entrypoint.sh | 11 +++++--- ipld-eth-beacon-config-docker.json | 44 ++++++++++++++++++++++++++++++ ipld-eth-beacon-config.json | 44 ------------------------------ 6 files changed, 117 insertions(+), 50 deletions(-) create mode 100644 docker-compose.yml create mode 100644 docker.env create mode 100644 ipld-eth-beacon-config-docker.json delete mode 100644 ipld-eth-beacon-config.json diff --git a/Dockerfile b/Dockerfile index 88005b0..fe321d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,9 +13,9 @@ RUN GCO_ENABLED=0 GOOS=linux go build -race -ldflags="-s -w" -o ipld-eth-beacon- RUN chmod +x ipld-eth-beacon-indexer FROM frolvlad/alpine-bash:latest -RUN apk --no-cache add ca-certificates libstdc++ busybox-extras +RUN apk --no-cache add ca-certificates libstdc++ busybox-extras gettext libintl WORKDIR /root/ COPY --from=builder /go/src/github.com/vulcanize/ipld-eth-beacon-indexer/ipld-eth-beacon-indexer /root/ipld-eth-beacon-indexer ADD entrypoint.sh . -ADD ipld-eth-beacon-config.json . +ADD ipld-eth-beacon-config-docker.json . ENTRYPOINT ["./entrypoint.sh"] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..c57e85b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,36 @@ +version: "3.2" +services: + ipld-eth-beacon-db: + hostname: ipld-eth-beacon-db + env_file: + - docker.env + restart: always + build: + dockerfile: ../ipld-eth-beacon-db/Dockerfile + context: ../ipld-eth-beacon-db + image: cerc/ipld-eth-beacon-db:local + healthcheck: + test: ["CMD", "nc", "-v", "localhost", "5432"] + interval: 5s + timeout: 3s + retries: 5 + volumes: + - vdb_db_eth-beacon_db:/var/lib/postgresql/data + ports: + - "5432" + command: ["postgres", "-c", "log_min_duration_statement=250"] + + ipld-eth-beacon-indexer: + hostname: ipld-eth-beacon-indexer + env_file: + - docker.env + restart: always + build: + dockerfile: ./Dockerfile + context: . + depends_on: + - ipld-eth-beacon-db + image: cerc/ipld-eth-beacon-indexer:local + +volumes: + vdb_db_eth-beacon_db: diff --git a/docker.env b/docker.env new file mode 100644 index 0000000..9ec297c --- /dev/null +++ b/docker.env @@ -0,0 +1,28 @@ +POSTGRES_HOST=ipld-eth-beacon-db +POSTGRES_PASSWORD=CHANGEME +POSTGRES_PORT=5432 +POSTGRES_USER=ethbeacondb +POSTGRES_DB=ethbeacondb + +LIGHTHOUSE_HOST=host.docker.internal +LIGHTHOUSE_PORT=5053 +LIGHTHOUSE_PROTOCOL=http + +CAPTURE_MODE=head +LOG_LEVEL=debug + +BC_MAX_HISTORIC_PROCESS_WORKER=2 +BC_UNIQUE_NODE_IDENTIFIER=100 +BC_CHECK_DB=true +BC_BEACON_STATE_PROCESSING_ENABLED=false +BC_BEACON_BLOCK_PROCESSING_ENABLED=true +BC_MINIMUM_SLOT=4700013 + +KG_INCREMENT=10000 +KG_PROCESS_KNOWN_GAPS_ENABLED=true +KG_MAX_KNOWN_GAPS_WORKER=2 +KG_MINIMUM_SLOT=4700013 + +PROM_HOST=localhost +PROM_PORT=9000 +PROM_METRICS_ENABLED=false diff --git a/entrypoint.sh b/entrypoint.sh index 5cc37db..006502c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,9 @@ #!/bin/bash sleep 10 -echo "Starting ipld-eth-beacon-indexer" +sleep "Starting ipld-eth-beacon-indexer" + +cat /root/ipld-eth-beacon-config-docker.json | envsubst > /root/ipld-eth-beacon-config.json echo /root/ipld-eth-beacon-indexer capture ${CAPTURE_MODE} --config /root/ipld-eth-beacon-config.json > /root/ipld-eth-beacon-indexer.output @@ -14,9 +16,10 @@ if [ ${CAPTURE_MODE} == "boot" ]; then else echo "ipld-eth-beacon-indexer boot succeeded" fi - echo $rv > /root/HEALTH - echo $rv - cat /root/ipld-eth-beacon-indexer.output + + echo $rv > /root/HEALTH + echo $rv + cat /root/ipld-eth-beacon-indexer.output tail -f /dev/null else diff --git a/ipld-eth-beacon-config-docker.json b/ipld-eth-beacon-config-docker.json new file mode 100644 index 0000000..2a12897 --- /dev/null +++ b/ipld-eth-beacon-config-docker.json @@ -0,0 +1,44 @@ +{ + "db": { + "address": "${POSTGRES_HOST}", + "password": "${POSTGRES_PASSWORD}", + "port": ${POSTGRES_PORT}, + "username": "${POSTGRES_USER}", + "name": "${POSTGRES_DB}", + "driver": "PGX" + }, + "bc": { + "address": "${LIGHTHOUSE_HOST}", + "port": ${LIGHTHOUSE_PORT}, + "type": "lighthouse", + "bootRetryInterval": 30, + "bootMaxRetry": 5, + "maxHistoricProcessWorker": ${BC_MAX_HISTORIC_PROCESS_WORKER}, + "connectionProtocol": "${LIGHTHOUSE_PROTOCOL}", + "uniqueNodeIdentifier": ${BC_UNIQUE_NODE_IDENTIFIER}, + "checkDb": ${BC_CHECK_DB}, + "performBeaconStateProcessing": ${BC_BEACON_STATE_PROCESSING_ENABLED}, + "performBeaconBlockProcessing": ${BC_BEACON_BLOCK_PROCESSING_ENABLED}, + "minimumSlot": ${BC_MINIMUM_SLOT} + }, + "t": { + "skipSync": true + }, + "log": { + "level": "${LOG_LEVEL}", + "output": true, + "file": "./ipld-eth-beacon-indexer.log", + "format": "json" + }, + "kg": { + "increment": ${KG_INCREMENT}, + "processKnownGaps": ${KG_PROCESS_KNOWN_GAPS_ENABLED}, + "maxKnownGapsWorker": ${KG_MAX_KNOWN_GAPS_WORKER}, + "minimumSlot": ${KG_MINIMUM_SLOT} + }, + "pm": { + "address": "${PROM_HOST}", + "port": ${PROM_PORT}, + "metrics": ${PROM_METRICS_ENABLED} + } +} diff --git a/ipld-eth-beacon-config.json b/ipld-eth-beacon-config.json deleted file mode 100644 index 7a22376..0000000 --- a/ipld-eth-beacon-config.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "db": { - "address": "localhost", - "password": "password", - "port": 5432, - "username": "vdbm", - "name": "vulcanize_db", - "driver": "PGX" - }, - "bc": { - "address": "localhost", - "port": 5052, - "type": "lighthouse", - "bootRetryInterval": 30, - "bootMaxRetry": 5, - "maxHistoricProcessWorker": 2, - "connectionProtocol": "http", - "uniqueNodeIdentifier": 100, - "checkDb": true, - "performBeaconStateProcessing": false, - "performBeaconBlockProcessing": true, - "minimumSlot": 4700013 - }, - "t": { - "skipSync": true - }, - "log": { - "level": "debug", - "output": true, - "file": "./ipld-eth-beacon-indexer.log", - "format": "json" - }, - "kg": { - "increment": 10000, - "processKnownGaps": true, - "maxKnownGapsWorker": 2, - "minimumSlot": 4700013 - }, - "pm": { - "address": "localhost", - "port": 9000, - "metrics": true - } -} -- 2.45.2 From 4b3ec1b5a09d6af3a34d71141fef94b337c684ac Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Tue, 11 Oct 2022 16:06:01 -0500 Subject: [PATCH 2/6] Typo --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 006502c..e808500 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash sleep 10 -sleep "Starting ipld-eth-beacon-indexer" +echo "Starting ipld-eth-beacon-indexer" cat /root/ipld-eth-beacon-config-docker.json | envsubst > /root/ipld-eth-beacon-config.json -- 2.45.2 From a6301feb307f4dd8a62df7804fb22d78950012c0 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Tue, 11 Oct 2022 16:10:39 -0500 Subject: [PATCH 3/6] Tweak defaults --- docker.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker.env b/docker.env index 9ec297c..c2763b0 100644 --- a/docker.env +++ b/docker.env @@ -5,7 +5,7 @@ POSTGRES_USER=ethbeacondb POSTGRES_DB=ethbeacondb LIGHTHOUSE_HOST=host.docker.internal -LIGHTHOUSE_PORT=5053 +LIGHTHOUSE_PORT=5052 LIGHTHOUSE_PROTOCOL=http CAPTURE_MODE=head @@ -23,6 +23,6 @@ KG_PROCESS_KNOWN_GAPS_ENABLED=true KG_MAX_KNOWN_GAPS_WORKER=2 KG_MINIMUM_SLOT=4700013 -PROM_HOST=localhost +PROM_HOST=host.docker.internal PROM_PORT=9000 PROM_METRICS_ENABLED=false -- 2.45.2 From 20804bd30cda8b3c583517ebfc63c3adad04c7b9 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Mon, 31 Oct 2022 12:36:08 -0500 Subject: [PATCH 4/6] Add docker-compose.yml (#80) * Add docker-compose.yml * Typo * Tweak defaults --- Dockerfile | 4 +-- docker-compose.yml | 36 ++++++++++++++++++++++++ docker.env | 28 +++++++++++++++++++ entrypoint.sh | 9 ++++-- ipld-eth-beacon-config-docker.json | 44 ++++++++++++++++++++++++++++++ ipld-eth-beacon-config.json | 44 ------------------------------ 6 files changed, 116 insertions(+), 49 deletions(-) create mode 100644 docker-compose.yml create mode 100644 docker.env create mode 100644 ipld-eth-beacon-config-docker.json delete mode 100644 ipld-eth-beacon-config.json diff --git a/Dockerfile b/Dockerfile index 88005b0..fe321d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,9 +13,9 @@ RUN GCO_ENABLED=0 GOOS=linux go build -race -ldflags="-s -w" -o ipld-eth-beacon- RUN chmod +x ipld-eth-beacon-indexer FROM frolvlad/alpine-bash:latest -RUN apk --no-cache add ca-certificates libstdc++ busybox-extras +RUN apk --no-cache add ca-certificates libstdc++ busybox-extras gettext libintl WORKDIR /root/ COPY --from=builder /go/src/github.com/vulcanize/ipld-eth-beacon-indexer/ipld-eth-beacon-indexer /root/ipld-eth-beacon-indexer ADD entrypoint.sh . -ADD ipld-eth-beacon-config.json . +ADD ipld-eth-beacon-config-docker.json . ENTRYPOINT ["./entrypoint.sh"] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..c57e85b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,36 @@ +version: "3.2" +services: + ipld-eth-beacon-db: + hostname: ipld-eth-beacon-db + env_file: + - docker.env + restart: always + build: + dockerfile: ../ipld-eth-beacon-db/Dockerfile + context: ../ipld-eth-beacon-db + image: cerc/ipld-eth-beacon-db:local + healthcheck: + test: ["CMD", "nc", "-v", "localhost", "5432"] + interval: 5s + timeout: 3s + retries: 5 + volumes: + - vdb_db_eth-beacon_db:/var/lib/postgresql/data + ports: + - "5432" + command: ["postgres", "-c", "log_min_duration_statement=250"] + + ipld-eth-beacon-indexer: + hostname: ipld-eth-beacon-indexer + env_file: + - docker.env + restart: always + build: + dockerfile: ./Dockerfile + context: . + depends_on: + - ipld-eth-beacon-db + image: cerc/ipld-eth-beacon-indexer:local + +volumes: + vdb_db_eth-beacon_db: diff --git a/docker.env b/docker.env new file mode 100644 index 0000000..c2763b0 --- /dev/null +++ b/docker.env @@ -0,0 +1,28 @@ +POSTGRES_HOST=ipld-eth-beacon-db +POSTGRES_PASSWORD=CHANGEME +POSTGRES_PORT=5432 +POSTGRES_USER=ethbeacondb +POSTGRES_DB=ethbeacondb + +LIGHTHOUSE_HOST=host.docker.internal +LIGHTHOUSE_PORT=5052 +LIGHTHOUSE_PROTOCOL=http + +CAPTURE_MODE=head +LOG_LEVEL=debug + +BC_MAX_HISTORIC_PROCESS_WORKER=2 +BC_UNIQUE_NODE_IDENTIFIER=100 +BC_CHECK_DB=true +BC_BEACON_STATE_PROCESSING_ENABLED=false +BC_BEACON_BLOCK_PROCESSING_ENABLED=true +BC_MINIMUM_SLOT=4700013 + +KG_INCREMENT=10000 +KG_PROCESS_KNOWN_GAPS_ENABLED=true +KG_MAX_KNOWN_GAPS_WORKER=2 +KG_MINIMUM_SLOT=4700013 + +PROM_HOST=host.docker.internal +PROM_PORT=9000 +PROM_METRICS_ENABLED=false diff --git a/entrypoint.sh b/entrypoint.sh index 5cc37db..e808500 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,6 +3,8 @@ sleep 10 echo "Starting ipld-eth-beacon-indexer" +cat /root/ipld-eth-beacon-config-docker.json | envsubst > /root/ipld-eth-beacon-config.json + echo /root/ipld-eth-beacon-indexer capture ${CAPTURE_MODE} --config /root/ipld-eth-beacon-config.json > /root/ipld-eth-beacon-indexer.output if [ ${CAPTURE_MODE} == "boot" ]; then @@ -14,9 +16,10 @@ if [ ${CAPTURE_MODE} == "boot" ]; then else echo "ipld-eth-beacon-indexer boot succeeded" fi - echo $rv > /root/HEALTH - echo $rv - cat /root/ipld-eth-beacon-indexer.output + + echo $rv > /root/HEALTH + echo $rv + cat /root/ipld-eth-beacon-indexer.output tail -f /dev/null else diff --git a/ipld-eth-beacon-config-docker.json b/ipld-eth-beacon-config-docker.json new file mode 100644 index 0000000..2a12897 --- /dev/null +++ b/ipld-eth-beacon-config-docker.json @@ -0,0 +1,44 @@ +{ + "db": { + "address": "${POSTGRES_HOST}", + "password": "${POSTGRES_PASSWORD}", + "port": ${POSTGRES_PORT}, + "username": "${POSTGRES_USER}", + "name": "${POSTGRES_DB}", + "driver": "PGX" + }, + "bc": { + "address": "${LIGHTHOUSE_HOST}", + "port": ${LIGHTHOUSE_PORT}, + "type": "lighthouse", + "bootRetryInterval": 30, + "bootMaxRetry": 5, + "maxHistoricProcessWorker": ${BC_MAX_HISTORIC_PROCESS_WORKER}, + "connectionProtocol": "${LIGHTHOUSE_PROTOCOL}", + "uniqueNodeIdentifier": ${BC_UNIQUE_NODE_IDENTIFIER}, + "checkDb": ${BC_CHECK_DB}, + "performBeaconStateProcessing": ${BC_BEACON_STATE_PROCESSING_ENABLED}, + "performBeaconBlockProcessing": ${BC_BEACON_BLOCK_PROCESSING_ENABLED}, + "minimumSlot": ${BC_MINIMUM_SLOT} + }, + "t": { + "skipSync": true + }, + "log": { + "level": "${LOG_LEVEL}", + "output": true, + "file": "./ipld-eth-beacon-indexer.log", + "format": "json" + }, + "kg": { + "increment": ${KG_INCREMENT}, + "processKnownGaps": ${KG_PROCESS_KNOWN_GAPS_ENABLED}, + "maxKnownGapsWorker": ${KG_MAX_KNOWN_GAPS_WORKER}, + "minimumSlot": ${KG_MINIMUM_SLOT} + }, + "pm": { + "address": "${PROM_HOST}", + "port": ${PROM_PORT}, + "metrics": ${PROM_METRICS_ENABLED} + } +} diff --git a/ipld-eth-beacon-config.json b/ipld-eth-beacon-config.json deleted file mode 100644 index 7a22376..0000000 --- a/ipld-eth-beacon-config.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "db": { - "address": "localhost", - "password": "password", - "port": 5432, - "username": "vdbm", - "name": "vulcanize_db", - "driver": "PGX" - }, - "bc": { - "address": "localhost", - "port": 5052, - "type": "lighthouse", - "bootRetryInterval": 30, - "bootMaxRetry": 5, - "maxHistoricProcessWorker": 2, - "connectionProtocol": "http", - "uniqueNodeIdentifier": 100, - "checkDb": true, - "performBeaconStateProcessing": false, - "performBeaconBlockProcessing": true, - "minimumSlot": 4700013 - }, - "t": { - "skipSync": true - }, - "log": { - "level": "debug", - "output": true, - "file": "./ipld-eth-beacon-indexer.log", - "format": "json" - }, - "kg": { - "increment": 10000, - "processKnownGaps": true, - "maxKnownGapsWorker": 2, - "minimumSlot": 4700013 - }, - "pm": { - "address": "localhost", - "port": 9000, - "metrics": true - } -} -- 2.45.2 From 390c859f472dbb52c360198bd27e949b4a0e1b09 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Wed, 2 Nov 2022 21:12:57 -0500 Subject: [PATCH 5/6] Get e2e test from env, and also allow defaults. --- pkg/beaconclient/e2emerge_test.go | 40 +++++++++++++++++++---- pkg/beaconclient/systemvalidation_test.go | 14 ++------ 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/pkg/beaconclient/e2emerge_test.go b/pkg/beaconclient/e2emerge_test.go index d6c9073..bd721b1 100644 --- a/pkg/beaconclient/e2emerge_test.go +++ b/pkg/beaconclient/e2emerge_test.go @@ -17,12 +17,14 @@ import ( "github.com/vulcanize/ipld-eth-beacon-indexer/pkg/beaconclient" "github.com/vulcanize/ipld-eth-beacon-indexer/pkg/database/sql" "math/big" + "os" + "strconv" "time" ) var _ = Describe("e2emerge", Label("e2e"), func() { e2eConfig := TestConfig - e2eConfig.port = 5052 + e2eConfig.port = getEnvInt("TEST_E2E_LIGHTHOUSE_PORT", 5052) e2eConfig.performBeaconStateProcessing = false e2eConfig.performBeaconBlockProcessing = true @@ -123,10 +125,10 @@ func sendTestTx() (*SentTx, error) { tx, err := sendTransaction( ctx, eth, - "0xe6ce22afe802caf5ff7d3845cec8c736ecc8d61f", - "0xe22AD83A0dE117bA0d03d5E94Eb4E0d80a69C62a", - 10, - "0x888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218", + getEnvStr("TEST_E2E_FROM_ADDR", "0xe6ce22afe802caf5ff7d3845cec8c736ecc8d61f"), + getEnvStr("TEST_E2E_TO_ADDR", "0xe22AD83A0dE117bA0d03d5E94Eb4E0d80a69C62a"), + int64(getEnvInt("TEST_E2E_AMOUNT", 10)), + getEnvStr("TEST_E2E_SIGNING_KEY", "0x888814df89c4358d7ddb3fa4b0213e7331239a80e1f013eaa7b2deca2a41a218"), ) Expect(err).ToNot(HaveOccurred()) @@ -155,7 +157,7 @@ func sendTestTx() (*SentTx, error) { } func createClient() (*ethclient.Client, error) { - return ethclient.Dial("http://localhost:8545") + return ethclient.Dial(getEnvStr("TEST_E2E_GETH_URL", "http://localhost:8545")) } // sendTransaction sends a transaction with 1 ETH to a specified address. @@ -165,7 +167,7 @@ func sendTransaction(ctx context.Context, eth *ethclient.Client, fromAddr string to = common.HexToAddress(toAddr) sk = crypto.ToECDSAUnsafe(common.FromHex(signingKey)) value = big.NewInt(amount) - gasLimit = uint64(21000) + gasLimit = uint64(getEnvInt("TEST_E2E_GAS_LIMIT", 21000)) ) // Retrieve the chainid (needed for signer) chainid, err := eth.ChainID(ctx) @@ -180,6 +182,8 @@ func sendTransaction(ctx context.Context, eth *ethclient.Client, fromAddr string // Get suggested gas price tipCap, _ := eth.SuggestGasTipCap(ctx) feeCap, _ := eth.SuggestGasPrice(ctx) + log.Info("Tip cap: ", tipCap) + log.Info("Fee cap: ", feeCap) // Create a new transaction tx := types.NewTx( &types.DynamicFeeTx{ @@ -197,3 +201,25 @@ func sendTransaction(ctx context.Context, eth *ethclient.Client, fromAddr string // Send the transaction to our node return signedTx, eth.SendTransaction(ctx, signedTx) } + +func getEnvStr(envVar string, def string) string { + value, set := os.LookupEnv(envVar) + if set { + return value + } else { + return def + } +} + +func getEnvInt(envVar string, def int) int { + value, set := os.LookupEnv(envVar) + if set { + number, err := strconv.Atoi(value) + if err != nil { + return def + } + return number + } else { + return def + } +} diff --git a/pkg/beaconclient/systemvalidation_test.go b/pkg/beaconclient/systemvalidation_test.go index 26aa417..5c3c76d 100644 --- a/pkg/beaconclient/systemvalidation_test.go +++ b/pkg/beaconclient/systemvalidation_test.go @@ -3,7 +3,6 @@ package beaconclient_test import ( log "github.com/sirupsen/logrus" "os" - "strconv" "time" . "github.com/onsi/ginkgo/v2" @@ -15,9 +14,9 @@ var ( prodConfig = Config{ protocol: os.Getenv("bc_protocol"), address: os.Getenv("bc_address"), - port: getEnvInt(os.Getenv("bc_port")), + port: getEnvInt(os.Getenv("bc_port"), 5052), dbHost: os.Getenv("db_host"), - dbPort: getEnvInt(os.Getenv("db_port")), + dbPort: getEnvInt(os.Getenv("db_port"), 8076), dbName: os.Getenv("db_name"), dbUser: os.Getenv("db_user"), dbPassword: os.Getenv("db_password"), @@ -62,15 +61,6 @@ var _ = Describe("Systemvalidation", Label("system"), func() { }) }) -// Wrapper function to get int env variables. -func getEnvInt(envVar string) int { - val, err := strconv.Atoi(envVar) - if err != nil { - return 0 - } - return val -} - // Start head tracking and wait for the expected results. func processProdHeadBlocks(bc *beaconclient.BeaconClient, expectedInserts, expectedReorgs, expectedKnownGaps, expectedKnownGapsReprocessError uint64) { go bc.CaptureHead() -- 2.45.2 From a54776c239916af579cb0a90b96bbbeaebc14bcc Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Wed, 2 Nov 2022 21:29:47 -0500 Subject: [PATCH 6/6] Remove compose stuff. --- docker-compose.yml | 36 ------------------------------------ docker.env | 28 ---------------------------- 2 files changed, 64 deletions(-) delete mode 100644 docker-compose.yml delete mode 100644 docker.env diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index c57e85b..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,36 +0,0 @@ -version: "3.2" -services: - ipld-eth-beacon-db: - hostname: ipld-eth-beacon-db - env_file: - - docker.env - restart: always - build: - dockerfile: ../ipld-eth-beacon-db/Dockerfile - context: ../ipld-eth-beacon-db - image: cerc/ipld-eth-beacon-db:local - healthcheck: - test: ["CMD", "nc", "-v", "localhost", "5432"] - interval: 5s - timeout: 3s - retries: 5 - volumes: - - vdb_db_eth-beacon_db:/var/lib/postgresql/data - ports: - - "5432" - command: ["postgres", "-c", "log_min_duration_statement=250"] - - ipld-eth-beacon-indexer: - hostname: ipld-eth-beacon-indexer - env_file: - - docker.env - restart: always - build: - dockerfile: ./Dockerfile - context: . - depends_on: - - ipld-eth-beacon-db - image: cerc/ipld-eth-beacon-indexer:local - -volumes: - vdb_db_eth-beacon_db: diff --git a/docker.env b/docker.env deleted file mode 100644 index c2763b0..0000000 --- a/docker.env +++ /dev/null @@ -1,28 +0,0 @@ -POSTGRES_HOST=ipld-eth-beacon-db -POSTGRES_PASSWORD=CHANGEME -POSTGRES_PORT=5432 -POSTGRES_USER=ethbeacondb -POSTGRES_DB=ethbeacondb - -LIGHTHOUSE_HOST=host.docker.internal -LIGHTHOUSE_PORT=5052 -LIGHTHOUSE_PROTOCOL=http - -CAPTURE_MODE=head -LOG_LEVEL=debug - -BC_MAX_HISTORIC_PROCESS_WORKER=2 -BC_UNIQUE_NODE_IDENTIFIER=100 -BC_CHECK_DB=true -BC_BEACON_STATE_PROCESSING_ENABLED=false -BC_BEACON_BLOCK_PROCESSING_ENABLED=true -BC_MINIMUM_SLOT=4700013 - -KG_INCREMENT=10000 -KG_PROCESS_KNOWN_GAPS_ENABLED=true -KG_MAX_KNOWN_GAPS_WORKER=2 -KG_MINIMUM_SLOT=4700013 - -PROM_HOST=host.docker.internal -PROM_PORT=9000 -PROM_METRICS_ENABLED=false -- 2.45.2