From 1cb154326072e74c1a67e0a568ecb6db5b957a21 Mon Sep 17 00:00:00 2001 From: hailt Date: Mon, 2 Nov 2026 11:32:20 +0700 Subject: [PATCH] fix: transfer CD bundle over ssh pipes instead of scp sftp/scp bi chan tren duong bastion (Connection closed) trong khi exec channel chay tot. Day compose bang tar pipe, image stream thang vao docker load, bo file tarball trung gian. --- .github/workflows/cd.yml | 11 ++++++----- docker-compose.yml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7c7c1b5..f42356d 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -42,8 +42,6 @@ jobs: if [ -n "${VITE_USE_MOCK_DATA:-}" ]; then ARGS="$ARGS --build-arg VITE_USE_MOCK_DATA=${VITE_USE_MOCK_DATA}"; fi # shellcheck disable=SC2086 docker build $ARGS -t danangble-fe:latest . - docker save danangble-fe:latest | gzip -c > /tmp/danangble-fe.tar.gz - ls -lh /tmp/danangble-fe.tar.gz - name: Setup SSH key and bastion config env: @@ -90,9 +88,13 @@ jobs: chmod 600 ~/.ssh/config - name: Transfer bundle to prod + # scp/sftp bi chan tren duong bastion (Connection closed) nen day + # moi thu qua exec channel bang stdin pipe: compose qua tar, image + # thang vao `docker load`, khong can file trung gian. run: | set -euo pipefail - scp -o StrictHostKeyChecking=accept-new /tmp/danangble-fe.tar.gz docker-compose.yml prod:danangble/ + tar -cf - docker-compose.yml | ssh prod 'mkdir -p ~/danangble && tar -xf - -C ~/danangble' + docker save danangble-fe:latest | ssh prod 'docker load' - name: Roll out (docker load + compose up) run: | @@ -100,8 +102,7 @@ jobs: ssh prod ' set -euo pipefail cd ~/danangble - docker load -i danangble-fe.tar.gz - rm -f danangble-fe.tar.gz + docker images danangble-fe docker compose up -d docker image prune -f docker compose ps diff --git a/docker-compose.yml b/docker-compose.yml index 32d72ea..95bd3c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ # File compose DUY NHẤT trên prod: ~/danangble/docker-compose.yml -# CD push-based: CI build image, nén, đẩy image + file này lên prod, +# CD push-based: CI build image rồi đẩy image + file này lên prod qua SSH, # prod chỉ `docker load` rồi `up` — không build, không git pull. # Có service mới (vd: backend) thì thêm vào file này, không tạo file compose khác. name: danangble