diff --git a/.woodpecker.yml b/.woodpecker.yml index 5ab5f38..858b61b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -88,6 +88,11 @@ steps: echo "Snapshot for rollback: $OLD_IMAGE" fi + # Удаляем legacy-контейнер со статичным именем, чтобы избежать name conflict + if docker ps -a --format '{{.Names}}' | grep -Eq '^intradesk-monitor$'; then + docker rm -f intradesk-monitor || true + fi + # Обновляем образ и перезапускаем docker compose pull docker compose up -d --remove-orphans @@ -98,4 +103,4 @@ steps: when: - event: push branch: main - - event: tag \ No newline at end of file + - event: tag diff --git a/docker-compose.yml b/docker-compose.yml index 9095b4a..2ea2817 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ services: intradesk-monitor: image: ${IMAGE_NAME}:latest - container_name: intradesk-monitor restart: always env_file: .env ports: @@ -17,4 +16,4 @@ services: interval: 30s timeout: 5s retries: 3 - start_period: 15s \ No newline at end of file + start_period: 15s