Merge branch 'develop' into feat/verifier-itests-patch-ctx

.changeset/afraid-otters-repeat.md

+---
+'@eth-optimism/integration-tests': patch
+---
+
+Increase withdrawal test timeout

integration-tests/test/shared/utils.ts

@@ -220,7 +220,7 @@ export const conditionalTest = (
     }
 
     await fn()
-  }).timeout(timeout || envConfig.MOCHA_TIMEOUT)
+  }).timeout(timeout || envConfig.MOCHA_TIMEOUT * 2)
 }
 
 export const withdrawalTest = (name, fn, timeout?: number) =>

ops/docker/Dockerfile.batch-submitter-service

-FROM golang:1.17.6-alpine3.15 as builder
+FROM golang:1.17.3-alpine3.13 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git jq bash
 
@@ -9,7 +9,7 @@ RUN go mod graph | grep -v l2geth | awk '{if ($1 !~ "@") print $2}' | xargs -n 1
 COPY ./go/batch-submitter/ ./
 RUN make
 
-FROM alpine:3.15
+FROM alpine:3.13
 
 RUN apk add --no-cache ca-certificates jq curl
 COPY --from=builder /go/batch-submitter/batch-submitter /usr/local/bin/