Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.github/workflows/docker.yaml
This commit is contained in:
tech-shrimp 2024-06-11 15:40:15 +08:00
commit 56fb49ecb6

View File

@ -4,9 +4,6 @@ on:
workflow_dispatch: workflow_dispatch:
push: push:
branches: [ main ] branches: [ main ]
# 定时执行此处使用UTC时间
#schedule:
# - cron: '00 23 * * *'
env: env:
@ -21,10 +18,10 @@ jobs:
name: Pull name: Pull
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Setup Docker buildx - name: Docker Setup Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
- name: Check out code - name: Checkout Code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Build and push image Aliyun - name: Build and push image Aliyun
@ -99,4 +96,4 @@ jobs:
docker tag $image $new_image docker tag $image $new_image
echo "docker push $new_image" echo "docker push $new_image"
docker push $new_image docker push $new_image
done < images.txt done < images.txt