diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index a0ae835d..b04b7b5e 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -11,7 +11,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository_owner }}/${{ github.event.repository.name }} + IMAGE_NAME: ${{ github.repository_owner }}/cpmp jobs: build-and-push: @@ -32,12 +32,6 @@ jobs: - name: ๐Ÿ“ฅ Checkout code uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 - # Normalize IMAGE_NAME to lowercase to satisfy container registry format - - name: ๐Ÿ”ค Normalize image name - run: | - raw="${{ github.repository_owner }}/${{ github.event.repository.name }}" - echo "IMAGE_NAME=$(echo "$raw" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV - - name: ๐Ÿงช Determine skip condition id: skip run: | diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index c011375e..8ebbe88a 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -15,7 +15,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository_owner }}/${{ github.event.repository.name }} + IMAGE_NAME: ${{ github.repository_owner }}/cpmp jobs: build-and-push: @@ -30,11 +30,6 @@ jobs: - name: Checkout repository uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1 - - name: Normalize image name - run: | - raw="${{ github.repository_owner }}/${{ github.event.repository.name }}" - echo "IMAGE_NAME=$(echo "$raw" | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV - - name: Determine skip condition id: skip run: | diff --git a/Dockerfile b/Dockerfile index 05fad2a3..be3cfd8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,7 @@ RUN CGO_ENABLED=1 GOOS=linux go build \ -ldflags "-X github.com/Wikid82/CaddyProxyManagerPlus/backend/internal/version.SemVer=${VERSION} \ -X github.com/Wikid82/CaddyProxyManagerPlus/backend/internal/version.GitCommit=${VCS_REF} \ -X github.com/Wikid82/CaddyProxyManagerPlus/backend/internal/version.BuildDate=${BUILD_DATE}" \ - -o api ./cmd/api + -o cpmp ./cmd/api # ---- Final Runtime with Caddy ---- FROM ${CADDY_IMAGE} @@ -63,7 +63,7 @@ RUN apk --no-cache add ca-certificates sqlite-libs \ && apk --no-cache upgrade # Copy Go binary from backend builder -COPY --from=backend-builder /app/backend/api /app/api +COPY --from=backend-builder /app/backend/cpmp /app/cpmp # Copy frontend build from frontend builder COPY --from=frontend-builder /app/frontend/dist /app/frontend/dist @@ -89,7 +89,7 @@ ARG BUILD_DATE ARG VCS_REF # OCI image labels for version metadata -LABEL org.opencontainers.image.title="CaddyProxyManager+" \ +LABEL org.opencontainers.image.title="CaddyProxyManager+ (CPMP)" \ org.opencontainers.image.description="Web UI for managing Caddy reverse proxy configurations" \ org.opencontainers.image.version="${VERSION}" \ org.opencontainers.image.created="${BUILD_DATE}" \ diff --git a/GHCR_MIGRATION_SUMMARY.md b/GHCR_MIGRATION_SUMMARY.md index 163b2da1..392b78e5 100644 --- a/GHCR_MIGRATION_SUMMARY.md +++ b/GHCR_MIGRATION_SUMMARY.md @@ -115,13 +115,13 @@ The `docs.yml` workflow already configured for GitHub Pages: **Latest stable version:** ```bash -docker pull ghcr.io/wikid82/caddyproxymanagerplus:latest -docker run -d -p 8080:8080 -v caddy_data:/app/data ghcr.io/wikid82/caddyproxymanagerplus:latest +docker pull ghcr.io/wikid82/cpmp:latest +docker run -d -p 8080:8080 -v caddy_data:/app/data ghcr.io/wikid82/cpmp:latest ``` **Development version:** ```bash -docker pull ghcr.io/wikid82/caddyproxymanagerplus:dev +docker pull ghcr.io/wikid82/cpmp:dev ``` **Specific version:** diff --git a/Makefile b/Makefile index 11405ced..dd011599 100644 --- a/Makefile +++ b/Makefile @@ -66,8 +66,8 @@ docker-build-versioned: --build-arg VERSION=$$VERSION \ --build-arg BUILD_DATE=$$BUILD_DATE \ --build-arg VCS_REF=$$VCS_REF \ - -t caddyproxymanagerplus:$$VERSION \ - -t caddyproxymanagerplus:latest \ + -t cpmp:$$VERSION \ + -t cpmp:latest \ . # Run Docker containers (production) diff --git a/README.md b/README.md index aa5d7c6f..1fefe19d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Caddy Proxy Manager Plus +# Caddy Proxy Manager+ (CPMP) **Make your websites easy to reach!** ๐Ÿš€ @@ -56,14 +56,16 @@ Don't have Docker? [Download it here](https://docs.docker.com/get-docker/) - it' ### Step 2: Run One Command Open your terminal and paste this: +**Real-World Example:** ```bash docker run -d \ -p 8080:8080 \ -v caddy_data:/app/data \ --name caddy-proxy-manager \ - ghcr.io/wikid82/caddyproxymanagerplus:latest + ghcr.io/wikid82/cpmp:latest ``` + ### Step 3: Open Your Browser Go to: **http://localhost:8080** diff --git a/VERSION.md b/VERSION.md index eef5abd2..fb19b053 100644 --- a/VERSION.md +++ b/VERSION.md @@ -62,16 +62,16 @@ Example: `0.1.0-alpha`, `1.0.0-beta.1`, `2.0.0-rc.2` ```bash # Use latest stable release -docker pull ghcr.io/wikid82/caddyproxymanagerplus:latest +docker pull ghcr.io/wikid82/cpmp:latest # Use specific version -docker pull ghcr.io/wikid82/caddyproxymanagerplus:v1.0.0 +docker pull ghcr.io/wikid82/cpmp:v1.0.0 # Use development builds -docker pull ghcr.io/wikid82/caddyproxymanagerplus:development +docker pull ghcr.io/wikid82/cpmp:development # Use specific commit -docker pull ghcr.io/wikid82/caddyproxymanagerplus:main-abc123 +docker pull ghcr.io/wikid82/cpmp:main-abc123 ``` ## Version Information @@ -97,7 +97,7 @@ Response includes: View version metadata: ```bash -docker inspect ghcr.io/wikid82/caddyproxymanagerplus:latest \ +docker inspect ghcr.io/wikid82/cpmp:latest \ --format='{{json .Config.Labels}}' | jq ``` @@ -111,7 +111,7 @@ Returns OCI-compliant labels: Local builds default to `version=dev`: ```bash -docker build -t caddyproxymanagerplus:dev . +docker build -t cpmp:dev . ``` Build with custom version: diff --git a/VERSIONING_IMPLEMENTATION.md b/VERSIONING_IMPLEMENTATION.md index 3ea68282..d6219684 100644 --- a/VERSIONING_IMPLEMENTATION.md +++ b/VERSIONING_IMPLEMENTATION.md @@ -100,7 +100,7 @@ docker build \ --build-arg VERSION=1.2.3 \ --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ --build-arg VCS_REF=$(git rev-parse HEAD) \ - -t caddyproxymanagerplus:1.2.3 . + -t cpmp:1.2.3 . ``` ### Querying Version at Runtime @@ -109,14 +109,14 @@ docker build \ curl http://localhost:8080/api/v1/health { "status": "ok", - "service": "caddy-proxy-manager-plus", + "service": "CPMP", "version": "1.0.0", "git_commit": "abc1234567890def", "build_date": "2025-11-17T12:34:56Z" } # Container image labels -docker inspect ghcr.io/wikid82/caddyproxymanagerplus:latest \ +docker inspect ghcr.io/wikid82/cpmp:latest \ --format='{{json .Config.Labels}}' | jq ``` diff --git a/backend/internal/version/version.go b/backend/internal/version/version.go index 5bbaaad4..7936ade8 100644 --- a/backend/internal/version/version.go +++ b/backend/internal/version/version.go @@ -2,7 +2,7 @@ package version const ( // Name of the application - Name = "CaddyProxyManagerPlus" + Name = "CPMP" // Version is the semantic version Version = "0.1.0" // BuildTime is set during build via ldflags diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 62628d2c..f8bcc6f5 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -27,7 +27,7 @@ done # Start CPM+ management application echo "Starting CPM+ management application..." -/app/api & +/app/cpmp & APP_PID=$! echo "CPM+ started (PID: $APP_PID)" diff --git a/docs/getting-started.md b/docs/getting-started.md index d65ea219..6a1abe59 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -42,7 +42,7 @@ docker run -d \ -p 8080:8080 \ -v caddy_data:/app/data \ --name caddy-proxy-manager \ - ghcr.io/wikid82/caddyproxymanagerplus:latest + ghcr.io/wikid82/cpmp:latest ``` **What does this do?** It downloads and starts the app. You don't need to understand the details - just copy and paste! diff --git a/docs/github-setup.md b/docs/github-setup.md index 5f965edc..5d5d6624 100644 --- a/docs/github-setup.md +++ b/docs/github-setup.md @@ -197,13 +197,13 @@ When you're ready to release a new version: docker pull ghcr.io/wikid82/caddyproxymanagerplus:dev # Pull stable version -docker pull ghcr.io/wikid82/caddyproxymanagerplus:latest +docker pull ghcr.io/wikid82/cpmp:latest # Pull specific version -docker pull ghcr.io/wikid82/caddyproxymanagerplus:1.0.0 +docker pull ghcr.io/wikid82/cpmp:1.0.0 # Run the container -docker run -d -p 8080:8080 -v caddy_data:/app/data ghcr.io/wikid82/caddyproxymanagerplus:latest +docker run -d -p 8080:8080 -v caddy_data:/app/data ghcr.io/wikid82/cpmp:latest ``` ### Git Tag Commands