From c43bad1fc37cd2934ba4d81231149a1f5ca49529 Mon Sep 17 00:00:00 2001 From: Cosmo Date: Fri, 1 May 2026 11:10:56 +0000 Subject: [PATCH] fix: use docker rm -f to avoid stop/rm conflict in CI --- .gitea/workflows/deploy.yml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 275eaef..eaf1b73 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -16,25 +16,7 @@ jobs: cd /opt/digital-home/smart-home-tablet git config --global --add safe.directory /opt/digital-home/smart-home-tablet git pull origin main - # BuildKit включён через DOCKER_BUILDKIT=1 — Dockerfile использует - # cache mounts для /root/.npm и .next/cache, что ускоряет повторные - # сборки в 3-5 раз (npm install не качает заново, next build - # пользует incremental TS-cache). docker build -t smart-home-tablet:latest . - docker stop tablet-yfh53kixpwkjlo4zibglx4n2 || true - docker rm tablet-yfh53kixpwkjlo4zibglx4n2 || true - docker run -d \ - --name tablet-yfh53kixpwkjlo4zibglx4n2 \ - --network coolify \ - -p 3006:3000 \ - --restart unless-stopped \ - --label traefik.enable=true \ - --label 'traefik.http.routers.tablet.rule=Host(`tablet.digital-home.site`)' \ - --label traefik.http.routers.tablet.entrypoints=https \ - --label traefik.http.routers.tablet.tls=true \ - --label traefik.http.routers.tablet.tls.certresolver=letsencrypt \ - --label traefik.http.services.tablet.loadbalancer.server.port=3000 \ - --env-file /opt/digital-home/tablet.env \ - -v /opt/digital-home/smart-home-tablet-data:/data \ - smart-home-tablet:latest + docker rm -f tablet-yfh53kixpwkjlo4zibglx4n2 || true + docker run -d --name tablet-yfh53kixpwkjlo4zibglx4n2 --network coolify -p 3006:3000 --restart unless-stopped --label traefik.enable=true --label 'traefik.http.routers.tablet.rule=Host(`tablet.digital-home.site`)' --label traefik.http.routers.tablet.entrypoints=https --label traefik.http.routers.tablet.tls=true --label traefik.http.routers.tablet.tls.certresolver=letsencrypt --label traefik.http.services.tablet.loadbalancer.server.port=3000 --env-file /opt/digital-home/tablet.env -v /opt/digital-home/smart-home-tablet-data:/data smart-home-tablet:latest echo 'Deploy done'