Skip to content

Commit 23f4006

Browse files
authored
Fix metaplex-rpc-proxy and docker build (#263)
* Fix docker build * Fix clippy error
1 parent f1a1ae6 commit 23f4006

File tree

9 files changed

+14
-9
lines changed

9 files changed

+14
-9
lines changed

Api.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM das-api/builder AS files
2-
FROM rust:1.81-slim-bullseye
2+
FROM rust:1.82-slim-bullseye
33
ARG APP=/usr/src/app
44
RUN apt update \
55
&& apt install -y curl ca-certificates tzdata \

Builder.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.81-bullseye AS builder
1+
FROM rust:1.82-bullseye AS builder
22
RUN apt-get update -y && \
33
apt-get install -y build-essential make git
44

@@ -21,6 +21,6 @@ WORKDIR /rust
2121
RUN --mount=type=cache,target=/rust/target,id=das-rust \
2222
cargo build --release --bins && cp `find /rust/target/release -maxdepth 1 -type f | sed 's/^\.\///' | grep -v "\." ` /rust/bins
2323

24-
FROM rust:1.81-slim-bullseye as final
24+
FROM rust:1.82-slim-bullseye as final
2525
COPY --from=builder /rust/bins /das/
2626
CMD echo "Built the DAS API bins!"

Ingest.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM das-api/builder AS files
2-
FROM rust:1.81-slim-bullseye
2+
FROM rust:1.82-slim-bullseye
33
ARG APP=/usr/src/app
44
RUN apt update \
55
&& apt install -y curl ca-certificates tzdata \

Load.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM das-api/builder AS files
2-
FROM rust:1.81-slim-bullseye
2+
FROM rust:1.82-slim-bullseye
33
ARG APP=/usr/src/app
44
RUN apt update \
55
&& apt install -y curl ca-certificates tzdata \

Migrator.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM das-api/builder AS files
22

3-
FROM rust:1.81-bullseye
3+
FROM rust:1.82-bullseye
44
COPY init.sql /init.sql
55
ENV INIT_FILE_PATH=/init.sql
66
COPY --from=files /das/migration /bins/migration

Proxy.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM rust:1.81-bullseye AS builder
2-
RUN cargo install wasm-pack
1+
FROM rust:1.82-bullseye AS builder
2+
RUN cargo install wasm-pack --version 0.13.1
33

44
RUN mkdir /rust
55
COPY ./Cargo.toml /rust

metaplex-rpc-proxy/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ use proxy_wasm::types::*;
55
use regex::{Regex, RegexBuilder};
66
use std::time::Duration;
77

8+
// Workaround: forces wasm-bindgen to include required intrinsics for proxy-wasm build.
9+
#[allow(unused_imports)]
10+
use wasm_bindgen::JsValue;
11+
812
proxy_wasm::main! {{
913
proxy_wasm::set_log_level(LogLevel::Trace);
1014
proxy_wasm::set_root_context(|_| -> Box<dyn RootContext> { Box::new(Root) });

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "1.81.0"
2+
channel = "1.82.0"
33
components = ["clippy", "rustfmt"]
44
targets = []
55
profile = "minimal"

tools/txn_forwarder/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use {
2626
tokio_stream::wrappers::LinesStream,
2727
};
2828

29+
#[allow(clippy::large_enum_variant)]
2930
#[derive(Debug, thiserror::Error)]
3031
pub enum FindSignaturesError {
3132
#[error("Failed to fetch signatures: {0}")]

0 commit comments

Comments
 (0)