From c8cb44ca2fd3030bf6a3a8f7d8c1b9ccf85361ed Mon Sep 17 00:00:00 2001 From: Pris Nasrat Date: Sat, 16 Mar 2024 12:03:24 -0400 Subject: [PATCH] Fix deploy-on-fly Changes Dockerfile to use bookworm not latest for rust builder. Updates docs to not checkout v0.1.0 Fixes ##171 --- doc/deploy-on-fly/launch.md | 13 +++++-------- examples/fly/Dockerfile | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/doc/deploy-on-fly/launch.md b/doc/deploy-on-fly/launch.md index 2fe047dd..93c7cc0b 100644 --- a/doc/deploy-on-fly/launch.md +++ b/doc/deploy-on-fly/launch.md @@ -26,18 +26,15 @@ Clone the Corrosion repository, and enter its root directory. $ git clone https://github.com/superfly/corrosion.git && cd corrosion ``` -Check out the latest release as a new branch. - -```bash -$ git checkout tags/v0.1.0 -b v010 -``` - [Fly Launch](https://fly.io/docs/apps/launch/) uses a TOML file for [app configuration](https://fly.io/docs/reference/configuration/). Copy the example `fly.toml` to the working directory. ```bash $ cp examples/fly/fly.toml . ``` +Edit `fly.toml` changing the `app` value from `corrosion2` to a unique app name. + + ## Launch a new app Launch a new app on Fly.io, using the example Dockerfile. @@ -174,7 +171,7 @@ SQLite3 and [not-perf](https://github.com/koute/not-perf) are installed for conv ```Docker # build image -FROM rust:latest as builder +FROM rust:bookworm as builder RUN apt update && apt install -y build-essential gcc-x86-64-linux-gnu clang llvm @@ -195,7 +192,7 @@ RUN set -eux; \ WORKDIR /usr/src/app COPY . . # Will build and cache the binary and dependent crates in release mode -RUN --mount=type=cache,target=/usr/local/cargo,from=rust:latest,source=/usr/local/cargo \ +RUN --mount=type=cache,target=/usr/local/cargo,from=rust:bookworm,source=/usr/local/cargo \ --mount=type=cache,target=target \ cargo build --release && mv target/release/corrosion ./ diff --git a/examples/fly/Dockerfile b/examples/fly/Dockerfile index 162e79f8..99366e39 100644 --- a/examples/fly/Dockerfile +++ b/examples/fly/Dockerfile @@ -1,5 +1,5 @@ # build image -FROM rust:latest as builder +FROM rust:bookworm as builder RUN apt update && apt install -y build-essential gcc-x86-64-linux-gnu clang llvm @@ -20,7 +20,7 @@ RUN set -eux; \ WORKDIR /usr/src/app COPY . . # Will build and cache the binary and dependent crates in release mode -RUN --mount=type=cache,target=/usr/local/cargo,from=rust:latest,source=/usr/local/cargo \ +RUN --mount=type=cache,target=/usr/local/cargo,from=rust:bookworm,source=/usr/local/cargo \ --mount=type=cache,target=target \ cargo build --release && mv target/release/corrosion ./ @@ -43,4 +43,4 @@ COPY examples/fly/templates /etc/corrosion/templates ENTRYPOINT ["/entrypoint.sh"] # Run the app -CMD ["corrosion", "agent"] \ No newline at end of file +CMD ["corrosion", "agent"]