diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml index 5e41746..04622db 100644 --- a/.forgejo/workflows/build-image.yml +++ b/.forgejo/workflows/build-image.yml @@ -13,6 +13,10 @@ jobs: env: NIXOS_BUILER_HOST: nixos-builder.lab NIXOS_BUILER_USER: runner + PROXMOX_HOST: 192.168.1.205 + PROXMOX_USER: forgejo-runner + TEMPLATE_VMID: 9001 + LATEST_TEMPLATE_VMID: 9000 steps: - name: Install nodejs @@ -32,6 +36,7 @@ jobs: echo "${{ secrets.RUNNER_SSH_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa ssh-keyscan -H $NIXOS_BUILER_HOST >> ~/.ssh/known_hosts + ssh-keyscan -H $PROXMOX_HOST >> ~/.ssh/known_hosts - name: Test SSH connection run: | @@ -55,12 +60,36 @@ jobs: echo "image=$(ls result/*.vma.zst | head -n 1)" >> $GITHUB_OUTPUT - - name: Upload Artifact - uses: actions/upload-artifact@v3 - if: ${{ steps.build.outputs.image }} - with: - name: nixos-base-image - path: result + - name: Set VERSION from tag or fallback + id: version + run: | + if [ -n "${CI_COMMIT_TAG}" ]; then + echo "tag=${CI_COMMIT_TAG}" >> $GITHUB_OUTPUT + else + echo "tag=dev-$(date +%s)" >> $GITHUB_OUTPUT + fi + + - name: Upload image to Proxmox and manage templates + run: | + set -e + ls + FOLDER="${{ steps.artifact.outputs.download-path }}" + IMAGE_PATH=$(find "$FOLDER" -maxdepth 1 -type f -name '*.vma.zst' | head -n 1) + IMAGE=$(basename "$IMAGE_PATH") + + REMOTE_NAME="nixos-base-image-${{ steps.version.outputs.tag}}.vma.zst" + REMOTE_PATH="/var/lib/vz/dump/" + + echo "Uploading $IMAGE to Proxmox as $REMOTE_NAME" + scp $IMAGE_PATH $PROXMOX_USER@$PROXMOX_HOST:$REMOTE_PATH + + echo "Restoring as VMID $TEMPLATE_VMID" + ssh $PROXMOX_USER@$PROXMOX_HOST " + cd $REMOTE_PATH + cp $IMAGE $REMOTE_NAME + + + " release: name: Release Image @@ -80,15 +109,6 @@ jobs: with: name: nixos-base-image - - name: Set VERSION from tag or fallback - id: version - run: | - if [ -n "${CI_COMMIT_TAG}" ]; then - echo "tag=${CI_COMMIT_TAG}" >> $GITHUB_OUTPUT - else - echo "tag=dev-$(date +%s)" >> $GITHUB_OUTPUT - fi - - name: Prepare SSH run: | mkdir -p ~/.ssh @@ -101,32 +121,6 @@ jobs: echo "Testing SSH connection to $PROXMOX_HOST..." ssh -o StrictHostKeyChecking=yes $PROXMOX_USER@$PROXMOX_HOST "echo 'SSH success. Hostname:' && hostname" - - name: Upload image to Proxmox and manage templates - run: | - set -e - ls - FOLDER="${{ steps.artifact.outputs.download-path }}" - IMAGE_PATH=$(find "$FOLDER" -maxdepth 1 -type f -name '*.vma.zst' | head -n 1) - IMAGE=$(basename "$IMAGE_PATH") - - REMOTE_NAME="nixos-base-image-${{ steps.version.outputs.tag}}.vma.zst" - REMOTE_PATH="/var/lib/vz/dump/$REMOTE_NAME" - - echo "Uploading $IMAGE to Proxmox as $REMOTE_NAME" - scp $IMAGE_PATH $PROXMOX_USER@$PROXMOX_HOST:$REMOTE_PATH - - echo "Restoring as VMID $TEMPLATE_VMID" - ssh $PROXMOX_USER@$PROXMOX_HOST " - qm destroy $TEMPLATE_VMID --purge || true - qmrestore $REMOTE_PATH $TEMPLATE_VMID --unique - qm template $TEMPLATE_VMID - - echo 'Cloning to $LATEST_TEMPLATE_VMID as latest' - qm destroy $LATEST_TEMPLATE_VMID --purge || true - qm clone $TEMPLATE_VMID $LATEST_TEMPLATE_VMID --name nixos-base-latest - qm template $TEMPLATE_VMID - " - - name: Create Forgejo Release uses: https://code.forgejo.org/sheik/forgejo-release@v2.6.0 with: diff --git a/configuration.nix b/configuration.nix index 97abe8e..09cdf4c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -44,7 +44,6 @@ users.users.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICUP7m8jZJiclZGfSje8CeBYFhX10SrdtjYziuChmj1X plasmagoat@macbook-air" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGlzZWik5bbH6/xjiCpwo1SQSJ/J/Cv7y4ZQ45P68GLB forgejo-runner" - "something" ]; # Default filesystem on