From 2504510c6167aee6442b2fc3661f457ae29c289d Mon Sep 17 00:00:00 2001 From: yusing Date: Sun, 23 Feb 2025 06:36:20 +0800 Subject: [PATCH] update default image name --- .github/workflows/docker-image-nightly.yml | 2 +- .github/workflows/docker-image.yml | 1 + agent/pkg/agent/docker_compose.go | 2 +- compose.example.yml | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-image-nightly.yml b/.github/workflows/docker-image-nightly.yml index 72091f2..0719e8f 100644 --- a/.github/workflows/docker-image-nightly.yml +++ b/.github/workflows/docker-image-nightly.yml @@ -6,7 +6,7 @@ on: - "*" # matches every branch that doesn't contain a '/' - "*/*" # matches every branch containing a single '/' - "**" # matches every branch - - "!main" # excludes master + - "!main" # excludes main jobs: build-nightly: diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 78895c0..0d0b42e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -158,5 +158,6 @@ jobs: docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ inputs.image_name }}:${{ steps.meta.outputs.version }} - name: Inspect image (old) + if: inputs.old_image_name != '' run: | docker buildx imagetools inspect ${{ env.REGISTRY }}/${{ inputs.old_image_name }}:${{ steps.meta.outputs.version }} diff --git a/agent/pkg/agent/docker_compose.go b/agent/pkg/agent/docker_compose.go index 02fe9a9..e13c9c8 100644 --- a/agent/pkg/agent/docker_compose.go +++ b/agent/pkg/agent/docker_compose.go @@ -21,7 +21,7 @@ var agentComposeYAMLTemplate = template.Must(template.New("agent.compose.yml").P const ( DockerImageProduction = "ghcr.io/yusing/godoxy-agent:latest" - DockerImageNightly = "yusing/godoxy-agent-nightly:latest" + DockerImageNightly = "ghcr.io/yusing/godoxy-agent:nightly" ) type ( diff --git a/compose.example.yml b/compose.example.yml index 06ef4a9..b3ad32c 100755 --- a/compose.example.yml +++ b/compose.example.yml @@ -1,7 +1,7 @@ --- services: frontend: - image: ghcr.io/yusing/go-proxy-frontend:latest + image: ghcr.io/yusing/godoxy-frontend:latest container_name: godoxy-frontend restart: unless-stopped network_mode: host # do not change this @@ -24,7 +24,7 @@ services: # - 192.168.0.0/16 # - 172.16.0.0/12 app: - image: ghcr.io/yusing/go-proxy:latest + image: ghcr.io/yusing/godoxy:latest container_name: godoxy restart: always network_mode: host # do not change this