From a81e6de666f810f0577d31e39abc51ab1743407d Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Tue, 30 Nov 2021 17:49:25 -0800 Subject: [PATCH 1/2] docker: update all node versions to 16 node.js version 16 is currently the lts version so this commit updates each of the dockerfiles to use node version 16 --- ops/docker/Dockerfile.batch-submitter | 2 +- ops/docker/Dockerfile.data-transport-layer | 2 +- ops/docker/Dockerfile.deployer | 2 +- ops/docker/Dockerfile.integration-tests | 2 +- ops/docker/Dockerfile.message-relayer | 2 +- ops/docker/Dockerfile.monorepo | 4 ++-- ops/docker/Dockerfile.packages | 2 +- ops/docker/Dockerfile.regenesis-surgery | 2 +- ops/docker/Dockerfile.replica-healthcheck | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ops/docker/Dockerfile.batch-submitter b/ops/docker/Dockerfile.batch-submitter index c2d57f20c1d7b..a0b84461c5847 100644 --- a/ops/docker/Dockerfile.batch-submitter +++ b/ops/docker/Dockerfile.batch-submitter @@ -2,7 +2,7 @@ ARG LOCAL_REGISTRY=docker.io ARG BUILDER_TAG=latest FROM ${LOCAL_REGISTRY}/ethereumoptimism/builder:${BUILDER_TAG} AS builder -FROM node:14-alpine +FROM node:16-alpine RUN apk add --no-cache curl bash jq diff --git a/ops/docker/Dockerfile.data-transport-layer b/ops/docker/Dockerfile.data-transport-layer index c7e5dcbf83fc0..d83123f605151 100644 --- a/ops/docker/Dockerfile.data-transport-layer +++ b/ops/docker/Dockerfile.data-transport-layer @@ -2,7 +2,7 @@ ARG LOCAL_REGISTRY=docker.io ARG BUILDER_TAG=latest FROM ${LOCAL_REGISTRY}/ethereumoptimism/builder:${BUILDER_TAG} AS builder -FROM node:14-alpine +FROM node:16-alpine RUN apk add --no-cache curl bash jq diff --git a/ops/docker/Dockerfile.deployer b/ops/docker/Dockerfile.deployer index c1498fffa22de..1a3d98f65298e 100644 --- a/ops/docker/Dockerfile.deployer +++ b/ops/docker/Dockerfile.deployer @@ -2,7 +2,7 @@ ARG LOCAL_REGISTRY=docker.io ARG BUILDER_TAG=latest FROM ${LOCAL_REGISTRY}/ethereumoptimism/builder:${BUILDER_TAG} AS builder -FROM node:14-alpine +FROM node:16-alpine RUN apk add --no-cache git curl python3 bash jq diff --git a/ops/docker/Dockerfile.integration-tests b/ops/docker/Dockerfile.integration-tests index a69dab2b16a73..d90824da6b7f8 100644 --- a/ops/docker/Dockerfile.integration-tests +++ b/ops/docker/Dockerfile.integration-tests @@ -2,7 +2,7 @@ ARG LOCAL_REGISTRY=docker.io ARG BUILDER_TAG=latest FROM ${LOCAL_REGISTRY}/ethereumoptimism/builder:${BUILDER_TAG} AS builder -FROM node:14-alpine +FROM node:16-alpine RUN apk add --no-cache git curl python3 bash jq diff --git a/ops/docker/Dockerfile.message-relayer b/ops/docker/Dockerfile.message-relayer index ced68b5c19e2d..2e5d1a78ac07e 100644 --- a/ops/docker/Dockerfile.message-relayer +++ b/ops/docker/Dockerfile.message-relayer @@ -2,7 +2,7 @@ ARG LOCAL_REGISTRY=docker.io ARG BUILDER_TAG=latest FROM ${LOCAL_REGISTRY}/ethereumoptimism/builder:${BUILDER_TAG} AS builder -FROM node:14-alpine +FROM node:16-alpine RUN apk add --no-cache curl bash jq diff --git a/ops/docker/Dockerfile.monorepo b/ops/docker/Dockerfile.monorepo index ae5d384ba09af..7030321a602ab 100644 --- a/ops/docker/Dockerfile.monorepo +++ b/ops/docker/Dockerfile.monorepo @@ -4,7 +4,7 @@ # ### BASE: Install deps # We do not use Alpine because there's a regression causing it to be very slow # when used with typescript/hardhat: https://github.com/nomiclabs/hardhat/issues/1219 -FROM node:14-buster-slim as node +FROM node:16-buster-slim as node RUN apt-get update -y && apt-get install -y git # Pre-download the compilers so that they do not need to be downloaded inside @@ -37,7 +37,7 @@ COPY integration-tests/package.json ./integration-tests/package.json RUN yarn install --frozen-lockfile ### BUILDER: Builds the typescript -FROM node +FROM node:16 WORKDIR /optimism diff --git a/ops/docker/Dockerfile.packages b/ops/docker/Dockerfile.packages index 45f2c4a598f85..07de1a2739851 100644 --- a/ops/docker/Dockerfile.packages +++ b/ops/docker/Dockerfile.packages @@ -4,7 +4,7 @@ # ### BASE: Install deps # We do not use Alpine because there's a regression causing it to be very slow # when used with typescript/hardhat: https://github.com/nomiclabs/hardhat/issues/1219 -FROM node:14.18.1-buster-slim as base +FROM node:16.13-buster-slim as base RUN apt-get update -y && apt-get install -y git curl jq python3 diff --git a/ops/docker/Dockerfile.regenesis-surgery b/ops/docker/Dockerfile.regenesis-surgery index c7f594f3cd2ff..1f0018a096860 100644 --- a/ops/docker/Dockerfile.regenesis-surgery +++ b/ops/docker/Dockerfile.regenesis-surgery @@ -2,7 +2,7 @@ ARG LOCAL_REGISTRY=docker.io ARG BUILDER_TAG=latest FROM ${LOCAL_REGISTRY}/ethereumoptimism/builder:${BUILDER_TAG} AS builder -FROM node:14-alpine +FROM node:16-alpine RUN apk add --no-cache curl bash jq diff --git a/ops/docker/Dockerfile.replica-healthcheck b/ops/docker/Dockerfile.replica-healthcheck index 64f130e6a4074..631582f9cde6e 100644 --- a/ops/docker/Dockerfile.replica-healthcheck +++ b/ops/docker/Dockerfile.replica-healthcheck @@ -2,7 +2,7 @@ ARG LOCAL_REGISTRY=docker.io ARG BUILDER_TAG=latest FROM ${LOCAL_REGISTRY}/ethereumoptimism/builder:${BUILDER_TAG} AS builder -FROM node:14-alpine +FROM node:16-alpine WORKDIR /opt/optimism From 0ab37fc90a87f73d642cc6d0eb4548424f1c9757 Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Tue, 30 Nov 2021 17:51:16 -0800 Subject: [PATCH 2/2] chore: add changeset --- .changeset/wicked-mugs-admire.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .changeset/wicked-mugs-admire.md diff --git a/.changeset/wicked-mugs-admire.md b/.changeset/wicked-mugs-admire.md new file mode 100644 index 0000000000000..2396169b38e2f --- /dev/null +++ b/.changeset/wicked-mugs-admire.md @@ -0,0 +1,9 @@ +--- +'@eth-optimism/integration-tests': patch +'@eth-optimism/builder': patch +'@eth-optimism/batch-submitter': patch +'@eth-optimism/data-transport-layer': patch +'@eth-optimism/message-relayer': patch +--- + +Update to node.js version 16