diff --git a/Cargo.toml b/Cargo.toml index 43896ce..427e09d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" default = ["mysql", "all-login"] dotenv = ["dep:dotenvy"] mysql = ["diesel/mysql"] -mysqlclient-bundle = ["mysql"] +mysql-bundle = ["mysql"] sqlite = ["diesel/sqlite"] sqlite-bundle = ["sqlite", "libsqlite3-sys/bundled"] third-party-login = ["dep:actix-session", "dep:tera", "dep:reqwest", "dep:actix-files"] diff --git a/Dockerfile b/Dockerfile index bc876e3..6420817 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 FROM rust:1.76-alpine AS builder -ARG FEATURE_FLAGS="-F|mysqlclient-bundle|-F|all-login" +ARG FEATURE_FLAGS="-F|mysql-bundle|-F|all-login" WORKDIR /build COPY . . RUN apk add --no-cache build-base -RUN if [[ "$FEATURE_FLAGS" == *"mysqlclient-bundle"* ]]; then \ +RUN if [[ "$FEATURE_FLAGS" == *"mysql-bundle"* ]]; then \ apk add --no-cache binutils mariadb-dev musl-dev bash cmake curl && \ bash scripts/mariadb-static-build.sh && \ bash scripts/zlib-static-build.sh && \ diff --git a/build.rs b/build.rs index b03b6ad..21a6b0f 100644 --- a/build.rs +++ b/build.rs @@ -1,9 +1,9 @@ fn main() { - #[cfg(feature = "mysqlclient-bundle")] + #[cfg(feature = "mysql-bundle")] mysqlclient_static(); } -#[cfg(feature = "mysqlclient-bundle")] +#[cfg(feature = "mysql-bundle")] fn mysqlclient_static() { println!("cargo:rustc-link-search=native=lib"); println!("cargo:rustc-link-lib=static=mysqlclient");