From fca44ad6c9e245656e0d7053e6789673879d9038 Mon Sep 17 00:00:00 2001 From: Ellie Huxtable Date: Fri, 8 Sep 2023 14:19:07 +0100 Subject: [PATCH 1/4] Correct debian version (#19) The other version has glibc errors. I should investigate, but don't have time rn. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d7f5286..c44e53b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lukemathwalker/cargo-chef:latest-rust-1.72.0 AS chef +FROM lukemathwalker/cargo-chef:latest-rust-1.72.0-buster AS chef WORKDIR app FROM chef AS planner From d3f5de66fbf27e68963bd071e0b48fa7cc8912c6 Mon Sep 17 00:00:00 2001 From: Ellie Huxtable Date: Fri, 8 Sep 2023 16:05:11 +0100 Subject: [PATCH 2/4] Only build ARM images, as we only run ARM (#20) --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f6b8ebb..76d3ef0 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -52,7 +52,7 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - platforms: linux/amd64, linux/arm64 + platforms: linux/arm64 cache-from: type=gha cache-to: type=gha,mode=max build-args: RUST_BACKTRACE=1 From a9cc8a2d6724e1be13f0d8f65a172b444d48cf40 Mon Sep 17 00:00:00 2001 From: Ellie Huxtable Date: Mon, 11 Sep 2023 12:48:57 +0100 Subject: [PATCH 3/4] Allow setting bind address (#21) --- src/main.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main.rs b/src/main.rs index 77d1e8d..3e6acde 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,4 @@ use std::env; -use std::net::SocketAddr; use crate::time::SystemTime; @@ -14,6 +13,7 @@ mod token; #[tokio::main] async fn main() { let use_print_sink = env::var("PRINT_SINK").is_ok(); + let address = env::var("ADDRESS").unwrap_or(String::from("127.0.0.1:3000")); let app = if use_print_sink { router::router(SystemTime {}, sink::PrintSink {}) @@ -31,11 +31,10 @@ async fn main() { // run our app with hyper // `axum::Server` is a re-export of `hyper::Server` - let addr = SocketAddr::from(([127, 0, 0, 1], 3000)); - tracing::debug!("listening on {}", addr); + tracing::info!("listening on {}", address); - axum::Server::bind(&addr) + axum::Server::bind(&address.parse().unwrap()) .serve(app.into_make_service()) .await .unwrap(); From eea90a5c196555504a8a22bf01fb222ebf4c3e83 Mon Sep 17 00:00:00 2001 From: Ellie Huxtable Date: Mon, 11 Sep 2023 12:51:17 +0100 Subject: [PATCH 4/4] Use a big ARM builder for docker (#22) --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 76d3ef0..98160d1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ permissions: jobs: build: name: build and publish capture image - runs-on: ubuntu-latest + runs-on: buildjet-8vcpu-ubuntu-2204-arm steps: - name: Check Out Repo