ops: update docker-compose-nobuild.yml

Can bring up the system without needing to build locally using the following command: ``` $ docker-compose -f docker-compose-nobuild.yml up ```

ops: update docker-compose-nobuild.yml
Can bring up the system without needing to build locally using the following command: ``` $ docker-compose -f docker-compose-nobuild.yml up ```
938807ba · Ori Pomerantz · Kelvin Fichter · b3974093 · 938807ba · 938807ba
Commit 938807ba authored Oct 19, 2021 by Ori Pomerantz Committed by Kelvin Fichter Nov 10, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 36 additions and 98 deletions

docker-compose-nobuild.yml ops/docker-compose-nobuild.yml +20 -83

docker-compose.yml ops/docker-compose.yml +11 -13

geth.env ops/envs/geth.env +5 -2

No files found.
--- a/ops/docker-compose-nobuild.yml
+++ b/ops/docker-compose-nobuild.yml
-# TODO: Prefix all env vars with service name
-# TODO: Allow specifing the image tag to use
 version: "3"
 services:
-  # base service builder
-  # builder:
-  #   image: ethereumoptimism/builder
-#    build:
-#      context: ..
-#      dockerfile: ./ops/docker/Dockerfile.monorepo
-  # this is a helper service used because there's no official hardhat image
  l1_chain:
-    image: ethereumoptimism/hardhat
-#    build:
-#      context: ./docker/hardhat
-#      dockerfile: Dockerfile
+    image: ethereumoptimism/hardhat-node:${DOCKER_TAG:-prerelease-0.5.0-rc-7-ee217ce}
+    build:
+      context: ./docker/hardhat
+      dockerfile: Dockerfile
    ports:
        # expose the service to the host for integration testing
      - ${L1CHAIN_HTTP_PORT:-9545}:8545
+
  deployer:
    depends_on:
      - l1_chain
-    image: ethereumoptimism/deployer:prerelease-0.5.0-rc-1-4d0c922
-#    build:
-#      context: ..
-#      dockerfile: ./ops/docker/Dockerfile.deployer
+    image: ethereumoptimism/deployer:${DOCKER_TAG:-prerelease-0.5.0-rc-7-ee217ce}
    entrypoint: ./deployer.sh
    environment:
        FRAUD_PROOF_WINDOW_SECONDS: 0
@@ -36,8 +25,8 @@ services:
        WHITELIST_OWNER: "0x0000000000000000000000000000000000000000"
        L1_FEE_WALLET_ADDRESS: "0x391716d440c151c42cdf1c95c1d83a5427bca52c"
        L2_CHAIN_ID: 420
-        L2_BLOCK_GAS_LIMIT: 11000000
        BLOCK_SIGNER_ADDRESS: "0x00000398232E2064F896018496b4b44b3D62751F"
+        L2_BLOCK_GAS_LIMIT: 15000000
        GAS_PRICE_ORACLE_OVERHEAD: "2750"
        GAS_PRICE_ORACLE_SCALAR: "1500000"
        GAS_PRICE_ORACLE_L1_BASE_FEE: "1"
@@ -49,21 +38,16 @@ services:
    ports:
        # expose the service to the host for getting the contract addrs
      - ${DEPLOYER_PORT:-8080}:8081
+
  dtl:
    depends_on:
      - l1_chain
      - deployer
      - l2geth
-    image: ethereumoptimism/data-transport-layer:prerelease-0.5.0-rc-1-4d0c922
-#    build:
-#      context: ..
-#      dockerfile: ./ops/docker/Dockerfile.data-transport-layer
-    # override with the dtl script and the env vars required for it
+    image: ethereumoptimism/data-transport-layer:${DOCKER_TAG:-prerelease-0.5.0-rc-7-ee217ce}
    entrypoint: ./dtl.sh
    env_file:
      -  ./envs/dtl.env
-    # set the rest of the env vars for the network whcih do not
-    # depend on the docker-compose setup
    environment:
        # used for setting the address manager address
        URL: http://deployer:8081/addresses.json
@@ -74,15 +58,12 @@ services:
        DATA_TRANSPORT_LAYER__L2_CHAIN_ID: 420
    ports:
      - ${DTL_PORT:-7878}:7878
+
  l2geth:
    depends_on:
      - l1_chain
      - deployer
-    image: ethereumoptimism/l2geth:prerelease-0.5.0-rc-1-4d0c922
-#    build:
-#      context: ..
-#      dockerfile: ./ops/docker/Dockerfile.geth
-    # override with the geth script and the env vars required for it
+    image: ethereumoptimism/l2geth:${DOCKER_TAG:-prerelease-0.5.0-rc-7-ee217ce}
    entrypoint: sh ./geth.sh
    env_file:
      - ./envs/geth.env
@@ -94,40 +75,16 @@ services:
        ROLLUP_CLIENT_HTTP: http://dtl:7878
        ETH1_CTC_DEPLOYMENT_HEIGHT: 8
        RETRIES: 60
-        # no need to keep this secret, only used internally to sign blocks
-        BLOCK_SIGNER_KEY: "6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27"
-        BLOCK_SIGNER_ADDRESS: "0x00000398232E2064F896018496b4b44b3D62751F"
    ports:
      - ${L2GETH_HTTP_PORT:-8545}:8545
      - ${L2GETH_WS_PORT:-8546}:8546
-  relayer:
-    depends_on:
-      - l1_chain
-      - deployer
-      - l2geth
-    image: ethereumoptimism/message-relayer:prerelease-0.5.0-rc-1-4d0c922
-#    build:
-#      context: ..
-#      dockerfile: ./ops/docker/Dockerfile.message-relayer
-    entrypoint: ./relayer.sh
-    environment:
-        L1_NODE_WEB3_URL: http://l1_chain:8545
-        L2_NODE_WEB3_URL: http://l2geth:8545
-        URL: http://deployer:8081/addresses.json
-        # a funded hardhat account
-        L1_WALLET_KEY: "0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97"
-        RETRIES: 60
-        POLLING_INTERVAL: 500
-        GET_LOGS_INTERVAL: 500
+
  batch_submitter:
    depends_on:
      - l1_chain
      - deployer
      - l2geth
-    image: ethereumoptimism/batch-submitter:prerelease-0.5.0-rc-1-4d0c922
-#    build:
-#      context: ..
-#      dockerfile: ./ops/docker/Dockerfile.batch-submitter
+    image: ethereumoptimism/batch-submitter:${DOCKER_TAG:-prerelease-0.5.0-rc-7-ee217ce}
    entrypoint: ./batches.sh
    env_file:
      - ./envs/batches.env
@@ -136,17 +93,15 @@ services:
        L2_NODE_WEB3_URL: http://l2geth:8545
        URL: http://deployer:8081/addresses.json
        SEQUENCER_PRIVATE_KEY: "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
+
  verifier:
    depends_on:
      - l1_chain
      - deployer
      - dtl
-    image: ethereumoptimism/l2geth:prerelease-0.5.0-rc-1-4d0c922
+    image: ethereumoptimism/l2geth:${DOCKER_TAG:-prerelease-0.5.0-rc-7-ee217ce}
    deploy:
      replicas: 0
-#    build:
-#      context: ..
-#      dockerfile: ./ops/docker/Dockerfile.geth
    entrypoint: sh ./geth.sh
    env_file:
      - ./envs/geth.env
@@ -155,21 +110,19 @@ services:
        ROLLUP_STATE_DUMP_PATH: http://deployer:8081/state-dump.latest.json
        ROLLUP_CLIENT_HTTP: http://dtl:7878
        ROLLUP_BACKEND: 'l1'
+        ROLLUP_VERIFIER_ENABLE: 'true'
        ETH1_CTC_DEPLOYMENT_HEIGHT: 8
        RETRIES: 60
-        ROLLUP_VERIFIER_ENABLE: 'true'
    ports:
      - ${VERIFIER_HTTP_PORT:-8547}:8545
      - ${VERIFIER_WS_PORT:-8548}:8546
+
  replica:
    depends_on:
      - dtl
-    image: ethereumoptimism/l2geth:prerelease-0.5.0-rc-1-4d0c922
+    image: ethereumoptimism/l2geth:${DOCKER_TAG:-prerelease-0.5.0-rc-7-ee217ce}
    deploy:
      replicas: 0
-#    build:
-#      context: ..
-#      dockerfile: ./ops/docker/Dockerfile.geth
    entrypoint: sh ./geth.sh
    env_file:
      - ./envs/geth.env
@@ -184,27 +137,11 @@ services:
    ports:
      - ${L2GETH_HTTP_PORT:-8549}:8545
      - ${L2GETH_WS_PORT:-8550}:8546
-#  integration_tests:
-#    image: ethereumoptimism/integration-tests
-#    deploy:
-#       replicas: 0
-#    build:
-#      context: ..
-#      dockerfile: ./ops/docker/Dockerfile.integration-tests
-#    entrypoint: ./integration-tests.sh
-#    environment:
-#      L1_URL: http://l1_chain:8545
-#      L2_URL: http://l2geth:8545
-#      URL: http://deployer:8081/addresses.json
-#      ENABLE_GAS_REPORT: 1
-#      NO_NETWORK: 1
+
  gas_oracle:
-    image: ethereumoptimism/gas-oracle:prerelease-0.5.0-rc-1-4d0c922
+    image: ethereumoptimism/gas-oracle:${DOCKER_TAG:-prerelease-0.5.0-rc-7-ee217ce}
    deploy:
       replicas: 0
-#    build:
-#      context: ..
-#      dockerfile: ./ops/docker/Dockerfile.gas-oracle
    entrypoint: ./gas-oracle.sh
    environment:
      GAS_PRICE_ORACLE_ETHEREUM_HTTP_URL: http://l2geth:8545

--- a/ops/docker-compose.yml
+++ b/ops/docker-compose.yml
-# TODO: Prefix all env vars with service name
-# TODO: Allow specifing the image tag to use
 version: "3"

 services:
  # base service builder
  builder:
-    image: ethereumoptimism/builder
+    image: ethereumoptimism/builder:${DOCKER_TAG:-latest}
    build:
      context: ..
      dockerfile: ./ops/docker/Dockerfile.monorepo

  # this is a helper service used because there's no official hardhat image
  l1_chain:
-    image: ethereumoptimism/hardhat
+    image: ethereumoptimism/hardhat:${DOCKER_TAG:-latest}
    build:
      context: ./docker/hardhat
      dockerfile: Dockerfile
@@ -23,7 +21,7 @@ services:
  deployer:
    depends_on:
      - l1_chain
-    image: ethereumoptimism/deployer
+    image: ethereumoptimism/deployer:${DOCKER_TAG:-latest}
    build:
      context: ..
      dockerfile: ./ops/docker/Dockerfile.deployer
@@ -58,7 +56,7 @@ services:
      - l1_chain
      - deployer
      - l2geth
-    image: ethereumoptimism/data-transport-layer
+    image: ethereumoptimism/data-transport-layer:${DOCKER_TAG:-latest}
    build:
      context: ..
      dockerfile: ./ops/docker/Dockerfile.data-transport-layer
@@ -83,7 +81,7 @@ services:
    depends_on:
      - l1_chain
      - deployer
-    image: ethereumoptimism/l2geth
+    image: ethereumoptimism/l2geth:${DOCKER_TAG:-latest}
    build:
      context: ..
      dockerfile: ./ops/docker/Dockerfile.geth
@@ -111,7 +109,7 @@ services:
      - l1_chain
      - deployer
      - l2geth
-    image: ethereumoptimism/message-relayer
+    image: ethereumoptimism/message-relayer:${DOCKER_TAG:-latest}
    build:
      context: ..
      dockerfile: ./ops/docker/Dockerfile.message-relayer
@@ -131,7 +129,7 @@ services:
      - l1_chain
      - deployer
      - l2geth
-    image: ethereumoptimism/batch-submitter
+    image: ethereumoptimism/batch-submitter:${DOCKER_TAG:-latest}
    build:
      context: ..
      dockerfile: ./ops/docker/Dockerfile.batch-submitter
@@ -149,7 +147,7 @@ services:
      - l1_chain
      - deployer
      - dtl
-    image: ethereumoptimism/l2geth
+    image: ethereumoptimism/l2geth:${DOCKER_TAG:-latest}
    deploy:
      replicas: 0
    build:
@@ -173,7 +171,7 @@ services:
  replica:
    depends_on:
      - dtl
-    image: ethereumoptimism/l2geth
+    image: ethereumoptimism/l2geth:${DOCKER_TAG:-latest}
    deploy:
      replicas: 0
    build:
@@ -195,7 +193,7 @@ services:
      - ${L2GETH_WS_PORT:-8550}:8546

  integration_tests:
-    image: ethereumoptimism/integration-tests
+    image: ethereumoptimism/integration-tests:${DOCKER_TAG:-latest}
    deploy:
       replicas: 0
    build:
@@ -210,7 +208,7 @@ services:
      NO_NETWORK: 1

  gas_oracle:
-    image: ethereumoptimism/gas-oracle
+    image: ethereumoptimism/gas-oracle:${DOCKER_TAG:-latest}
    deploy:
       replicas: 0
    build:

--- a/ops/envs/geth.env
+++ b/ops/envs/geth.env
@@ -8,8 +8,6 @@ ROLLUP_POLL_INTERVAL_FLAG=500ms
 ROLLUP_ENABLE_L2_GAS_POLLING=true
 # ROLLUP_ENFORCE_FEES=

-ETHERBASE=0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf
-
 RPC_ENABLE=true
 RPC_ADDR=0.0.0.0
 RPC_PORT=8545
@@ -33,3 +31,8 @@ NO_USB=true
 NO_DISCOVER=true
 TARGET_GAS_LIMIT=11000000
 USING_OVM=true
+
+BLOCK_SIGNER_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27
+BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
+
+L2_BLOCK_GAS_LIMIT=15000000