Compare commits
2 Commits
release/v1
...
fix/docker
| Author | SHA1 | Date | |
|---|---|---|---|
| b4921d51a0 | |||
| 455013db8e |
3
.github/workflows/ci.yml
vendored
3
.github/workflows/ci.yml
vendored
@ -135,7 +135,6 @@ jobs:
|
|||||||
needs: [rust-format, clippy, rust-test, security-audit, frontend-lint]
|
needs: [rust-format, clippy, rust-test, security-audit, frontend-lint]
|
||||||
if: startsWith(github.ref, 'refs/tags/v')
|
if: startsWith(github.ref, 'refs/tags/v')
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 60
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
@ -167,7 +166,7 @@ jobs:
|
|||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|||||||
@ -12,7 +12,7 @@ members = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "1.1.5"
|
version = "1.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["Echo <echo@moon-dragon.us>"]
|
authors = ["Echo <echo@moon-dragon.us>"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|||||||
38
Dockerfile
38
Dockerfile
@ -6,36 +6,20 @@
|
|||||||
# =============================================================================
|
# =============================================================================
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Stage 1: Rust build (Ubuntu 24.04 + rustup)
|
# Stage 1: Rust build
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
FROM ubuntu:24.04 AS rust-builder
|
FROM rust:1.82-bookworm AS rust-builder
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
build-essential \
|
|
||||||
curl \
|
|
||||||
pkg-config \
|
pkg-config \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
libfontconfig1-dev \
|
libfontconfig1-dev \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Install Rust via rustup (stable channel, provides 1.85+)
|
|
||||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
|
|
||||||
ENV PATH="/root/.cargo/bin:${PATH}"
|
|
||||||
|
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
|
|
||||||
# Cache dependencies by building a dummy project first
|
# Cache dependencies by building a dummy project first
|
||||||
COPY Cargo.toml Cargo.lock ./
|
COPY Cargo.toml Cargo.lock ./
|
||||||
COPY crates/pm-web/Cargo.toml crates/pm-web/Cargo.toml
|
|
||||||
COPY crates/pm-worker/Cargo.toml crates/pm-worker/Cargo.toml
|
|
||||||
COPY crates/pm-core/Cargo.toml crates/pm-core/Cargo.toml
|
|
||||||
COPY crates/pm-agent-client/Cargo.toml crates/pm-agent-client/Cargo.toml
|
|
||||||
COPY crates/pm-auth/Cargo.toml crates/pm-auth/Cargo.toml
|
|
||||||
COPY crates/pm-ca/Cargo.toml crates/pm-ca/Cargo.toml
|
|
||||||
COPY crates/pm-reports/Cargo.toml crates/pm-reports/Cargo.toml
|
|
||||||
COPY crates/migrate-secrets/Cargo.toml crates/migrate-secrets/Cargo.toml
|
|
||||||
RUN mkdir -p crates/pm-web/src crates/pm-worker/src crates/pm-core/src \
|
RUN mkdir -p crates/pm-web/src crates/pm-worker/src crates/pm-core/src \
|
||||||
crates/pm-agent-client/src crates/pm-auth/src crates/pm-ca/src \
|
crates/pm-agent-client/src crates/pm-auth/src crates/pm-ca/src \
|
||||||
crates/pm-reports/src crates/migrate-secrets/src
|
crates/pm-reports/src crates/migrate-secrets/src
|
||||||
@ -51,7 +35,6 @@ RUN cargo build --release 2>/dev/null || true
|
|||||||
|
|
||||||
# Now build the real project
|
# Now build the real project
|
||||||
COPY crates/ crates/
|
COPY crates/ crates/
|
||||||
COPY migrations/ migrations/
|
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|
||||||
# Verify binaries exist
|
# Verify binaries exist
|
||||||
@ -61,21 +44,9 @@ RUN ls -la target/release/pm-web target/release/pm-worker
|
|||||||
RUN strip target/release/pm-web target/release/pm-worker
|
RUN strip target/release/pm-web target/release/pm-worker
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Stage 2: Frontend build (Ubuntu 24.04 + Node.js 20)
|
# Stage 2: Frontend build
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
FROM ubuntu:24.04 AS frontend-builder
|
FROM node:20-bookworm-slim AS frontend-builder
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
|
||||||
curl \
|
|
||||||
ca-certificates \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Install Node.js 20 via NodeSource
|
|
||||||
RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
|
|
||||||
&& apt-get install -y nodejs \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
WORKDIR /usr/src/app/frontend
|
WORKDIR /usr/src/app/frontend
|
||||||
COPY frontend/package.json frontend/package-lock.json ./
|
COPY frontend/package.json frontend/package-lock.json ./
|
||||||
@ -93,7 +64,6 @@ RUN apt-get update && apt-get install -y \
|
|||||||
ca-certificates \
|
ca-certificates \
|
||||||
libssl3t64 \
|
libssl3t64 \
|
||||||
libfontconfig1 \
|
libfontconfig1 \
|
||||||
openssl \
|
|
||||||
postgresql-client-16 \
|
postgresql-client-16 \
|
||||||
argon2 \
|
argon2 \
|
||||||
curl \
|
curl \
|
||||||
|
|||||||
24
debian/changelog
vendored
24
debian/changelog
vendored
@ -1,27 +1,3 @@
|
|||||||
linux-patch-manager (1.1.5-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* Release v1.1.5
|
|
||||||
|
|
||||||
-- git-echo <git-echo@moon-dragon.us> Mon, 08 Jun 2026 20:15:50 -0500
|
|
||||||
|
|
||||||
linux-patch-manager (1.1.4-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* Release v1.1.4
|
|
||||||
|
|
||||||
-- git-echo <git-echo@moon-dragon.us> Mon, 08 Jun 2026 17:30:35 -0500
|
|
||||||
|
|
||||||
linux-patch-manager (1.1.2-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* Release v1.1.2
|
|
||||||
|
|
||||||
-- git-echo <git-echo@moon-dragon.us> Sun, 07 Jun 2026 21:19:18 -0500
|
|
||||||
|
|
||||||
linux-patch-manager (1.1.1-1) unstable; urgency=low
|
|
||||||
|
|
||||||
* Release v1.1.1
|
|
||||||
|
|
||||||
-- git-echo <git-echo@moon-dragon.us> Sun, 07 Jun 2026 18:55:59 -0500
|
|
||||||
|
|
||||||
linux-patch-manager (1.1.0-1) unstable; urgency=low
|
linux-patch-manager (1.1.0-1) unstable; urgency=low
|
||||||
|
|
||||||
* Release v1.1.0
|
* Release v1.1.0
|
||||||
|
|||||||
2
debian/control
vendored
2
debian/control
vendored
@ -1,5 +1,5 @@
|
|||||||
Package: linux-patch-manager
|
Package: linux-patch-manager
|
||||||
Version: 1.1.5-1
|
Version: 1.1.0-1
|
||||||
Architecture: amd64
|
Architecture: amd64
|
||||||
Maintainer: Moon Dragon <echo@moon-dragon.us>
|
Maintainer: Moon Dragon <echo@moon-dragon.us>
|
||||||
Installed-Size: 45000
|
Installed-Size: 45000
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
db:
|
db:
|
||||||
image: postgres:16
|
image: postgres:16-bookworm
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: patch_manager
|
POSTGRES_USER: patch_manager
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "patch-manager-ui",
|
"name": "patch-manager-ui",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.1.5",
|
"version": "1.1.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@ -22,7 +22,7 @@ warn() { echo -e "${YELLOW}[WARN]${NC} $*"; }
|
|||||||
error() { echo -e "${RED}[ERROR]${NC} $*" >&2; exit 1; }
|
error() { echo -e "${RED}[ERROR]${NC} $*" >&2; exit 1; }
|
||||||
|
|
||||||
PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
VERSION="1.1.5"
|
VERSION="1.1.0"
|
||||||
RELEASE="1"
|
RELEASE="1"
|
||||||
PKG_NAME="linux-patch-manager"
|
PKG_NAME="linux-patch-manager"
|
||||||
DEB_NAME="${PKG_NAME}_${VERSION}-${RELEASE}_amd64.deb"
|
DEB_NAME="${PKG_NAME}_${VERSION}-${RELEASE}_amd64.deb"
|
||||||
|
|||||||
Reference in New Issue
Block a user