From 583bc1724c1b61f35bf0595abc5b9238f0ee1a9d Mon Sep 17 00:00:00 2001 From: Hannes Kuchelmeister Date: Mon, 6 Sep 2021 20:44:44 +0200 Subject: [PATCH] fix certificate issues with docker --- Dockerfile | 2 +- src/main.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 43dd05d..faafc70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN cd db && ./create_db.sh RUN cargo install --path . FROM debian:buster-slim -RUN apt-get update && apt-get install -y sqlite3 openssl && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y sqlite3 openssl ca-certificates && rm -rf /var/lib/apt/lists/* WORKDIR app COPY --from=builder /usr/local/cargo/bin/ics-proxy ./ics-proxy COPY --from=builder /usr/src/ics-proxy/db db diff --git a/src/main.rs b/src/main.rs index dfe74ab..0723030 100644 --- a/src/main.rs +++ b/src/main.rs @@ -28,13 +28,13 @@ async fn make_ics_request(req: HttpRequest, db_pool: web::Data>) -> Ok(link) => match reqwest::blocking::get(link.destination) { Ok(r) => match r.text() { Ok(res) => HttpResponse::Ok().content_type("text/calendar").body(res), - Err(_) => HttpResponse::Ok() + Err(err) => HttpResponse::Ok() .status(StatusCode::INTERNAL_SERVER_ERROR) - .finish(), + .body(err.to_string()), }, - Err(_) => HttpResponse::Ok() + Err(err) => HttpResponse::Ok() .status(StatusCode::INTERNAL_SERVER_ERROR) - .finish(), + .body(err.to_string()), }, Err(_) => HttpResponse::Ok().status(StatusCode::NOT_FOUND).finish(), },