Commit 8ae059c6 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

docker: correctly tag and fix entrypoints (#434)

parent d214b3dc
...@@ -5,14 +5,14 @@ version: "3" ...@@ -5,14 +5,14 @@ version: "3"
services: services:
# base service builder # base service builder
builder: builder:
image: ethereumoptimism:builder image: ethereumoptimism/builder
build: build:
context: .. context: ..
dockerfile: ./ops/docker/Dockerfile.monorepo dockerfile: ./ops/docker/Dockerfile.monorepo
# this is a helper service used because there's no official hardhat image # this is a helper service used because there's no official hardhat image
l1_chain: l1_chain:
image: ethereumoptimism:hardhat image: ethereumoptimism/hardhat
build: build:
context: ./docker/hardhat context: ./docker/hardhat
dockerfile: Dockerfile dockerfile: Dockerfile
...@@ -21,7 +21,7 @@ services: ...@@ -21,7 +21,7 @@ services:
- ${L1_CHAIN_PORT:-9545}:8545 - ${L1_CHAIN_PORT:-9545}:8545
deployer: deployer:
image: ethereumoptimism:deployer image: ethereumoptimism/deployer
build: build:
context: .. context: ..
dockerfile: ./ops/docker/Dockerfile.deployer dockerfile: ./ops/docker/Dockerfile.deployer
...@@ -37,7 +37,7 @@ services: ...@@ -37,7 +37,7 @@ services:
- ${DEPLOYER_PORT:-8080}:8081 - ${DEPLOYER_PORT:-8080}:8081
dtl: dtl:
image: ethereumoptimism:data-transport-layer image: ethereumoptimism/data-transport-layer
build: build:
context: .. context: ..
dockerfile: ./ops/docker/Dockerfile.dtl dockerfile: ./ops/docker/Dockerfile.dtl
...@@ -58,7 +58,7 @@ services: ...@@ -58,7 +58,7 @@ services:
- ${DTL_PORT:-7878}:7878 - ${DTL_PORT:-7878}:7878
l2geth: l2geth:
image: ethereumoptimism:l2geth image: ethereumoptimism/l2geth
build: build:
context: .. context: ..
dockerfile: ./ops/docker/Dockerfile.geth dockerfile: ./ops/docker/Dockerfile.geth
...@@ -80,7 +80,7 @@ services: ...@@ -80,7 +80,7 @@ services:
- ${L2GETH_WS_PORT:-8546}:8546 - ${L2GETH_WS_PORT:-8546}:8546
relayer: relayer:
image: ethereumoptimism:relayer image: ethereumoptimism/relayer
build: build:
context: .. context: ..
dockerfile: ./ops/docker/Dockerfile.relayer dockerfile: ./ops/docker/Dockerfile.relayer
...@@ -96,7 +96,7 @@ services: ...@@ -96,7 +96,7 @@ services:
GET_LOGS_INTERVAL: 500 GET_LOGS_INTERVAL: 500
batch_submitter: batch_submitter:
image: ethereumoptimism:batch-submitter image: ethereumoptimism/batch-submitter
build: build:
context: .. context: ..
dockerfile: ./ops/docker/Dockerfile.batches dockerfile: ./ops/docker/Dockerfile.batches
......
FROM ethereumoptimism:builder AS builder FROM ethereumoptimism/builder AS builder
FROM node:14-alpine FROM node:14-alpine
......
FROM ethereumoptimism:builder AS builder FROM ethereumoptimism/builder AS builder
FROM node:14-alpine FROM node:14-alpine
......
FROM ethereumoptimism:builder AS builder FROM ethereumoptimism/builder AS builder
FROM node:14-alpine FROM node:14-alpine
......
...@@ -36,7 +36,7 @@ RUN yarn install --frozen-lockfile ...@@ -36,7 +36,7 @@ RUN yarn install --frozen-lockfile
### BUILDER: Builds the typescript ### BUILDER: Builds the typescript
FROM node FROM node
WORKDIR /optimism WORKDIR /optimism
# cache the node_modules copying step since it's expensive # cache the node_modules copying step since it's expensive
......
FROM ethereumoptimism:builder AS builder FROM ethereumoptimism/builder AS builder
FROM node:14-alpine FROM node:14-alpine
......
...@@ -10,4 +10,4 @@ export ADDRESS_MANAGER_ADDRESS=$(echo $ADDRESSES | jq -r '.AddressManager') ...@@ -10,4 +10,4 @@ export ADDRESS_MANAGER_ADDRESS=$(echo $ADDRESSES | jq -r '.AddressManager')
curl --retry-connrefused --retry $RETRIES --retry-delay 1 $L2_NODE_WEB3_URL curl --retry-connrefused --retry $RETRIES --retry-delay 1 $L2_NODE_WEB3_URL
# go # go
node ./exec/run-batch-submitter.js exec node ./exec/run-batch-submitter.js
...@@ -9,4 +9,4 @@ curl -H "Content-Type: application/json" --retry-connrefused --retry $RETRIES -- ...@@ -9,4 +9,4 @@ curl -H "Content-Type: application/json" --retry-connrefused --retry $RETRIES --
yarn run deploy yarn run deploy
# serve the addrs and the state dump # serve the addrs and the state dump
./bin/serve_dump.sh exec ./bin/serve_dump.sh
...@@ -7,4 +7,4 @@ ADDRESSES=$(curl --retry-connrefused --retry $RETRIES --retry-delay 5 $URL) ...@@ -7,4 +7,4 @@ ADDRESSES=$(curl --retry-connrefused --retry $RETRIES --retry-delay 5 $URL)
export DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=$(echo $ADDRESSES | jq -r '.AddressManager') export DATA_TRANSPORT_LAYER__ADDRESS_MANAGER=$(echo $ADDRESSES | jq -r '.AddressManager')
# go # go
node dist/src/services/run.js exec node dist/src/services/run.js
...@@ -19,4 +19,4 @@ if [ $ETH1_L1_ETH_GATEWAY_ADDRESS == null ]; then ...@@ -19,4 +19,4 @@ if [ $ETH1_L1_ETH_GATEWAY_ADDRESS == null ]; then
envSet ETH1_L1_ETH_GATEWAY_ADDRESS OVM_L1ETHGateway envSet ETH1_L1_ETH_GATEWAY_ADDRESS OVM_L1ETHGateway
fi fi
geth --verbosity=6 exec geth --verbosity=6
...@@ -10,4 +10,4 @@ export ADDRESS_MANAGER_ADDRESS=$(echo $ADDRESSES | jq -r '.AddressManager') ...@@ -10,4 +10,4 @@ export ADDRESS_MANAGER_ADDRESS=$(echo $ADDRESSES | jq -r '.AddressManager')
curl --retry-connrefused --retry $RETRIES --retry-delay 1 $L2_NODE_WEB3_URL curl --retry-connrefused --retry $RETRIES --retry-delay 1 $L2_NODE_WEB3_URL
# go # go
node ./exec/run-message-relayer.js exec node ./exec/run-message-relayer.js
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment