From 7ed2bb057d6031fbdb3c0f5327a61e4a15ea3a80 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 12 Sep 2023 18:57:47 -0400 Subject: [PATCH] Revert "feat(build): Use LTS version of ubuntu (#2239)" This reverts commit ce6671e6ab72fcdc8114df5b6a45f81c0086b19d. --- .../barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang | 2 +- circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang | 2 +- circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert | 4 ++-- yarn-project/noir-contracts/Dockerfile.build | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang index cb9474b73fc..48e54f5b97a 100644 --- a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang +++ b/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang @@ -1,4 +1,4 @@ -FROM ubuntu:jammy AS builder +FROM ubuntu:lunar AS builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja-build curl RUN curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v3.0.1 WORKDIR /usr/src/barretenberg/cpp diff --git a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang index 47ecf761c73..73600fc890e 100644 --- a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang +++ b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang @@ -1,4 +1,4 @@ -FROM ubuntu:jammy AS builder +FROM ubuntu:lunar AS builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja-build curl binaryen WORKDIR /usr/src/circuits/cpp/barretenberg/cpp diff --git a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert index 615244dc7ba..59ce8179f8b 100644 --- a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert +++ b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert @@ -1,4 +1,4 @@ -FROM ubuntu:jammy AS builder +FROM ubuntu:lunar AS builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git libssl-dev cmake ninja-build curl binaryen WORKDIR /usr/src/circuits/cpp/barretenberg/cpp @@ -9,7 +9,7 @@ COPY . . RUN cmake --preset wasm && cmake --build --preset wasm -FROM ubuntu:jammy +FROM ubuntu:lunar RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y xz-utils curl RUN curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v3.0.1 COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/barretenberg/cpp/srs_db diff --git a/yarn-project/noir-contracts/Dockerfile.build b/yarn-project/noir-contracts/Dockerfile.build index f5d9ed70ca7..b1bc9d2532e 100644 --- a/yarn-project/noir-contracts/Dockerfile.build +++ b/yarn-project/noir-contracts/Dockerfile.build @@ -1,7 +1,7 @@ # Running on ubuntu until noir supports an alpine build # Builder stage to build the noir artifacts -FROM ubuntu:jammy +FROM ubuntu:lunar RUN apt-get update && apt-get install -y \ jq \