Skip to content

Commit

Permalink
Merge branch 'main' into alpine
Browse files Browse the repository at this point in the history
Signed-off-by: Devdutt Shenoi <[email protected]>
  • Loading branch information
de-sh authored Jan 31, 2025
2 parents ed43506 + 02a89cd commit 119a6d2
Show file tree
Hide file tree
Showing 79 changed files with 3,515 additions and 3,521 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/build-push-edge-debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,24 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
uses: docker/metadata-action@v5
with:
images: parseable/parseable

- name: Build and push
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile.debug
push: true
tags: parseable/parseable:edge-debug
platforms: linux/amd64,linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max
8 changes: 5 additions & 3 deletions .github/workflows/build-push-edge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,24 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
uses: docker/metadata-action@v5
with:
images: parseable/parseable

- name: Build and push
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
push: true
tags: parseable/parseable:edge
platforms: linux/amd64,linux/arm64
cache-from: type=gha
cache-to: type=gha,mode=max
3 changes: 0 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
- "helm/**"
- "assets/**"
- "**.md"
push:
branches:
- main

name: Ensure parseable builds on all release targets
jobs:
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
- "helm/**"
- "assets/**"
- "**.md"
push:
branches:
- main

name: Lint, Test and Coverage Report
jobs:
Expand Down
86 changes: 1 addition & 85 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 1 addition & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ actix-web-prometheus = { version = "0.1" }
actix-web-static-files = "4.0"
http = "0.2.7"
http-auth-basic = "0.3.3"
mime = "0.3.17"
tonic = { version = "0.12.3", features = ["tls", "transport", "gzip", "zstd"] }
tonic-web = "0.12.3"
tower-http = { version = "0.6.1", features = ["cors"] }
Expand All @@ -45,7 +44,6 @@ sha2 = "0.10.8"

# Serialization and Data Formats
byteorder = "1.4.3"
prost = "0.13.3"
serde = { version = "1.0", features = ["rc", "derive"] }
serde_json = "1.0"
serde_repr = "0.1.17"
Expand Down Expand Up @@ -75,11 +73,9 @@ humantime = "2.1.0"
humantime-serde = "1.1"

# File System and I/O
bzip2 = { version = "*", features = ["static"] }
fs_extra = "1.3"
path-clean = "1.0.1"
relative-path = { version = "1.7", features = ["serde"] }
xz2 = { version = "*", features = ["static"] }

# CLI and System
clap = { version = "4.1", default-features = false, features = [
Expand All @@ -96,15 +92,13 @@ hostname = "0.4.0"
human-size = "0.4"
num_cpus = "1.15"
sysinfo = "0.31.4"
thread-priority = "1.0.0"
uptime_lib = "0.3.0"

# Utility Libraries
anyhow = { version = "1.0", features = ["backtrace"] }
bytes = "1.4"
clokwerk = "0.4"
derive_more = "0.99.18"
hashlru = { version = "0.11.0", features = ["serde"] }
itertools = "0.13.0"
lazy_static = "1.4"
nom = "7.1.3"
Expand All @@ -125,7 +119,6 @@ xxhash-rust = { version = "0.8", features = ["xxh3"] }

[build-dependencies]
cargo_toml = "0.20.1"
prost-build = "0.13.3"
sha1_smol = { version = "1.0", features = ["std"] }
static-files = "0.2"
ureq = "2.6"
Expand All @@ -134,17 +127,13 @@ vergen = { version = "8.1", features = ["build", "git", "cargo", "gitcl"] }
zip = { version = "2.2.0", default-features = false, features = ["deflate"] }

[dev-dependencies]
maplit = "1.0"
rstest = "0.23.0"
arrow = "53.0.0"

[package.metadata.parseable_ui]
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 All @@ -155,4 +144,4 @@ codegen-units = 1
rdkafka = { version = "0.36.2", default-features = false, features = ["tokio"] }

[target.'cfg(all(target_os = "macos", target_arch = "aarch64"))'.dependencies]
rdkafka = { version = "0.36.2", default-features = false, features = ["tokio"] }
rdkafka = { version = "0.36.2", default-features = false, features = ["tokio"] }
10 changes: 8 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,21 @@ LABEL org.opencontainers.image.licenses="AGPL-3.0"
RUN apk add --no-cache build-base git bash

WORKDIR /parseable
COPY . .

# Cache dependencies
COPY Cargo.toml Cargo.lock build.rs .git ./
RUN mkdir src && echo "fn main() {}" > src/main.rs && cargo build --release && rm -rf src

# Build the actual binary
COPY src ./src
RUN cargo build --release

# Final stage with a minimal runtime image
FROM alpine:latest

WORKDIR /parseable

# Copy the static shell into base image.
# Copy the static binary into the final image
COPY --from=builder /parseable/target/release/parseable /usr/bin/parseable

CMD ["/usr/bin/parseable"]
11 changes: 9 additions & 2 deletions Dockerfile.debug
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,21 @@ LABEL org.opencontainers.image.vendor="Parseable Inc"
LABEL org.opencontainers.image.licenses="AGPL-3.0"

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

# Cache dependencies
COPY Cargo.toml Cargo.lock build.rs .git ./
RUN mkdir src && echo "fn main() {}" > src/main.rs && cargo build && rm -rf src

# Build the actual binary
COPY src ./src
RUN cargo build

# final stage
FROM docker.io/debian:bookworm-slim

WORKDIR /parseable

# Copy the static binary into the final image
COPY --from=builder /parseable/target/debug/parseable /usr/bin/parseable

CMD ["/usr/bin/parseable"]
Binary file added helm-releases/parseable-1.7.3.tgz
Binary file not shown.
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: parseable
description: Helm chart for Parseable Server
type: application
version: 1.7.2
appVersion: "v1.7.2"
version: 1.7.3
appVersion: "v1.7.3"
icon: "https://raw.githubusercontent.com/parseablehq/.github/main/images/logo.svg"
maintainers:
- name: Parseable Team
Expand Down
Loading

0 comments on commit 119a6d2

Please sign in to comment.