From 8873566dcb3f0cc60921dd118f56aad2a63d68da Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Fri, 12 May 2023 07:09:56 +0000 Subject: [PATCH] Switch to podman --- .github/workflows/images.yml | 2 ++ tools/qemu-debian-img/generate-images.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index 3d2991d..dbd63c0 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -25,10 +25,12 @@ jobs: - name: generate images run: | IP=$(doctl compute droplet list --tag-name=github-actions --format "Name,Public IPv4" | grep -v ID | grep ga-out-of-tree-$GITHUB_SHA | awk '{print $2}') + sleep 1m ssh -o StrictHostKeyChecking=accept-new root@$IP apt update ssh -o StrictHostKeyChecking=accept-new root@$IP apt install -y git podman ssh -o StrictHostKeyChecking=accept-new root@$IP git clone https://github.com/out-of-tree/out-of-tree ssh -o StrictHostKeyChecking=accept-new root@$IP sh -c "cd out-of-tree && git checkout $GITHUB_SHA" + ssh -o StrictHostKeyChecking=accept-new root@$IP ./out-of-tree/tools/qemu-debian-img/generate-images.sh - name: delete droplet if: always() diff --git a/tools/qemu-debian-img/generate-images.sh b/tools/qemu-debian-img/generate-images.sh index bda7c19..bc849ce 100755 --- a/tools/qemu-debian-img/generate-images.sh +++ b/tools/qemu-debian-img/generate-images.sh @@ -39,10 +39,10 @@ for version in 7 8 9 10 11; do sed -i "s;_REPOSITORY_;${repository};" $version/Dockerfile - docker build -t gen-debian${version}-image $version + podman build -t gen-debian${version}-image $version rm -rf $version - docker run --privileged -v $(pwd):/shared -t gen-debian${version}-image + podman run --privileged -v $(pwd):/shared -t gen-debian${version}-image tar -Szcf out_of_tree_debian_${version}.img.tar.gz out_of_tree_debian_${version}.img done