diff --git a/Dockerfile b/Dockerfile index dbfcd9d0..61184e22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM rust:1.77-slim as builder +FROM --platform=$BUILDPLATFORM rust:1.78-slim as builder WORKDIR /usr/src/sqlpage ARG TARGETARCH ARG BUILDARCH diff --git a/config.toml b/config.toml new file mode 100644 index 00000000..dda585bb --- /dev/null +++ b/config.toml @@ -0,0 +1,5 @@ +[target.armv7-unknown-linux-gnueabihf] +linker = "arm-linux-gnueabihf-gcc" + +[target.aarch64-unknown-linux-gnu] +linker = "aarch64-linux-gnu-gcc" \ No newline at end of file diff --git a/lambda.Dockerfile b/lambda.Dockerfile index 25ff6b94..a514996c 100644 --- a/lambda.Dockerfile +++ b/lambda.Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.77-alpine as builder +FROM rust:1.78-alpine as builder RUN rustup component add clippy rustfmt RUN apk add --no-cache musl-dev zip WORKDIR /usr/src/sqlpage diff --git a/src/app_config.rs b/src/app_config.rs index 292ac472..918ba6c6 100644 --- a/src/app_config.rs +++ b/src/app_config.rs @@ -73,7 +73,7 @@ pub struct AppConfig { #[serde(default = "default_https_acme_directory_url")] pub https_acme_directory_url: String, - /// Whether SQLPage is running in development or production mode. This is used to determine + /// Whether we should run in development or production mode. Used to determine /// whether to show error messages to the user. #[serde(default)] pub environment: DevOrProd, diff --git a/src/webserver/http.rs b/src/webserver/http.rs index 6d1314c6..eaee77ed 100644 --- a/src/webserver/http.rs +++ b/src/webserver/http.rs @@ -227,7 +227,7 @@ async fn render_sql( let (resp_send, resp_recv) = tokio::sync::oneshot::channel::(); actix_web::rt::spawn(async move { let layout_context = &LayoutContext { - is_embedded: req_param.get_variables.get("_sqlpage_embed").is_some(), + is_embedded: req_param.get_variables.contains_key("_sqlpage_embed"), }; let database_entries_stream = stream_query_results(&app_state.db, &sql_file, &mut req_param);