This commit is contained in:
@@ -24,7 +24,11 @@ concurrency:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
REGISTRY: docker.io
|
REGISTRY: docker.io
|
||||||
DOCKER_USER: ${{ secrets.DOCKER_USERNAME || 'openim' }}
|
# Docker Hub 命名空间:itom-group
|
||||||
|
DOCKER_USER: itom-group
|
||||||
|
# Docker Hub 凭证来自仓库 Secrets
|
||||||
|
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||||
|
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
GO_VERSION: "1.24"
|
GO_VERSION: "1.24"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -97,8 +101,9 @@ jobs:
|
|||||||
- name: 登录到 Docker Hub
|
- name: 登录到 Docker Hub
|
||||||
uses: docker/login-action@v3.1.0
|
uses: docker/login-action@v3.1.0
|
||||||
with:
|
with:
|
||||||
username: ${{ env.DOCKER_USER }}
|
# 使用账号登录,镜像仍推送到 DOCKER_USER 命名空间
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
username: ${{ env.DOCKER_USERNAME }}
|
||||||
|
password: ${{ env.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
- name: 构建和推送 Docker 镜像
|
- name: 构建和推送 Docker 镜像
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -15,8 +15,10 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
env:
|
env:
|
||||||
REGISTRY: git.imall.cloud
|
# 使用 Docker Hub 作为镜像仓库
|
||||||
IMAGE: git.imall.cloud/itom-group/chat-deploy
|
REGISTRY: docker.io
|
||||||
|
# Docker Hub 命名空间:itom-group
|
||||||
|
IMAGE: docker.io/itom-group/chat-deploy
|
||||||
steps:
|
steps:
|
||||||
- name: Install git
|
- name: Install git
|
||||||
shell: sh
|
shell: sh
|
||||||
@@ -141,47 +143,17 @@ jobs:
|
|||||||
- name: Login registry
|
- name: Login registry
|
||||||
shell: sh
|
shell: sh
|
||||||
env:
|
env:
|
||||||
GIT_USER: ${{ secrets.GIT_USER }}
|
# Docker Hub 凭证来自仓库 Secrets
|
||||||
GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
|
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||||
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
|
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
|
||||||
AUTO_REGISTRY_USER: ${{ env.DOCKER_USER }}
|
|
||||||
AUTO_REGISTRY_PASS: ${{ secrets.DOCKER_PASSWORD }}
|
|
||||||
|
|
||||||
run: |
|
run: |
|
||||||
set -eu
|
set -eu
|
||||||
login_try() {
|
# 使用 Docker Hub 凭证登录,避免触发私有仓库上传限制
|
||||||
local user="$1"
|
if [ -z "${DOCKER_USERNAME:-}" ] || [ -z "${DOCKER_PASSWORD:-}" ]; then
|
||||||
local pass="$2"
|
echo "ERROR: 缺少 Docker Hub 凭证(DOCKER_USERNAME/DOCKER_PASSWORD)。"
|
||||||
local label="$3"
|
exit 1
|
||||||
if [ -z "$user" ] || [ -z "$pass" ]; then
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
if echo "$pass" | docker login "$REGISTRY" -u "$user" --password-stdin >/dev/null 2>&1; then
|
|
||||||
echo "Registry login ok ($label)"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
if login_try "$REGISTRY_USER" "$REGISTRY_PASSWORD" "REGISTRY_USER"; then
|
|
||||||
exit 0
|
|
||||||
fi
|
fi
|
||||||
if login_try "$GIT_USER" "$GIT_TOKEN" "GIT_USER"; then
|
echo "$DOCKER_PASSWORD" | docker login "$REGISTRY" -u "$DOCKER_USERNAME" --password-stdin
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
if login_try "${AUTO_REGISTRY_USER:-}" "${AUTO_REGISTRY_PASS:-}" "AUTO_REGISTRY"; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
ACTOR="${GITEA_ACTOR:-${FORGEJO_ACTOR:-${GITHUB_ACTOR:-}}}"
|
|
||||||
JOB_TOKEN="${GITEA_TOKEN:-${FORGEJO_TOKEN:-${GITHUB_TOKEN:-}}}"
|
|
||||||
if login_try "$ACTOR" "$JOB_TOKEN" "JOB_TOKEN"; then
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "ERROR: registry login failed. Provide REGISTRY_USER/REGISTRY_PASSWORD or GIT_USER/GIT_TOKEN with packages write permission."
|
|
||||||
exit 1
|
|
||||||
|
|
||||||
- name: Build and push images
|
- name: Build and push images
|
||||||
shell: sh
|
shell: sh
|
||||||
|
|||||||
7
.github/workflows/build-docker-image.yml
vendored
7
.github/workflows/build-docker-image.yml
vendored
@@ -19,6 +19,9 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
GO_VERSION: "1.22"
|
GO_VERSION: "1.22"
|
||||||
|
# Docker Hub 凭证来自仓库 Secrets
|
||||||
|
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||||
|
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-image:
|
build-image:
|
||||||
@@ -33,8 +36,8 @@ jobs:
|
|||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@v3.3.0
|
uses: docker/login-action@v3.3.0
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ env.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ env.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
- name: Log in to GitHub Container Registry
|
- name: Log in to GitHub Container Registry
|
||||||
uses: docker/login-action@v3.3.0
|
uses: docker/login-action@v3.3.0
|
||||||
|
|||||||
@@ -13,6 +13,11 @@ on:
|
|||||||
required: true
|
required: true
|
||||||
default: "v3.8.3"
|
default: "v3.8.3"
|
||||||
|
|
||||||
|
env:
|
||||||
|
# Docker Hub 凭证来自仓库 Secrets
|
||||||
|
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||||
|
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push:
|
build-and-push:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@@ -27,8 +32,8 @@ jobs:
|
|||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@v3.3.0
|
uses: docker/login-action@v3.3.0
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ env.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ env.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
- name: Log in to GitHub Container Registry
|
- name: Log in to GitHub Container Registry
|
||||||
uses: docker/login-action@v3.3.0
|
uses: docker/login-action@v3.3.0
|
||||||
@@ -73,7 +78,7 @@ jobs:
|
|||||||
|
|
||||||
# Read each tag and append --tag arguments
|
# Read each tag and append --tag arguments
|
||||||
while IFS= read -r tag; do
|
while IFS= read -r tag; do
|
||||||
tag_args+=(--tag "${{ secrets.DOCKER_USERNAME }}/$IMAGE_NAME:$tag")
|
tag_args+=(--tag "${{ env.DOCKER_USERNAME }}/$IMAGE_NAME:$tag")
|
||||||
tag_args+=(--tag "ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:$tag")
|
tag_args+=(--tag "ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:$tag")
|
||||||
tag_args+=(--tag "registry.cn-hangzhou.aliyuncs.com/openimsdk/$IMAGE_NAME:$tag")
|
tag_args+=(--tag "registry.cn-hangzhou.aliyuncs.com/openimsdk/$IMAGE_NAME:$tag")
|
||||||
done <<< "${{ steps.meta.outputs.tags }}"
|
done <<< "${{ steps.meta.outputs.tags }}"
|
||||||
|
|||||||
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
@@ -16,6 +16,9 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
env:
|
env:
|
||||||
DOCKER_CLI_EXPERIMENTAL: "enabled"
|
DOCKER_CLI_EXPERIMENTAL: "enabled"
|
||||||
|
# Docker Hub 凭证来自仓库 Secrets
|
||||||
|
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||||
|
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
@@ -43,8 +46,8 @@ jobs:
|
|||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ env.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ env.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v2
|
uses: docker/login-action@v2
|
||||||
|
|||||||
Reference in New Issue
Block a user