Fix eth and solana deployment in tilt devnet
Change-Id: Iee032e92373c56d876e6fc1626b0f1af54046834
This commit is contained in:
parent
c1d0f165d6
commit
22373b9943
|
@ -2,6 +2,7 @@
|
||||||
FROM docker.io/library/rust:1.49@sha256:a50165ea96983c21832578afb1c8c028674c965bc1ed43b607871b1f362e06a5
|
FROM docker.io/library/rust:1.49@sha256:a50165ea96983c21832578afb1c8c028674c965bc1ed43b607871b1f362e06a5
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y libssl-dev libudev-dev pkg-config zlib1g-dev llvm clang ncat
|
RUN apt-get update && apt-get install -y libssl-dev libudev-dev pkg-config zlib1g-dev llvm clang ncat
|
||||||
|
RUN rustup default nightly
|
||||||
RUN rustup component add rustfmt
|
RUN rustup component add rustfmt
|
||||||
|
|
||||||
WORKDIR /usr/src/solana
|
WORKDIR /usr/src/solana
|
||||||
|
@ -11,5 +12,5 @@ ADD proto /usr/src/proto
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/usr/local/cargo,from=rust,source=/usr/local/cargo \
|
RUN --mount=type=cache,target=/usr/local/cargo,from=rust,source=/usr/local/cargo \
|
||||||
--mount=type=cache,target=target \
|
--mount=type=cache,target=target \
|
||||||
cargo build --package=agent --package=cli --release && \
|
cargo build --manifest-path ./bridge/Cargo.toml --package client --release && \
|
||||||
cp target/release/agent target/release/cli /usr/local/bin
|
cp bridge/target/release/client /usr/local/bin
|
||||||
|
|
|
@ -39,6 +39,7 @@ spec:
|
||||||
- --deterministic
|
- --deterministic
|
||||||
- --time="1970-01-01T00:00:00+00:00"
|
- --time="1970-01-01T00:00:00+00:00"
|
||||||
- --host=0.0.0.0
|
- --host=0.0.0.0
|
||||||
|
- --port=7545
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8545
|
- containerPort: 8545
|
||||||
name: rpc
|
name: rpc
|
||||||
|
|
|
@ -40,7 +40,7 @@ spec:
|
||||||
- /root/.local/share/solana/install/active_release/bin/solana-test-validator
|
- /root/.local/share/solana/install/active_release/bin/solana-test-validator
|
||||||
- --bpf-program
|
- --bpf-program
|
||||||
- Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o
|
- Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o
|
||||||
- /opt/solana/deps/spl_bridge.so
|
- /opt/solana/deps/bridge.so
|
||||||
- --log
|
- --log
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8001
|
- containerPort: 8001
|
||||||
|
|
|
@ -6,22 +6,20 @@ RUN rustup component add rustfmt
|
||||||
|
|
||||||
WORKDIR /usr/src/bridge
|
WORKDIR /usr/src/bridge
|
||||||
|
|
||||||
RUN sh -c "$(curl -sSfL https://release.solana.com/v1.5.5/install)"
|
RUN sh -c "$(curl -sSfL https://release.solana.com/edge/install)"
|
||||||
|
|
||||||
ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
|
ENV PATH="/root/.local/share/solana/install/active_release/bin:$PATH"
|
||||||
ENV RUST_LOG="solana_runtime::system_instruction_processor=trace,solana_runtime::message_processor=trace,solana_bpf_loader=debug,solana_rbpf=debug"
|
ENV RUST_LOG="solana_runtime::system_instruction_processor=trace,solana_runtime::message_processor=trace,solana_bpf_loader=debug,solana_rbpf=debug"
|
||||||
|
|
||||||
COPY bridge bridge
|
COPY bridge bridge
|
||||||
COPY bridge/agent agent
|
COPY modules modules
|
||||||
COPY bridge/cli cli
|
COPY solitaire solitaire
|
||||||
COPY Cargo.toml .
|
|
||||||
COPY Cargo.lock .
|
|
||||||
|
|
||||||
RUN --mount=type=cache,target=/usr/local,from=rust,source=/usr/local \
|
RUN --mount=type=cache,target=/usr/local,from=rust,source=/usr/local \
|
||||||
--mount=type=cache,target=/root/.cache \
|
--mount=type=cache,target=/root/.cache \
|
||||||
--mount=type=cache,target=bridge/target \
|
--mount=type=cache,target=bridge/target \
|
||||||
--mount=type=cache,target=target \
|
--mount=type=cache,target=target \
|
||||||
--mount=type=cache,target=bin,from=rust,source=bin \
|
--mount=type=cache,target=bin,from=rust,source=bin \
|
||||||
cargo build-bpf --manifest-path "bridge/Cargo.toml" && \
|
cargo build-bpf --manifest-path "bridge/program/Cargo.toml" && \
|
||||||
mkdir -p /opt/solana/deps && \
|
mkdir -p /opt/solana/deps && \
|
||||||
cp target/deploy/spl_bridge.so /opt/solana/deps/spl_bridge.so
|
cp bridge/target/deploy/bridge.so /opt/solana/deps/bridge.so
|
||||||
|
|
|
@ -74,23 +74,6 @@ dependencies = [
|
||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "anchor-bridge-client"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"anyhow",
|
|
||||||
"borsh",
|
|
||||||
"bridge",
|
|
||||||
"clap 3.0.0-beta.2",
|
|
||||||
"rand 0.7.3",
|
|
||||||
"shellexpand",
|
|
||||||
"solana-client",
|
|
||||||
"solana-program",
|
|
||||||
"solana-sdk",
|
|
||||||
"solitaire",
|
|
||||||
"solitaire-client",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ansi_term"
|
name = "ansi_term"
|
||||||
version = "0.11.0"
|
version = "0.11.0"
|
||||||
|
@ -514,6 +497,23 @@ dependencies = [
|
||||||
"syn 1.0.73",
|
"syn 1.0.73",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "client"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
"borsh",
|
||||||
|
"bridge",
|
||||||
|
"clap 3.0.0-beta.2",
|
||||||
|
"rand 0.7.3",
|
||||||
|
"shellexpand",
|
||||||
|
"solana-client",
|
||||||
|
"solana-program",
|
||||||
|
"solana-sdk",
|
||||||
|
"solitaire",
|
||||||
|
"solitaire-client",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cloudabi"
|
name = "cloudabi"
|
||||||
version = "0.0.3"
|
version = "0.0.3"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[package]
|
[package]
|
||||||
name = "anchor-bridge-client"
|
name = "client"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
authors = ["Stan Drozd <stan@nexantic.com>"]
|
authors = ["Stan Drozd <stan@nexantic.com>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
@ -7,7 +7,7 @@ edition = "2018"
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0.40"
|
anyhow = "1.0.40"
|
||||||
borsh = "0.8.1"
|
borsh = "0.8.1"
|
||||||
bridge = {path = "../program", features = ["no-idl", "no-entrypoint"]}
|
bridge = {path = "../program", features = ["no-idl", "no-entrypoint", "client"]}
|
||||||
clap = "3.0.0-beta.2"
|
clap = "3.0.0-beta.2"
|
||||||
rand = "0.7.3"
|
rand = "0.7.3"
|
||||||
shellexpand = "2.1.0"
|
shellexpand = "2.1.0"
|
||||||
|
|
Loading…
Reference in New Issue