Skip to content

Commit 42c39df

Browse files
committed
cli: include version
1 parent d9457eb commit 42c39df

File tree

7 files changed

+27
-6
lines changed

7 files changed

+27
-6
lines changed

.github/workflows/build.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ jobs:
5353
tool: just,git-cliff,ripgrep
5454

5555
- name: build
56-
run: just replace-version build-binary
56+
run: |
57+
just --evaluate version
58+
just set-version
59+
cargo pkgid
60+
just build-binary
5761
5862
- name: rename
5963
run: |-
@@ -91,7 +95,7 @@ jobs:
9195
with:
9296
tool: just,git-cliff,ripgrep
9397
- name: set version
94-
run: just replace-version
98+
run: just set-version
9599

96100
- name: meta
97101
id: meta

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,6 @@ jobs:
131131
body_path: CHANGELOG.md
132132
name: unstable
133133
prerelease: true
134-
tag_name: main
134+
tag_name: unstable
135135
files: |-
136136
/tmp/binaries/*

README.md

+5
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ rules:
9797
across the entire cluster. This will be updated in the future but requires
9898
namespaces to be available via UI elements.
9999

100+
## Releases
101+
102+
- See releases for the latest tagged release.
103+
- The `unstable` tag is updated on every merge to main.
104+
100105
## TODO
101106

102107
- Groups are probably what most users are going to want to use to configure all

RELEASE.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Releases
2+
3+
Push a new tag to main and the `release` workflow will take care of the rest.
4+
5+
Note: versions are automatically managed as part of the github workflows, see
6+
`just set-version` for what's actually happening. If you need a version replaced
7+
in a file, set it to `just --evaluate version_placeholder`.

docker/kuberift.dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,9 @@ RUN just build-binary
2222

2323
FROM debian:bookworm-slim AS runtime
2424
WORKDIR /app
25+
RUN apt-get update && apt-get install -y \
26+
libssl3 && \
27+
apt-get clean
28+
2529
COPY --from=builder /app/target/release/kuberift /usr/local/bin
2630
CMD ["/usr/local/bin/kuberift", "serve", "-vv"]

justfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ extract-from-digests:
4545

4646
for digest in /tmp/digests/*/*; do
4747
sha="$(basename "${digest}")"
48-
name="$(basename $(dirname "${digest}"))"
49-
echo "Extracting ${name}@sha256:${sha}"
48+
name="kuberift-$(basename $(dirname "${digest}") | cut -d- -f2-)"
49+
echo "Extracting {{ image }}@sha256:${sha}"
5050

5151
container_id="$(docker create {{ image }}@sha256:${sha})"
5252
docker cp "${container_id}:/usr/local/bin/kuberift" "/tmp/bins/${name}"
5353
docker rm "${container_id}"
5454
done
5555

56-
replace-version:
56+
set-version:
5757
rg -g '!justfile' "{{ version_placeholder }}" -l | xargs -I {} sed -i '' -e 's/{{ version_placeholder }}/{{ version }}/g' {}

src/cli.rs

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use tracing_subscriber::{filter::EnvFilter, prelude::*};
2525
pub(crate) static LEVEL: OnceLock<LevelFilter> = OnceLock::new();
2626

2727
#[derive(Parser, Container)]
28+
#[command(about, version)]
2829
pub struct Root {
2930
#[command(subcommand)]
3031
command: RootCmd,

0 commit comments

Comments
 (0)