Merge pull request #1 from vaggeliskls/feat/upgrade

feat: upgrade

Author: vaggeliskls

.env

@@ -1,5 +1,7 @@
+# Runners settings
+# ex. org: https://github.com/<org name>/staging-monorepo or repo: https://github.com/<org name>/<repo name>
 PAT=<Replace with your personal access token>
-ORGANIZATION_URL=<Organization url>
+RUNNER_URL=<org url or repo url>
 RUNNERS=2
 # Vagrant image settings
 MEMORY=8000 # 8GB

.github/pull_request_template.md

@@ -0,0 +1,3 @@
+# Current Behaviour
+
+# Expected Behaviour

Dockerfile

@@ -3,17 +3,15 @@ FROM ghcr.io/vaggeliskls/windows-in-docker-container:latest
 
 # Github action settings
 ENV GITHUB_RUNNER_NAME=windows_x64_vagrant
-ENV GITHUB_RUNNER_VERSION=2.307.1
+ENV GITHUB_RUNNER_VERSION=2.315.0
 ENV GITHUB_RUNNER_FILE=actions-runner-win-x64-${GITHUB_RUNNER_VERSION}.zip
 ENV GITHUB_RUNNER_URL=https://github.com/actions/runner/releases/download/v${GITHUB_RUNNER_VERSION}/${GITHUB_RUNNER_FILE}
 ENV GITHUB_RUNNER_LABELS=windows,win_x64,windows_x64,windows_vagrant_action
 ENV PRIVILEGED=true
 ENV INTERACTIVE=true
 ENV DOLLAR=$
 
-RUN rm -rf /Vagrantfile
-RUN rm -rf /Vagrantfile.tmp
-RUN rm -rf /startup.sh
+RUN rm -rf /Vagrantfile /Vagrantfile.tmp /startup.sh
 
 COPY Vagrantfile /Vagrantfile.tmp
 COPY startup.sh /

README.md

@@ -9,11 +9,11 @@ A implementation of windows github custom runner (x64) based on vagrant VM, libv
 # Deployment Guide
 
 1. Create/Update the environmental file `.env`
-    - Organization URL
+    - Runner URL
     - PAT: Personal access token
 ```
 PAT=<Replace with your personal access token>
-ORGANIZATION_URL=<Organization url>
+RUNNER_URL=<runner url>
 RUNNERS=1
 # Vagrant image settings
 MEMORY=8000 # 8GB

Vagrantfile

@@ -1,13 +1,14 @@
 Vagrant.configure("2") do |config|
 
-    config.vm.box = "peru/windows-server-2022-standard-x64-eval"
+    config.vm.box = "${VAGRANT_BOX}"
     config.vm.network "private_network", ip: "192.168.121.10"
     config.vm.network "forwarded_port", guest: 445, host: 445
     config.vm.provision "shell", inline: "Set-NetFirewallProfile -Profile Domain,Public,Private -Enabled False"
     config.vm.provider "libvirt" do |libvirt|
         libvirt.memory = ${MEMORY}
         libvirt.cpus = ${CPU}
         libvirt.machine_virtual_size = ${DISK_SIZE}
+        libvirt.forward_ssh_port = true
     end
     config.winrm.max_tries = 300 # default is 20
     config.winrm.retry_delay = 5 #seconds. This is the defaul value and just here for documentation.
@@ -42,7 +43,7 @@ Vagrant.configure("2") do |config|
             Write-Host "Running  $runner";
             $random = -join ((48..57) + (97..122) | Get-Random -Count 8 | % {[char]$_});
             Expand-Archive -LiteralPath ${GITHUB_RUNNER_FILE} -DestinationPath runner-$random -Force;
-            Invoke-Expression -Command "C:\\runner-$random\\config.cmd --name ${GITHUB_RUNNER_NAME}_$random --replace --unattended --url ${ORGANIZATION_URL} --labels ${GITHUB_RUNNER_LABELS} --pat ${PAT}";
+            Invoke-Expression -Command "C:\\runner-$random\\config.cmd --name ${GITHUB_RUNNER_NAME}_$random --replace --unattended --url ${RUNNER_URL} --labels ${GITHUB_RUNNER_LABELS} --pat ${PAT}";
             Start-Process "C:\\runner-$random\\run.cmd" -Credential ($credentials);
         }
     SHELL

docker-compose.yml

@@ -2,6 +2,7 @@ version: "3.9"
 
 services:
   win10:
+    image: ghcr.io/vaggeliskls/windows-github-custom-runner:latest
     build:
       dockerfile: ./Dockerfile
       context: .
@@ -10,14 +11,8 @@ services:
     tty: true
     privileged: true
     # runtime: nvidia
-    cap_add:
-      - NET_ADMIN
-      - SYS_ADMIN
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup
-    devices:
-      - /dev/kvm
-      - /dev/net/tun
     ports:
       - 3389:3389
     deploy:

startup.sh

@@ -8,7 +8,7 @@ export RANDOM_STR=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 10 | head -n
 if [ ! -f Vagrantfile ]
 then
     envsubst \
-    '${PRIVILEGED},${INTERACTIVE},${MEMORY},${CPU},${DISK_SIZE},${GITHUB_RUNNER_FILE},${GITHUB_RUNNER_NAME},${RANDOM_STR},${RUNNERS},${GITHUB_RUNNER_LABELS},${ORGANIZATION_URL},${PAT},${GITHUB_RUNNER_URL}' \
+    '${VAGRANT_BOX},${PRIVILEGED},${INTERACTIVE},${MEMORY},${CPU},${DISK_SIZE},${GITHUB_RUNNER_FILE},${GITHUB_RUNNER_NAME},${RANDOM_STR},${RUNNERS},${GITHUB_RUNNER_LABELS},${RUNNER_URL},${PAT},${GITHUB_RUNNER_URL}' \
     < Vagrantfile.tmp > Vagrantfile
 fi