attune-system/attune
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more adjustments to publisher

Browse Source
This commit is contained in:
David Culbreth
2026-03-25 08:14:06 -05:00
parent 16f1c2f079
commit 8e273ec683
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitea/workflows/publish.yml
View File

@@ -263,16 +263,19 @@ jobs:
run: | run: |
set -euo pipefail set -euo pipefail
push_args=() push_args=()
artifact_file="attune-binaries-${{ matrix.arch }}.tar.gz"
if [ "${{ needs.metadata.outputs.registry_plain_http }}" = "true" ]; then if [ "${{ needs.metadata.outputs.registry_plain_http }}" = "true" ]; then
push_args+=(--plain-http) push_args+=(--plain-http)
fi fi
cp "dist/${artifact_file}" "${artifact_file}"
oras push \ oras push \
"${push_args[@]}" \ "${push_args[@]}" \
"${{ needs.metadata.outputs.artifact_ref_base }}:rust-binaries-${{ needs.metadata.outputs.image_tag }}-${{ matrix.arch }}" \ "${{ needs.metadata.outputs.artifact_ref_base }}:rust-binaries-${{ needs.metadata.outputs.image_tag }}-${{ matrix.arch }}" \
--artifact-type application/vnd.attune.rust-binaries.v1 \ --artifact-type application/vnd.attune.rust-binaries.v1 \
"dist/attune-binaries-${{ matrix.arch }}.tar.gz:application/vnd.attune.rust-binaries.layer.v1.tar+gzip" "${artifact_file}:application/vnd.attune.rust-binaries.layer.v1.tar+gzip"
publish-rust-images: publish-rust-images:
name: Publish ${{ matrix.image.name }} (${{ matrix.arch }}) name: Publish ${{ matrix.image.name }} (${{ matrix.arch }})

20
Makefile
View File

@@ -238,22 +238,24 @@ docker-build-web:
docker compose build web docker compose build web
# Agent binary (statically-linked for injection into any container) # Agent binary (statically-linked for injection into any container)
AGENT_RUST_TARGET ?= x86_64-unknown-linux-musl
build-agent: build-agent:
@echo "Installing musl target (if not already installed)..." @echo "Installing musl target (if not already installed)..."
rustup target add x86_64-unknown-linux-musl 2>/dev/null || true rustup target add $(AGENT_RUST_TARGET) 2>/dev/null || true
@echo "Building statically-linked worker and sensor agent binaries..." @echo "Building statically-linked worker and sensor agent binaries..."
SQLX_OFFLINE=true cargo build --release --target x86_64-unknown-linux-musl --bin attune-agent --bin attune-sensor-agent SQLX_OFFLINE=true cargo build --release --target $(AGENT_RUST_TARGET) --bin attune-agent --bin attune-sensor-agent
strip target/x86_64-unknown-linux-musl/release/attune-agent strip target/$(AGENT_RUST_TARGET)/release/attune-agent
strip target/x86_64-unknown-linux-musl/release/attune-sensor-agent strip target/$(AGENT_RUST_TARGET)/release/attune-sensor-agent
@echo "✅ Agent binaries built:" @echo "✅ Agent binaries built:"
@echo " - target/x86_64-unknown-linux-musl/release/attune-agent" @echo " - target/$(AGENT_RUST_TARGET)/release/attune-agent"
@echo " - target/x86_64-unknown-linux-musl/release/attune-sensor-agent" @echo " - target/$(AGENT_RUST_TARGET)/release/attune-sensor-agent"
@ls -lh target/x86_64-unknown-linux-musl/release/attune-agent @ls -lh target/$(AGENT_RUST_TARGET)/release/attune-agent
@ls -lh target/x86_64-unknown-linux-musl/release/attune-sensor-agent @ls -lh target/$(AGENT_RUST_TARGET)/release/attune-sensor-agent
docker-build-agent: docker-build-agent:
@echo "Building agent Docker image (statically-linked binary)..." @echo "Building agent Docker image (statically-linked binary)..."
DOCKER_BUILDKIT=1 docker buildx build --target agent-init -f docker/Dockerfile.agent -t attune-agent:latest . DOCKER_BUILDKIT=1 docker buildx build --build-arg RUST_TARGET=$(AGENT_RUST_TARGET) --target agent-init -f docker/Dockerfile.agent -t attune-agent:latest .
@echo "✅ Agent image built: attune-agent:latest" @echo "✅ Agent image built: attune-agent:latest"
run-agent: run-agent:

2
crates/common/src/repositories/runtime.rs
View File

@@ -237,7 +237,7 @@ impl Update for RuntimeRepository {
query.push(", updated = NOW() WHERE id = "); query.push(", updated = NOW() WHERE id = ");
query.push_bind(id); query.push_bind(id);
query.push(&format!(" RETURNING {}", SELECT_COLUMNS)); query.push(format!(" RETURNING {}", SELECT_COLUMNS));
let runtime = query let runtime = query
.build_query_as::<Runtime>() .build_query_as::<Runtime>()

13
docker/Dockerfile.agent
View File

@@ -28,12 +28,15 @@
ARG RUST_VERSION=1.92 ARG RUST_VERSION=1.92
ARG DEBIAN_VERSION=bookworm ARG DEBIAN_VERSION=bookworm
ARG RUST_TARGET=x86_64-unknown-linux-musl
# ============================================================================ # ============================================================================
# Stage 1: Builder - Cross-compile a statically-linked binary with musl # Stage 1: Builder - Cross-compile a statically-linked binary with musl
# ============================================================================ # ============================================================================
FROM rust:${RUST_VERSION}-${DEBIAN_VERSION} AS builder FROM rust:${RUST_VERSION}-${DEBIAN_VERSION} AS builder
ARG RUST_TARGET
# Install musl toolchain for static linking # Install musl toolchain for static linking
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
musl-tools \ musl-tools \
@@ -42,8 +45,8 @@ RUN apt-get update && apt-get install -y \
ca-certificates \ ca-certificates \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Add the musl target for fully static binaries # Add the requested musl target for fully static binaries
RUN rustup target add x86_64-unknown-linux-musl RUN rustup target add ${RUST_TARGET}
WORKDIR /build WORKDIR /build
@@ -104,9 +107,9 @@ COPY crates/ ./crates/
RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=shared \ RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=shared \
--mount=type=cache,target=/usr/local/cargo/git,sharing=shared \ --mount=type=cache,target=/usr/local/cargo/git,sharing=shared \
--mount=type=cache,id=agent-target,target=/build/target,sharing=locked \ --mount=type=cache,id=agent-target,target=/build/target,sharing=locked \
cargo build --release --target x86_64-unknown-linux-musl --bin attune-agent --bin attune-sensor-agent && \ cargo build --release --target ${RUST_TARGET} --bin attune-agent --bin attune-sensor-agent && \
cp /build/target/x86_64-unknown-linux-musl/release/attune-agent /build/attune-agent && \ cp /build/target/${RUST_TARGET}/release/attune-agent /build/attune-agent && \
cp /build/target/x86_64-unknown-linux-musl/release/attune-sensor-agent /build/attune-sensor-agent cp /build/target/${RUST_TARGET}/release/attune-sensor-agent /build/attune-sensor-agent
# Strip the binaries to minimize size # Strip the binaries to minimize size
RUN strip /build/attune-agent && strip /build/attune-sensor-agent RUN strip /build/attune-agent && strip /build/attune-sensor-agent