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
6 changes: 3 additions & 3 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ edition = "2024"
homepage = "https://www.omnect.io/home"
license = "MIT OR Apache-2.0"
repository = "git@github.com:omnect/omnect-ui.git"
version = "1.2.7"
version = "1.2.8"
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG DOCKER_NAMESPACE=omnectweucopsacr.azurecr.io
ARG BUILD_IMAGE=${DOCKER_NAMESPACE}/rust:bookworm
ARG DISTROLESS_IMAGE=gcr.io/distroless/base-debian12:nonroot
ARG BUILD_IMAGE=${DOCKER_NAMESPACE}/rust:trixie
ARG DISTROLESS_IMAGE=gcr.io/distroless/base-debian13:nonroot

FROM ${DISTROLESS_IMAGE} AS distroless

Expand Down Expand Up @@ -56,7 +56,7 @@ RUN bun run build
RUN echo 'const p = JSON.parse(await Bun.file("package.json").text()); delete p.devDependencies; delete p.scripts; await Bun.write("/tmp/sbom-package.json", JSON.stringify(p, null, 2));' | bun run -

# Stage 5: Build Rust backend for target architecture with embedded frontend
FROM ${DOCKER_NAMESPACE}/rust:bookworm AS builder
FROM ${DOCKER_NAMESPACE}/rust:trixie AS builder

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand Down Expand Up @@ -90,7 +90,7 @@ SHELL ["/bin/bash", "-c"]
RUN <<EOT
set -eu

mkdir -p /copy/status.d
mkdir -p /copy/status.d /copy/usr/lib

executable=(omnect-ui-bin)

Expand Down Expand Up @@ -135,7 +135,7 @@ RUN mkdir /cert
FROM ${DISTROLESS_IMAGE} AS base
COPY --from=builder --chown=10000:10000 /cert /cert
COPY --from=builder /work/omnect-ui-bin /omnect-ui
COPY --from=builder /copy/lib/ /lib/
COPY --from=builder /copy/usr/lib/ /usr/lib/
COPY --from=builder /copy/status.d /var/lib/dpkg/status.d
# npm runtime metadata for SBOM generation (stripped of devDependencies)
COPY --from=vue-build /tmp/sbom-package.json /sbom/npm/package.json
Expand Down
Loading