ci: make use of pre-built dist

hirosystems · Jul 26, 2023 · 13080e1 · 13080e1
1 parent 2a27c7f
commit 13080e1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 18 deletions.
diff --git a/dockerfiles/components/clarinet-dev.dockerfile b/dockerfiles/components/clarinet-dev.dockerfile
@@ -0,0 +1,27 @@
+FROM rust:bullseye as build
+
+WORKDIR /src
+
+RUN apt update && apt install -y ca-certificates pkg-config libssl-dev
+
+RUN rustup update 1.67.0 && rustup default 1.67.0
+
+COPY . .
+
+RUN mkdir /out
+
+RUN cargo build --features=telemetry --release --locked
+
+RUN cp target/release/clarinet /out
+
+FROM debian:bullseye-slim
+
+RUN apt update && apt install -y libssl-dev
+
+COPY --from=build /out/ /bin/
+
+WORKDIR /workspace
+
+ENV CLARINET_MODE_CI=1
+
+ENTRYPOINT ["clarinet"]
diff --git a/dockerfiles/components/clarinet.dockerfile b/dockerfiles/components/clarinet.dockerfile
@@ -1,27 +1,11 @@
-FROM rust:bullseye as build
-
-WORKDIR /src
-
-RUN apt update && apt install -y ca-certificates pkg-config libssl-dev
-
-RUN rustup update 1.59.0 && rustup default 1.59.0
-
-COPY . .
-
-RUN mkdir /out
-
-RUN cargo build --features=telemetry --release --locked
-
-RUN cp target/release/clarinet /out
-
 FROM debian:bullseye-slim
 
 RUN apt update && apt install -y libssl-dev
 
-COPY --from=build /out/ /bin/
+COPY clarinet /bin/
 
 WORKDIR /workspace
 
 ENV CLARINET_MODE_CI=1
 
-ENTRYPOINT ["clarinet"]
+ENTRYPOINT ["clarinet"]