Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions dockerfiles/Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@ ENV CARGO_HOME=/cargo \
RUN wget https://static.rust-lang.org/rustup/rustup-init.sh && \
chmod +x rustup-init.sh && \
./rustup-init.sh -y && \
cargo install debcargo && \
cargo install debcargo cargo-deb && \
rustc --version

# Install extra packages
ADD packages/ /src/packages/
RUN cargo deb --manifest-path /src/packages/xtr/Cargo.toml --install

# Specify default rust toolchain
ENV RUSTUP_TOOLCHAIN=1.87

Expand All @@ -29,8 +33,7 @@ RUN ln -s /cargo/bin/* /usr/local/bin/
ADD /scripts/toolchain/ /usr/local/bin/

WORKDIR /src
RUN git config --system user.email "[email protected]" && \
git config --system user.name "Docker Compile"
ADD dockerfiles/gitconfig /etc/gitconfig

FROM toolchain as builder

Expand Down
12 changes: 12 additions & 0 deletions dockerfiles/gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[user]
email = [email protected]
name = Docker Compile

[url "git://git.proxmox.com/git/ui/proxmox-yew-widget-toolkit-assets.git"]
insteadOf = [email protected]:yew/proxmox-yew-widget-toolkit-assets

[url "git://git.proxmox.com/git/proxmox-api-types.git"]
insteadOf = [email protected]:/rust/proxmox-api-types

[url "git://git.proxmox.com/git/ui/proxmox-yew-widget-toolkit-assets.git"]
insteadOf = [email protected]:yew/proxmox-yew-widget-toolkit-assets
1 change: 1 addition & 0 deletions packages/xtr/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
target/
145 changes: 145 additions & 0 deletions packages/xtr/Cargo.lock

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

22 changes: 22 additions & 0 deletions packages/xtr/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[package]
name = "xtr"
version = "0.1.11"
edition = "2021"
authors = ["Kamil Trzciński <[email protected]>"]
description = "deb for xtr binary"
build = "build.rs"

[package.metadata.deb]
maintainer = "Kamil Trzciński <[email protected]>"
depends = "$auto"
section = "utils"
priority = "optional"
assets = [
["target/deps/bin/xtr", "usr/bin/", "755"]
]

[lib]
path = "src/lib.rs" # Can be empty or minimal

[build-dependencies]
toml = "0.7"
26 changes: 26 additions & 0 deletions packages/xtr/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
use std::{fs, process::Command};

fn main() {
let cargo_toml = fs::read_to_string("Cargo.toml").expect("Failed to read Cargo.toml");
let cargo_toml: toml::Value = toml::from_str(&cargo_toml).expect("Failed to parse Cargo.toml");

let crate_name = cargo_toml["package"]["name"].as_str().expect("Missing extra crate name");
let crate_version = cargo_toml["package"]["version"].as_str().expect("Missing extra crate version");

let crate_with_version = format!("{}@{}", crate_name, crate_version);

let status = Command::new("cargo")
.args(&[
"install",
&crate_with_version,
"--root",
"target/deps",
"--locked",
])
.status()
.expect("Failed to run cargo install for extra crate");

if !status.success() {
panic!("cargo install for extra crate failed");
}
}
Empty file added packages/xtr/src/lib.rs
Empty file.
2 changes: 1 addition & 1 deletion repos/deps
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ proxmox-backup e17239734487b54111a92c88703727c0ccc98c3b # Thu Aug 7 18:39:03 202
proxmox-mini-journalreader b09ee543344fb7082a27346ecb0008f38af6367d # Tue Jun 3 20:58:30 2025 +0200
proxmox-widget-toolkit 230fb4d0d15b348253aa53cfe169d0066e4f1647 # Wed Aug 6 12:01:37 2025 +0200
extjs 18909118c3d316f0bb48846920b8c94a4efc31f5 # Thu Nov 14 17:31:34 2024 +0100
proxmox-i18n 288ab310ecb96c96307b8b68ace126b8cf6390de # Wed Jul 23 14:38:47 2025 +0200
proxmox-i18n fb915865e0207bd1ef37f17eea8fd9a54e8fcbcd # Wed Aug 6 13:53:16 2025 +0200
pve-xtermjs c69379f49db91429eb01ea56b47f2a2832fec8e7 # Wed Jun 25 15:29:14 2025 +0200
libjs-qrcodejs a9906bd488b5c2045ea4aa8b014d97fdccad63b9 # Thu May 25 14:25:53 2023 +0200
proxmox-acme 6dc96d5a468d1553991589f4197f9ec6eab554c1 # Sun Jun 1 16:51:41 2025 +0200
Expand Down