feature/0701 #1

Merged
pywee merged 5 commits from feature/0701 into master 2026-07-06 17:08:04 +08:00
Showing only changes of commit 89fc6d65f9 - Show all commits

View File

@@ -7,18 +7,16 @@ clone:
steps: steps:
- name: build-and-run-apps - name: build-and-run-apps
image: docker:dind image: docker:cli
pull: if-not-exists pull: if-not-exists
volumes: volumes:
- name: docker_sock - name: docker_sock
path: /var/run/docker.sock path: /var/run/docker.sock
- name: docker_lib
path: /var/lib/docker
- name: configs_dir - name: configs_dir
path: /bluetti/frontend_project/bluetti-shop-configs path: /bluetti/frontend_project/bluetti-shop-configs
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: "1"
COMPOSE_DOCKER_CLI_BUILD: 1 COMPOSE_DOCKER_CLI_BUILD: "1"
DRONE_COMMIT: ${DRONE_COMMIT} DRONE_COMMIT: ${DRONE_COMMIT}
DRONE_COMMIT_BEFORE: ${DRONE_COMMIT_BEFORE} DRONE_COMMIT_BEFORE: ${DRONE_COMMIT_BEFORE}
DRONE_COMMIT_AFTER: ${DRONE_COMMIT_AFTER} DRONE_COMMIT_AFTER: ${DRONE_COMMIT_AFTER}
@@ -26,6 +24,9 @@ steps:
PROJECT_NAME: PROJECT_NAME:
from_secret: PROJECT_NAME from_secret: PROJECT_NAME
commands: commands:
- docker version
- docker info
- docker buildx version || true
- | - |
if [ "${DRONE_BUILD_EVENT}" = "pull_request" ] || [ "${DRONE_BUILD_EVENT}" = "merge_request" ]; then if [ "${DRONE_BUILD_EVENT}" = "pull_request" ] || [ "${DRONE_BUILD_EVENT}" = "merge_request" ]; then
# 如果是 MR直接对比目标分支假设是 dev # 如果是 MR直接对比目标分支假设是 dev
@@ -110,14 +111,12 @@ clone:
steps: steps:
- name: build-and-run-apps - name: build-and-run-apps
image: docker:dind image: docker:cli
volumes: volumes:
- name: docker_sock - name: docker_sock
path: /var/run/docker.sock # 允许在容器内调用宿主机的 Docker path: /var/run/docker.sock # 允许在容器内调用宿主机的 Docker
- name: configs_dir - name: configs_dir
path: /bluetti/frontend_project/bluetti-shop-configs path: /bluetti/frontend_project/bluetti-shop-configs
- name: docker_lib
path: /var/lib/docker
environment: environment:
DRONE_COMMIT: ${DRONE_COMMIT} DRONE_COMMIT: ${DRONE_COMMIT}
DRONE_COMMIT_BEFORE: ${DRONE_COMMIT_BEFORE} DRONE_COMMIT_BEFORE: ${DRONE_COMMIT_BEFORE}
@@ -162,10 +161,10 @@ steps:
if docker compose -f "$COMPOSE_FILE" -p "$PROJECT_NAME_TEST" config --services | grep -q "^$svc$"; then if docker compose -f "$COMPOSE_FILE" -p "$PROJECT_NAME_TEST" config --services | grep -q "^$svc$"; then
echo ">>>>>> 构建服务: $svc $PROJECT_NAME_TEST <<<<<<" echo ">>>>>> 构建服务: $svc $PROJECT_NAME_TEST <<<<<<"
cp /bluetti/frontend_project/bluetti-shop-configs/"$svc"-test.env apps/$svc/.env.test cp /bluetti/frontend_project/bluetti-shop-configs/"$svc"-test.env apps/$svc/.env.test
# docker compose -f "$COMPOSE_FILE" -p "$PROJECT_NAME_TEST" build "$svc" # docker compose -f "$COMPOSE_FILE" -p "$PROJECT_NAME_TEST" up -d "$svc" --build
docker compose -f "$COMPOSE_FILE" -p "$PROJECT_NAME_TEST" up -d "$svc" --build
fi fi
done done
docker compose --parallel 8 -f "$COMPOSE_FILE" -p "$PROJECT_NAME_TEST" up -d --build $build_list
volumes: volumes:
- name: pnpm_store - name: pnpm_store
@@ -208,10 +207,8 @@ clone:
steps: steps:
- name: build-and-push-apps - name: build-and-push-apps
image: docker:dind image: docker:cli
volumes: volumes:
- name: docker_lib
path: /var/lib/docker
- name: docker_sock - name: docker_sock
path: /var/run/docker.sock path: /var/run/docker.sock
- name: configs_dir - name: configs_dir
@@ -369,10 +366,8 @@ clone:
steps: steps:
- name: build-and-push-apps - name: build-and-push-apps
image: docker:dind image: docker:cli
volumes: volumes:
- name: docker_lib
path: /var/lib/docker
- name: docker_sock - name: docker_sock
path: /var/run/docker.sock path: /var/run/docker.sock
- name: configs_dir - name: configs_dir