From a81d206aba124040f39b21ff92ab9d4a8ce50b51 Mon Sep 17 00:00:00 2001 From: Archicratia Date: Sat, 28 Feb 2026 19:49:25 +0100 Subject: [PATCH] deploy: use prebaked nas-deploy image; remove apt-get step --- .gitea/workflows/deploy-staging-live.yml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/deploy-staging-live.yml b/.gitea/workflows/deploy-staging-live.yml index b5c90c3..8964db7 100644 --- a/.gitea/workflows/deploy-staging-live.yml +++ b/.gitea/workflows/deploy-staging-live.yml @@ -28,7 +28,7 @@ jobs: deploy: runs-on: nas-deploy container: - image: mcr.microsoft.com/devcontainers/javascript-node:22-bookworm + image: localhost:5000/archicratie/nas-deploy-node22:2026-02-28-1 steps: - name: Tools sanity @@ -127,25 +127,17 @@ jobs: echo "ℹ️ no annotations/media change -> skip deploy" fi - - name: Install docker client + docker compose plugin (v2) + python yaml + - name: Toolchain sanity + resolve COMPOSE_PROJECT_NAME run: | set -euo pipefail source /tmp/deploy.env [[ "${GO:-0}" == "1" ]] || { echo "ℹ️ skipped"; exit 0; } - apt-get -o Acquire::Retries=5 -o Acquire::ForceIPv4=true update - apt-get install -y --no-install-recommends ca-certificates curl docker.io python3 python3-yaml - rm -rf /var/lib/apt/lists/* - - mkdir -p /usr/local/lib/docker/cli-plugins - curl -fsSL \ - "https://github.com/docker/compose/releases/download/v${COMPOSE_VERSION}/docker-compose-linux-x86_64" \ - -o /usr/local/lib/docker/cli-plugins/docker-compose - chmod +x /usr/local/lib/docker/cli-plugins/docker-compose - + # tools are prebaked in the image + git --version docker version docker compose version - python3 --version + python3 -c 'import yaml; print("PyYAML OK")' # Reuse existing compose project name if containers already exist PROJ="$(docker inspect archicratie-web-blue --format '{{ index .Config.Labels "com.docker.compose.project" }}' 2>/dev/null || true)"