From 3e2a61eb6834e6def5ccc284d8ffb10ec86040a4 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 12 Sep 2023 09:58:51 +0000 Subject: [PATCH 1/2] Update ubutnu version --- circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang | 2 +- circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert | 4 ++-- yarn-project/noir-contracts/Dockerfile.build | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang index ec10dd854487..73600fc890ed 100644 --- a/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang +++ b/circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang @@ -1,4 +1,4 @@ -FROM ubuntu:kinetic 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 c21b9019f838..59ce8179f8bd 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:kinetic 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:kinetic +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 d82539127fa5..1f96d61f5534 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:kinetic +FROM ubuntu:lunar RUN apt-get update && apt-get install -y \ curl \ From b1ab3c1899fa7460ff3f8c76d25d3830a3273f57 Mon Sep 17 00:00:00 2001 From: Santiago Palladino Date: Tue, 12 Sep 2023 08:41:35 -0300 Subject: [PATCH 2/2] Upgrade ubuntu in cpp dockerfile --- .../barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang index 7d98dcf2ccbd..48e54f5b97a7 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:kinetic 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