Merge branch 'main' into remove_trim_upstream

rpcpool · Sep 19, 2023 · 449ad1b · 449ad1b
2 parents c5eeefa + baba78b
commit 449ad1b
Show file tree

Hide file tree

Showing 114 changed files with 6,840 additions and 21,467 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,7 @@
 # Generated by Cargo
 # will have compiled files and executables
-/target/
 db-data
 .idea
-**/target/
 
 # Generated by Redis
 dump.rdb
@@ -24,4 +22,11 @@ test-ledger
 programs
 *.iml
 skaffold-state.json
-test-programs
+test-programs
+
+# Rust build dirs
+/das_api/target
+/migration/target
+/tests/*/target
+/*/target
+/target
diff --git a/Api.Dockerfile b/Api.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.65-bullseye AS chef
+FROM rust:1.70-bullseye AS chef
 RUN cargo install cargo-chef
 FROM chef AS planner
 COPY das_api /rust/das_api/
@@ -19,7 +19,7 @@ COPY das_api .
 # Build application
 RUN cargo build --release
 
-FROM rust:1.65-slim-bullseye
+FROM rust:1.70-slim-bullseye
 ARG APP=/usr/src/app
 RUN apt update \
     && apt install -y curl ca-certificates tzdata \