dev #5

Merged
zhangxiang merged 159 commits from dev into main 2026-04-12 17:39:08 +08:00
Showing only changes of commit 159f2ce148 - Show all commits
+2 -11
View File
@@ -225,7 +225,6 @@ steps:
build-image:
image: *docker_image
environment:
DOCKER_HOST: tcp://docker:2375
REGISTRY_PASSWORD:
from_secret: registry_password
commands:
@@ -238,6 +237,8 @@ steps:
- docker push registry.f.novalon.cn/novalon-website:${CI_COMMIT_SHA}
- docker push registry.f.novalon.cn/novalon-website:latest
- docker push registry.f.novalon.cn/novalon-website:release-${CI_COMMIT_SHA:0:7}
volumes:
- /var/run/docker.sock:/var/run/docker.sock
when:
- event: push
branch:
@@ -398,16 +399,6 @@ steps:
status:
- success
# ============================================
# 服务配置
# ============================================
services:
docker:
image: docker:24-dind
privileged: true
environment:
DOCKER_TLS_CERTDIR: ""
# ============================================
# 工作区配置
# ============================================