fankes/beszel
2
0
Fork 0
mirror of https://github.com/fankes/beszel.git synced 2025-10-19 01:39:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update dockerfiles and docker workflow

Browse Source
This commit is contained in:
Henry Dollman
2024-08-11 16:21:02 -04:00
parent 2ac5d797d2
commit d0d4e546d9
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/docker-images.yml vendored
View File

@@ -12,12 +12,12 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- image: henrygd/beszel - image: henrygd/beszel-test
context: ./hub context: ./beszel
dockerfile: ./hub/Dockerfile dockerfile: ./dockerfile_Hub
- image: henrygd/beszel-agent - image: henrygd/beszel-agent-test
context: ./agent context: ./beszel
dockerfile: ./agent/Dockerfile dockerfile: ./dockerfile_Agent
permissions: permissions:
contents: read contents: read
packages: write packages: write
@@ -30,10 +30,10 @@ jobs:
uses: oven-sh/setup-bun@v2 uses: oven-sh/setup-bun@v2
- name: Install dependencies - name: Install dependencies
run: bun install --no-save --cwd ./hub/site run: bun install --no-save --cwd ./beszel/site
- name: Build site - name: Build site
run: bun run --cwd ./hub/site build run: bun run --cwd ./beszel/site build
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@v3

8
beszel/dockerfile_Agent
View File

@@ -2,15 +2,15 @@ FROM --platform=$BUILDPLATFORM golang:alpine AS builder
WORKDIR /app WORKDIR /app
# Download Go modules
COPY go.mod go.sum ./ COPY go.mod go.sum ./
RUN go mod download # RUN go mod download
COPY *.go ./ COPY *.go ./
COPY cmd ./cmd
COPY internal ./internal
# Build # Build
ARG TARGETOS TARGETARCH ARG TARGETOS TARGETARCH
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent . RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /agent ./cmd/agent
# ? ------------------------- # ? -------------------------
FROM scratch FROM scratch

6
beszel/dockerfile_Hub
View File

@@ -4,10 +4,12 @@ WORKDIR /app
# Download Go modules # Download Go modules
COPY go.mod go.sum ./ COPY go.mod go.sum ./
RUN go mod download # RUN go mod download
# Copy source files # Copy source files
COPY *.go ./ COPY *.go ./
COPY cmd ./cmd
COPY internal ./internal
COPY migrations ./migrations COPY migrations ./migrations
COPY site/dist ./site/dist COPY site/dist ./site/dist
COPY site/*.go ./site COPY site/*.go ./site
@@ -20,7 +22,7 @@ RUN update-ca-certificates
# Build # Build
ARG TARGETOS TARGETARCH ARG TARGETOS TARGETARCH
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /beszel . RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags "-w -s" -o /beszel ./cmd/hub
# ? ------------------------- # ? -------------------------
FROM scratch FROM scratch