From 0495a9dea7fe0069ec9e60df8def1dae3cd2286c Mon Sep 17 00:00:00 2001 From: Passthem Date: Tue, 10 Jun 2025 04:27:49 +0900 Subject: [PATCH] fix111 --- .drone.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 503d8ad..afee885 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,16 +13,18 @@ steps: DOCKER_PASSWORD: from_secret: DOCKER_PASSWORD DOCKER_REGISTRY: gitea.service.jazzwhom.top + DOCKER_ORGANIZATION: kagami-public + DOCKER_APPLICATION: temp-20250607.0350-my-tiny-app volumes: - name: docker-socket path: /var/run/docker.sock commands: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin "$DOCKER_REGISTRY" - - docker build -t "$DOCKER_REGISTRY/your-org/your-app:$DOCKER_TAG" . - - docker build -t "$DOCKER_REGISTRY/your-org/your-app:latest" . - - docker push "$DOCKER_REGISTRY/your-org/your-app:$DOCKER_TAG" - - docker push "$DOCKER_REGISTRY/your-org/your-app:latest" + - docker build -t "$DOCKER_REGISTRY/$DOCKER_ORGANIZATION/$DOCKER_APPLICATION:$DOCKER_TAG" . + - docker build -t "$DOCKER_REGISTRY/$DOCKER_ORGANIZATION/$DOCKER_APPLICATION:latest" . + - docker push "$DOCKER_REGISTRY/$DOCKER_ORGANIZATION/$DOCKER_APPLICATION:$DOCKER_TAG" + - docker push "$DOCKER_REGISTRY/$DOCKER_ORGANIZATION/$DOCKER_APPLICATION:latest" - name: 清理累赘的 Docker 镜像 image: docker:latest @@ -31,8 +33,8 @@ steps: - name: docker-socket path: /var/run/docker.sock commands: - - docker rmi "$DOCKER_REGISTRY/your-org/your-app:$DOCKER_TAG" - - docker rmi "$DOCKER_REGISTRY/your-org/your-app:latest" + - docker rmi "$DOCKER_REGISTRY/$DOCKER_ORGANIZATION/$DOCKER_APPLICATION:$DOCKER_TAG" + - docker rmi "$DOCKER_REGISTRY/$DOCKER_ORGANIZATION/$DOCKER_APPLICATION:latest" when: status: - success