Skip to content

Commit 119a6d2

Browse files
author
Devdutt Shenoi
authored
Merge branch 'main' into alpine
Signed-off-by: Devdutt Shenoi <[email protected]>
2 parents ed43506 + 02a89cd commit 119a6d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+3515
-3521
lines changed

.github/workflows/build-push-edge-debug.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,24 @@ jobs:
2424
uses: docker/setup-buildx-action@v3
2525

2626
- name: Login to Docker Hub
27-
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
27+
uses: docker/login-action@v3
2828
with:
2929
username: ${{ secrets.DOCKERHUB_USERNAME }}
3030
password: ${{ secrets.DOCKERHUB_TOKEN }}
3131

3232
- name: Extract metadata (tags, labels) for Docker
3333
id: meta
34-
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
34+
uses: docker/metadata-action@v5
3535
with:
3636
images: parseable/parseable
3737

3838
- name: Build and push
39-
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
39+
uses: docker/build-push-action@v6
4040
with:
4141
context: .
4242
file: ./Dockerfile.debug
4343
push: true
4444
tags: parseable/parseable:edge-debug
4545
platforms: linux/amd64,linux/arm64
46+
cache-from: type=gha
47+
cache-to: type=gha,mode=max

.github/workflows/build-push-edge.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,24 @@ jobs:
2424
uses: docker/setup-buildx-action@v3
2525

2626
- name: Login to Docker Hub
27-
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
27+
uses: docker/login-action@v3
2828
with:
2929
username: ${{ secrets.DOCKERHUB_USERNAME }}
3030
password: ${{ secrets.DOCKERHUB_TOKEN }}
3131

3232
- name: Extract metadata (tags, labels) for Docker
3333
id: meta
34-
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
34+
uses: docker/metadata-action@v5
3535
with:
3636
images: parseable/parseable
3737

3838
- name: Build and push
39-
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
39+
uses: docker/build-push-action@v6
4040
with:
4141
context: .
4242
file: ./Dockerfile
4343
push: true
4444
tags: parseable/parseable:edge
4545
platforms: linux/amd64,linux/arm64
46+
cache-from: type=gha
47+
cache-to: type=gha,mode=max

.github/workflows/build.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ on:
55
- "helm/**"
66
- "assets/**"
77
- "**.md"
8-
push:
9-
branches:
10-
- main
118

129
name: Ensure parseable builds on all release targets
1310
jobs:

.github/workflows/coverage.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ on:
55
- "helm/**"
66
- "assets/**"
77
- "**.md"
8-
push:
9-
branches:
10-
- main
118

129
name: Lint, Test and Coverage Report
1310
jobs:

Cargo.lock

Lines changed: 1 addition & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ actix-web-prometheus = { version = "0.1" }
2727
actix-web-static-files = "4.0"
2828
http = "0.2.7"
2929
http-auth-basic = "0.3.3"
30-
mime = "0.3.17"
3130
tonic = { version = "0.12.3", features = ["tls", "transport", "gzip", "zstd"] }
3231
tonic-web = "0.12.3"
3332
tower-http = { version = "0.6.1", features = ["cors"] }
@@ -45,7 +44,6 @@ sha2 = "0.10.8"
4544

4645
# Serialization and Data Formats
4746
byteorder = "1.4.3"
48-
prost = "0.13.3"
4947
serde = { version = "1.0", features = ["rc", "derive"] }
5048
serde_json = "1.0"
5149
serde_repr = "0.1.17"
@@ -75,11 +73,9 @@ humantime = "2.1.0"
7573
humantime-serde = "1.1"
7674

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

8480
# CLI and System
8581
clap = { version = "4.1", default-features = false, features = [
@@ -96,15 +92,13 @@ hostname = "0.4.0"
9692
human-size = "0.4"
9793
num_cpus = "1.15"
9894
sysinfo = "0.31.4"
99-
thread-priority = "1.0.0"
10095
uptime_lib = "0.3.0"
10196

10297
# Utility Libraries
10398
anyhow = { version = "1.0", features = ["backtrace"] }
10499
bytes = "1.4"
105100
clokwerk = "0.4"
106101
derive_more = "0.99.18"
107-
hashlru = { version = "0.11.0", features = ["serde"] }
108102
itertools = "0.13.0"
109103
lazy_static = "1.4"
110104
nom = "7.1.3"
@@ -125,7 +119,6 @@ xxhash-rust = { version = "0.8", features = ["xxh3"] }
125119

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

136129
[dev-dependencies]
137-
maplit = "1.0"
138130
rstest = "0.23.0"
139131
arrow = "53.0.0"
140132

141133
[package.metadata.parseable_ui]
142134
assets-url = "https://github.com/parseablehq/console/releases/download/v0.9.18/build.zip"
143135
assets-sha1 = "4516db38c8e556707b29b33569f9b1e53d5165f2"
144136

145-
[features]
146-
debug = []
147-
148137
[profile.release-lto]
149138
inherits = "release"
150139
lto = "fat"
@@ -155,4 +144,4 @@ codegen-units = 1
155144
rdkafka = { version = "0.36.2", default-features = false, features = ["tokio"] }
156145

157146
[target.'cfg(all(target_os = "macos", target_arch = "aarch64"))'.dependencies]
158-
rdkafka = { version = "0.36.2", default-features = false, features = ["tokio"] }
147+
rdkafka = { version = "0.36.2", default-features = false, features = ["tokio"] }

Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,21 @@ LABEL org.opencontainers.image.licenses="AGPL-3.0"
2525
RUN apk add --no-cache build-base git bash
2626

2727
WORKDIR /parseable
28-
COPY . .
28+
29+
# Cache dependencies
30+
COPY Cargo.toml Cargo.lock build.rs .git ./
31+
RUN mkdir src && echo "fn main() {}" > src/main.rs && cargo build --release && rm -rf src
32+
33+
# Build the actual binary
34+
COPY src ./src
2935
RUN cargo build --release
3036

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

3440
WORKDIR /parseable
3541

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

3945
CMD ["/usr/bin/parseable"]

Dockerfile.debug

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,21 @@ LABEL org.opencontainers.image.vendor="Parseable Inc"
2222
LABEL org.opencontainers.image.licenses="AGPL-3.0"
2323

2424
WORKDIR /parseable
25-
COPY . .
26-
RUN cargo build --features debug
25+
26+
# Cache dependencies
27+
COPY Cargo.toml Cargo.lock build.rs .git ./
28+
RUN mkdir src && echo "fn main() {}" > src/main.rs && cargo build && rm -rf src
29+
30+
# Build the actual binary
31+
COPY src ./src
32+
RUN cargo build
2733

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

3137
WORKDIR /parseable
3238

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

3542
CMD ["/usr/bin/parseable"]

helm-releases/parseable-1.7.3.tgz

50.2 KB
Binary file not shown.

helm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: parseable
33
description: Helm chart for Parseable Server
44
type: application
5-
version: 1.7.2
6-
appVersion: "v1.7.2"
5+
version: 1.7.3
6+
appVersion: "v1.7.3"
77
icon: "https://raw.githubusercontent.com/parseablehq/.github/main/images/logo.svg"
88
maintainers:
99
- name: Parseable Team

0 commit comments

Comments
 (0)