mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-02-02 20:40:52 +08:00
feat(server): inject build metadata into application logs and container image
This commit is contained in:
@@ -8,9 +8,11 @@ RUN go mod download
|
|||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
ARG APP_VERSION="dev"
|
ARG VERSION=dev
|
||||||
|
ARG COMMIT=none
|
||||||
|
ARG BUILD_DATE=unknown
|
||||||
|
|
||||||
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-X 'main.Version=${APP_VERSION}'" -o ./CLIProxyAPI ./cmd/server/
|
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w -X 'main.Version=${VERSION}' -X 'main.Commit=${COMMIT}' -X 'main.BuildDate=${BUILD_DATE}'" -o ./CLIProxyAPI ./cmd/server/
|
||||||
|
|
||||||
FROM alpine:3.22.0
|
FROM alpine:3.22.0
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,11 @@ import (
|
|||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
var Version = "dev"
|
var (
|
||||||
|
Version = "dev"
|
||||||
|
Commit = "none"
|
||||||
|
BuildDate = "unknown"
|
||||||
|
)
|
||||||
|
|
||||||
// LogFormatter defines a custom log format for logrus.
|
// LogFormatter defines a custom log format for logrus.
|
||||||
// This formatter adds timestamp, log level, and source location information
|
// This formatter adds timestamp, log level, and source location information
|
||||||
@@ -60,7 +64,7 @@ func init() {
|
|||||||
// It parses command-line flags, loads configuration, and starts the appropriate
|
// It parses command-line flags, loads configuration, and starts the appropriate
|
||||||
// service based on the provided flags (login, codex-login, or server mode).
|
// service based on the provided flags (login, codex-login, or server mode).
|
||||||
func main() {
|
func main() {
|
||||||
log.Infof("CLIProxyAPI Version: %v", Version)
|
log.Infof("CLIProxyAPI Version: %s, Commit: %s, BuiltAt: %s", Version, Commit, BuildDate)
|
||||||
|
|
||||||
// Command-line flags to control the application's behavior.
|
// Command-line flags to control the application's behavior.
|
||||||
var login bool
|
var login bool
|
||||||
|
|||||||
36
docker-build.ps1
Normal file
36
docker-build.ps1
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
# build.ps1 - Windows PowerShell Build Script
|
||||||
|
#
|
||||||
|
# This script automates the process of building and running the Docker container
|
||||||
|
# with version information dynamically injected at build time.
|
||||||
|
|
||||||
|
# Stop script execution on any error
|
||||||
|
$ErrorActionPreference = "Stop"
|
||||||
|
|
||||||
|
# --- Step 1: Get Version Information ---
|
||||||
|
# Get the latest git tag or commit hash as the version string.
|
||||||
|
$VERSION = (git describe --tags --always --dirty)
|
||||||
|
|
||||||
|
# Get the short commit hash.
|
||||||
|
$COMMIT = (git rev-parse --short HEAD)
|
||||||
|
|
||||||
|
# Get the current UTC date and time in ISO 8601 format.
|
||||||
|
$BUILD_DATE = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
|
||||||
|
|
||||||
|
Write-Host "--- Building with the following info ---"
|
||||||
|
Write-Host "Version: $VERSION"
|
||||||
|
Write-Host "Commit: $COMMIT"
|
||||||
|
Write-Host "Build Date: $BUILD_DATE"
|
||||||
|
Write-Host "----------------------------------------"
|
||||||
|
|
||||||
|
# --- Step 2: Build the Docker Image ---
|
||||||
|
# Pass the version information as build arguments to 'docker compose build'.
|
||||||
|
# These arguments are then used by the Dockerfile to inject them into the Go binary.
|
||||||
|
docker compose build --build-arg VERSION=$VERSION --build-arg COMMIT=$COMMIT --build-arg BUILD_DATE=$BUILD_DATE
|
||||||
|
|
||||||
|
# --- Step 3: Start the Services ---
|
||||||
|
# Start the services in detached mode using the newly built image.
|
||||||
|
# '--remove-orphans' cleans up any containers for services that are no longer defined.
|
||||||
|
docker compose up -d --remove-orphans
|
||||||
|
|
||||||
|
Write-Host "Build complete. Services are starting."
|
||||||
|
Write-Host "Run 'docker compose logs -f' to see the logs."
|
||||||
41
docker-build.sh
Normal file
41
docker-build.sh
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# build.sh - Linux/macOS Build Script
|
||||||
|
#
|
||||||
|
# This script automates the process of building and running the Docker container
|
||||||
|
# with version information dynamically injected at build time.
|
||||||
|
|
||||||
|
# Exit immediately if a command exits with a non-zero status.
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# --- Step 1: Get Version Information ---
|
||||||
|
# Get the latest git tag or commit hash as the version string.
|
||||||
|
VERSION="$(git describe --tags --always --dirty)"
|
||||||
|
|
||||||
|
# Get the short commit hash.
|
||||||
|
COMMIT="$(git rev-parse --short HEAD)"
|
||||||
|
|
||||||
|
# Get the current UTC date and time in ISO 8601 format.
|
||||||
|
BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
|
||||||
|
|
||||||
|
echo "--- Building with the following info ---"
|
||||||
|
echo "Version: ${VERSION}"
|
||||||
|
echo "Commit: ${COMMIT}"
|
||||||
|
echo "Build Date: ${BUILD_DATE}"
|
||||||
|
echo "----------------------------------------"
|
||||||
|
|
||||||
|
# --- Step 2: Build the Docker Image ---
|
||||||
|
# Pass the version information as build arguments to 'docker compose build'.
|
||||||
|
# These arguments are then used by the Dockerfile to inject them into the Go binary.
|
||||||
|
docker compose build \
|
||||||
|
--build-arg VERSION="${VERSION}" \
|
||||||
|
--build-arg COMMIT="${COMMIT}" \
|
||||||
|
--build-arg BUILD_DATE="${BUILD_DATE}"
|
||||||
|
|
||||||
|
# --- Step 3: Start the Services ---
|
||||||
|
# Start the services in detached mode using the newly built image.
|
||||||
|
# '--remove-orphans' cleans up any containers for services that are no longer defined.
|
||||||
|
docker compose up -d --remove-orphans
|
||||||
|
|
||||||
|
echo "Build complete. Services are starting."
|
||||||
|
echo "Run 'docker compose logs -f' to see the logs."
|
||||||
@@ -3,6 +3,10 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
args:
|
||||||
|
VERSION: ${VERSION:-dev}
|
||||||
|
COMMIT: ${COMMIT:-none}
|
||||||
|
BUILD_DATE: ${BUILD_DATE:-unknown}
|
||||||
image: cli-proxy-api:latest
|
image: cli-proxy-api:latest
|
||||||
container_name: cli-proxy-api
|
container_name: cli-proxy-api
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
Reference in New Issue
Block a user