Commit ff0719a6 authored by Mark Tyneway's avatar Mark Tyneway Committed by Kelvin Fichter

ops: update builder dockerfile

Update build command for the integration tests to
simply use `yarn build` so that it is the same
as the rest of the packages.
parent 7b761af5
...@@ -41,6 +41,11 @@ services: ...@@ -41,6 +41,11 @@ services:
L2_CHAIN_ID: 420 L2_CHAIN_ID: 420
L2_BLOCK_GAS_LIMIT: 11000000 L2_BLOCK_GAS_LIMIT: 11000000
BLOCK_SIGNER_ADDRESS: "0x00000398232E2064F896018496b4b44b3D62751F" BLOCK_SIGNER_ADDRESS: "0x00000398232E2064F896018496b4b44b3D62751F"
GAS_PRICE_ORACLE_OVERHEAD: "2750"
GAS_PRICE_ORACLE_SCALAR: "1500000"
GAS_PRICE_ORACLE_L1_BASE_FEE: "1"
GAS_PRICE_ORACLE_GAS_PRICE: "1"
GAS_PRICE_ORACLE_DECIMALS: "6"
# skip compilation when run in docker-compose, since the contracts # skip compilation when run in docker-compose, since the contracts
# were already compiled in the builder step # were already compiled in the builder step
NO_COMPILE: 1 NO_COMPILE: 1
......
...@@ -13,10 +13,8 @@ FROM alpine as downloader ...@@ -13,10 +13,8 @@ FROM alpine as downloader
ARG VERSION=v0.7.6 ARG VERSION=v0.7.6
ARG SOLC_VERSION=${VERSION}+commit.7338295f ARG SOLC_VERSION=${VERSION}+commit.7338295f
ARG SOLC_UPSTREAM=https://github.com/ethereum/solc-bin/raw/gh-pages/linux-amd64/solc-linux-amd64-${SOLC_VERSION} ARG SOLC_UPSTREAM=https://github.com/ethereum/solc-bin/raw/gh-pages/linux-amd64/solc-linux-amd64-${SOLC_VERSION}
ARG OVM_SOLC_UPSTREAM=https://github.com/ethereum-optimism/solc-bin/raw/gh-pages/bin/soljson-${VERSION}.js
ADD $SOLC_UPSTREAM ./solc ADD $SOLC_UPSTREAM ./solc
ADD $OVM_SOLC_UPSTREAM ./ovm-solc
FROM node as builder FROM node as builder
# copy over the needed configs to run the dep installation # copy over the needed configs to run the dep installation
...@@ -54,12 +52,11 @@ COPY ./packages ./packages ...@@ -54,12 +52,11 @@ COPY ./packages ./packages
COPY ./integration-tests ./integration-tests COPY ./integration-tests ./integration-tests
# copy over solc to save time building (35+ seconds vs not doing this step) # copy over solc to save time building (35+ seconds vs not doing this step)
COPY --from=downloader solc /root/.cache/hardhat-nodejs/compilers/linux-amd64/solc-linux-amd64-v0.7.6+commit.7338295f COPY --from=downloader solc /root/.cache/hardhat-nodejs/compilers/linux-amd64/solc-linux-amd64-v0.7.6+commit.7338295f
COPY --from=downloader ovm-solc /root/.cache/hardhat-nodejs/compilers/ovm/0.7.6.js
# build it! # build it!
RUN yarn build RUN yarn build
# build integration tests' contracts # build integration tests' contracts
RUN yarn workspace @eth-optimism/integration-tests build:integration RUN yarn workspace @eth-optimism/integration-tests build
# TODO: Consider thinning up the container by trimming non-production # TODO: Consider thinning up the container by trimming non-production
# dependencies # dependencies
......
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