Skip to content

Commit dc63d30

Browse files
authored
Merge branch 'master' into ad/msgpack-blowup
2 parents b0a444e + 3005328 commit dc63d30

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

circuits/cpp/barretenberg/.gitrepo

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = https://github.com/AztecProtocol/barretenberg
88
branch = master
9-
commit = 760438bf40eb3315b1953898a439e462baef5c90
10-
parent = 1d0e25d9fad69aebccacf9f646e3291ea89716ca
9+
commit = ee778d49251b4c5f2569f25d180e0ec8c99d234b
10+
parent = c808912b2ef1ca4403010eb159bf602af61ba1a3
1111
method = merge
1212
cmdver = 0.4.6

circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:jammy AS builder
1+
FROM ubuntu:lunar AS builder
22
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja-build curl
33
RUN curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v3.0.1
44
WORKDIR /usr/src/barretenberg/cpp

circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:jammy AS builder
1+
FROM ubuntu:lunar AS builder
22
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential wget git libssl-dev cmake ninja-build curl binaryen
33

44
WORKDIR /usr/src/circuits/cpp/barretenberg/cpp

circuits/cpp/dockerfiles/Dockerfile.wasm-linux-clang-assert

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:jammy AS builder
1+
FROM ubuntu:lunar AS builder
22
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git libssl-dev cmake ninja-build curl binaryen
33

44
WORKDIR /usr/src/circuits/cpp/barretenberg/cpp
@@ -9,7 +9,7 @@ COPY . .
99

1010
RUN cmake --preset wasm && cmake --build --preset wasm
1111

12-
FROM ubuntu:jammy
12+
FROM ubuntu:lunar
1313
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y xz-utils curl
1414
RUN curl https://wasmtime.dev/install.sh -sSf | bash /dev/stdin --version v3.0.1
1515
COPY --from=builder /usr/src/circuits/cpp/barretenberg/cpp/srs_db /usr/src/circuits/cpp/barretenberg/cpp/srs_db

yarn-project/noir-contracts/Dockerfile.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Running on ubuntu until noir supports an alpine build
22

33
# Builder stage to build the noir artifacts
4-
FROM ubuntu:jammy
4+
FROM ubuntu:lunar
55

66
RUN apt-get update && apt-get install -y \
77
jq \

0 commit comments

Comments
 (0)