diff --git a/CODEOWNERS b/CODEOWNERS index 01971905f2..0e2afaa2b5 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -14,6 +14,7 @@ pyproject.toml @goauthentik/backend uv.lock @goauthentik/backend Cargo.toml @goauthentik/backend Cargo.lock @goauthentik/backend +build.rs @goauthentik/backend go.mod @goauthentik/backend go.sum @goauthentik/backend .cargo/ @goauthentik/backend diff --git a/Cargo.lock b/Cargo.lock index 10273d476c..d13fbaf34c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -198,6 +198,7 @@ dependencies = [ "metrics-exporter-prometheus", "nix 0.31.2", "pyo3", + "pyo3-build-config", "sqlx", "tokio", "tracing", diff --git a/Cargo.toml b/Cargo.toml index 0090fb3595..71720ad41f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,6 +49,7 @@ nix = { version = "= 0.31.2", features = ["hostname", "signal"] } notify = "= 8.2.0" pin-project-lite = "= 0.2.17" pyo3 = "= 0.28.3" +pyo3-build-config = "= 0.28.3" regex = "= 1.12.3" reqwest = { version = "= 0.13.2", features = [ "form", @@ -260,6 +261,9 @@ default = ["core", "proxy"] core = ["ak-common/core", "dep:pyo3", "dep:sqlx"] proxy = ["ak-common/proxy"] +[build-dependencies] +pyo3-build-config.workspace = true + [dependencies] ak-axum.workspace = true ak-common.workspace = true diff --git a/build.rs b/build.rs new file mode 100644 index 0000000000..dd6030f85c --- /dev/null +++ b/build.rs @@ -0,0 +1,6 @@ +fn main() { + #[cfg(feature = "core")] + { + pyo3_build_config::add_libpython_rpath_link_args(); + } +} diff --git a/lifecycle/container/Dockerfile b/lifecycle/container/Dockerfile index dd9d46bee6..06998ed28d 100644 --- a/lifecycle/container/Dockerfile +++ b/lifecycle/container/Dockerfile @@ -147,6 +147,7 @@ RUN --mount=type=bind,target=rust-toolchain.toml,src=rust-toolchain.toml \ --mount=type=bind,target=Cargo.toml,src=Cargo.toml \ --mount=type=bind,target=Cargo.lock,src=Cargo.lock \ --mount=type=bind,target=.cargo/,src=.cargo/ \ + --mount=type=bind,target=build.rs,src=build.rs \ --mount=type=bind,target=src/,src=src/ \ --mount=type=bind,target=packages/ak-axum,src=packages/ak-axum \ --mount=type=bind,target=packages/ak-common,src=packages/ak-common \