e2e: tidy up docker-compose file #81
Conversation
joshuasing
force-pushed
the
joshua/e2e/docker-compose
branch
from
c7d08e3 to
bc0c9b9
Compare
There was a problem hiding this comment.
hey @joshuasing this looks good at first glance, give me some time to test; I am caught up with a few other things at the moment.
* Use double quotes in docker-compose.yml to help with consistency * Reorder some blocks to help with readability and maintainability * Pin all images to their SHA256 digests * Add healthcheck to op-geth-l2 so that op-node/op-proposer only start after op-geth-l2 has generated /l2configs/rollup.json * Remove `e2e/deployments` and remove the volume from op-geth-l2
joshuasing
force-pushed
the
joshua/e2e/docker-compose
branch
from
bc0c9b9 to
b352bd4
Compare
There was a problem hiding this comment.
hey @joshuasing , I did some testing to see if we could remove the deployments directory. I did the following:
docker compose -f ./e2e/docker-compose.yml build --no-cache op-geth-l2
that builds the l2 image without using the cache, this guarantees we don't accidentally have deployments cached in an image layer.
then I ran the stack as usual:
docker compose -f ./e2e/docker-compose.yml down -v --remove-orphans
docker compose -f ./e2e/docker-compose.yml up
and I received the following error:
op-geth-l2-1 | t=2024-04-18T12:41:25+0000 lvl=info msg="Deploy config" path=/git/optimism/packages/contracts-bedrock/deploy-config/devnetL1.json
op-geth-l2-1 | t=2024-04-18T12:41:25+0000 lvl=info msg="Deployment directory" path=/git/optimism/packages/contracts-bedrock/deployments/devnetL1
op-geth-l2-1 | t=2024-04-18T12:41:25+0000 lvl=crit msg="Application failed" message="cannot find L1StandardBridgeProxy artifact: cannot find deployment: L1StandardBridgeProxy"
op-geth-l2-1 exited with code 1
I believe this was working for you because you had deployments cached in a layer in your l2 image 🤔
I vote we keep deployments in, but we use the COPY directive instead of mounting them as a volume, this way if they change they don't change in the repo
what do you think?
edit: I am realizing that they were mounted as a volume, so I don't think they would be cached in a layer. however it looks like we need them regardless, based on the error message
There was a problem hiding this comment.
hey @joshuasing this looks good, thanks for doing this 👍
tested the following, and passing ✅
- receiving pop payouts for each keystone
- transactions rolled up to l1 with the correct
toaddress deploymentsfiles not modified
* Use double quotes in docker-compose.yml to help with consistency * Reorder some blocks to help with readability and maintainability * Pin all images to their SHA256 digests * Add healthcheck to op-geth-l2 so that op-node/op-proposer only start after op-geth-l2 has generated /l2configs/rollup.json * Use COPY for `e2e/deployments` in optimism-stack Dockerfile, to prevent them from being changed on the file system
Summary
Tidy up
e2e/docker-compose.ymlfile to help with consistency, readability and mainability.Changes
e2e/deploymentsand remove the volume from op-geth-l2