docker: fix entrypoints (ethereum#65)

streamingfast · Oct 27, 2020 · b2e6790 · b2e6790
1 parent 628a0e3
commit b2e6790
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 47 deletions.
diff --git a/docker/dev_entrypoint.sh b/docker/dev_entrypoint.sh
@@ -16,29 +16,24 @@ TX_INGESTION_POLL_INTERVAL=${TX_INGESTION_POLL_INTERVAL:-3s}
 TX_INGESTION_DB_USER=${TX_INGESTION_DB_USER:-test}
 TX_INGESTION_DB_PASSWORD=${TX_INGESTION_DB_PASSWORD:-test}
 
-if [ -n "$REBUILD" ]; then
-    echo -e "\nRebuilding geth\n"
-    make geth
-else
-    echo "Starting Geth..."
-    ./build/bin/geth --dev \
-      --datadir $VOLUME_PATH \
-      --rpc \
-      --rpcaddr $HOSTNAME \
-      --rpcvhosts='*' \
-      --rpccorsdomain='*' \
-      --rpcport $PORT \
-      --ipcdisable \
-      --networkid $NETWORK_ID \
-      --rpcapi 'eth,net' \
-      --gasprice '0' \
-      --targetgaslimit $TARGET_GAS_LIMIT \
-      --nousb \
-      --gcmode=archive \
-      --verbosity "6" \
-      --txingestion.enable="$TX_INGESTION" \
-      --txingestion.dbhost=$TX_INGESTION_DB_HOST \
-      --txingestion.pollinterval=$TX_INGESTION_POLL_INTERVAL \
-      --txingestion.dbuser=$TX_INGESTION_DB_USER \
-      --txingestion.dbpassword=$TX_INGESTION_DB_PASSWORD
-fi
+echo "Starting Geth..."
+./build/bin/geth --dev \
+    --datadir $VOLUME_PATH \
+    --rpc \
+    --rpcaddr $HOSTNAME \
+    --rpcvhosts='*' \
+    --rpccorsdomain='*' \
+    --rpcport $PORT \
+    --ipcdisable \
+    --networkid $NETWORK_ID \
+    --rpcapi 'eth,net,rollup' \
+    --gasprice '0' \
+    --targetgaslimit $TARGET_GAS_LIMIT \
+    --nousb \
+    --gcmode=archive \
+    --verbosity "6" \
+    --txingestion.enable="$TX_INGESTION" \
+    --txingestion.dbhost=$TX_INGESTION_DB_HOST \
+    --txingestion.pollinterval=$TX_INGESTION_POLL_INTERVAL \
+    --txingestion.dbuser=$TX_INGESTION_DB_USER \
+    --txingestion.dbpassword=$TX_INGESTION_DB_PASSWORD
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -24,24 +24,23 @@ if [[ -n "$CLEAR_DATA_KEY" && ! -f "$CLEAR_DATA_FILE_PATH" ]]; then
 fi
 
 echo "Starting Geth..."
-## Command to kick off geth
 geth --dev \
-  --datadir $VOLUME_PATH \
-  --rpc \
-  --rpcaddr $HOSTNAME \
-  --rpcvhosts='*' \
-  --rpccorsdomain='*' \
-  --rpcport $PORT \
-  --networkid $NETWORK_ID \
-  --ipcdisable \
-  --rpcapi 'eth,net' \
-  --gasprice '0' \
-  --targetgaslimit $TARGET_GAS_LIMIT \
-  --nousb \
-  --gcmode=archive \
-  --verbosity "6" \
-  --txingestion.enable=$TX_INGESTION \
-  --txingestion.dbhost=$TX_INGESTION_DB_HOST \
-  --txingestion.pollinterval=$TX_INGESTION_POLL_INTERVAL \
-  --txingestion.dbuser=$TX_INGESTION_DB_USER \
-  --txingestion.dbpassword=$TX_INGESTION_DB_PASSWORD
+    --datadir $VOLUME_PATH \
+    --rpc \
+    --rpcaddr $HOSTNAME \
+    --rpcvhosts='*' \
+    --rpccorsdomain='*' \
+    --rpcport $PORT \
+    --networkid $NETWORK_ID \
+    --ipcdisable \
+    --rpcapi 'eth,net,rollup' \
+    --gasprice '0' \
+    --targetgaslimit $TARGET_GAS_LIMIT \
+    --nousb \
+    --gcmode=archive \
+    --verbosity "6" \
+    --txingestion.enable=$TX_INGESTION \
+    --txingestion.dbhost=$TX_INGESTION_DB_HOST \
+    --txingestion.pollinterval=$TX_INGESTION_POLL_INTERVAL \
+    --txingestion.dbuser=$TX_INGESTION_DB_USER \
+    --txingestion.dbpassword=$TX_INGESTION_DB_PASSWORD
diff --git a/docker/verifier_entrypoint.sh b/docker/verifier_entrypoint.sh
@@ -30,7 +30,7 @@ geth --dev \
     --rpcport $PORT \
     --networkid $NETWORK_ID \
     --ipcdisable \
-    --rpcapi 'eth,net' \
+    --rpcapi 'eth,net,rollup' \
     --gasprice '0' \
     --targetgaslimit $TARGET_GAS_LIMIT \
     --nousb \