Skip to content

Commit

Permalink
Merge branch 'main' into fix-static
Browse files Browse the repository at this point in the history
  • Loading branch information
de-sh authored Jan 20, 2025
2 parents f2f8e05 + cdfe4a0 commit e58f361
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,6 @@ arrow = "53.0.0"
assets-url = "https://github.com/parseablehq/console/releases/download/v0.9.18/build.zip"
assets-sha1 = "4516db38c8e556707b29b33569f9b1e53d5165f2"

[features]
debug = []

[profile.release-lto]
inherits = "release"
lto = "fat"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ LABEL org.opencontainers.image.licenses="AGPL-3.0"

WORKDIR /parseable
COPY . .
RUN cargo build --features debug
RUN cargo build

# final stage
FROM docker.io/debian:bookworm-slim
Expand Down
2 changes: 1 addition & 1 deletion src/handlers/http/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ pub fn metrics_path() -> String {
}

pub(crate) fn cross_origin_config() -> Cors {
if !CONFIG.options.cors || cfg!(feature = "debug") {
if !CONFIG.options.cors || cfg!(debug_assertions) {
Cors::permissive().block_on_origin_mismatch(false)
} else {
Cors::default().block_on_origin_mismatch(false)
Expand Down

0 comments on commit e58f361

Please sign in to comment.