SW/docker-osx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix homebrew install, packages install and mkdir.

Browse Source
This commit is contained in:
Roman Vaníček
2024-04-23 00:09:26 +02:00
parent 8c4fd330d5
commit 361db339ef
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile.sh
View File

@@ -27,14 +27,14 @@ tee -a ~/.ssh/config <<< ' StrictHostKeyChecking no'
echo -e "${PASSWORD}\nmac ALL=(ALL) NOPASSWD: ALL"|ssh 127.0.0.1 'sudo -S tee "/etc/sudoers.d/mac"'
# Change uid
echo -e "chown -Rh 1000 /Users/mac\ndscl . -change /Users/mac UniqueID 501 1000"|ssh 127.0.0.1 sudo bash
## Instal homebrew and software
# Instal homebrew and software
echo Installing Homebrew ...
ssh 127.0.0.1 '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"'
curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh|ssh 127.0.0.1 bash
# (gmp is a hack for ruby)
echo Installing packages ...
ssh 127.0.0.1 'brew install node@20 libyaml gmp mas'
ssh 127.0.0.1 '/usr/local/bin/brew install node@20 libyaml gmp mas'
# Create base directories for act and drone
ssh 127.0.0.1 mkdir /Users/mac/drone
echo mkdir /Users/mac/drone|ssh 127.0.0.1 bash
echo -e "drone\tUsers/mac/drone" | ssh 127.0.0.1 'sudo tee "/etc/synthetic.conf"'
# Redirect all commands to VM
echo Redirecting executables

15
run.sh
View File

@@ -0,0 +1,15 @@
#!/usr.orig/bin/sh
export PATH=$PATH:/usr.orig/bin
if ! ps -aux|grep -q [^\[]qemu[-]system; then
export EXTRA="$EXTRA -virtfs local,path=/var/run/act,mount_tag=act,security_model=passthrough,id=act -virtfs local,path=/drone/src,mount_tag=src,security_model=passthrough,id=src"
(nohup sudo env "RAM=$RAM" "CPU=$CPU" "CPUID_FLAGS=$CPUID_FLAGS" "BOOT_ARGS=$BOOT_ARGS" "KVM=$KVM" "CPU_STRING=$CPU_STRING" "SMP=$SMP" "CORES=$CORES" "BOOTDISK=$BOOTDISK" "IMAGE_PATH=$IMAGE_PATH" "IMAGE_FORMAT=$IMAGE_FORMAT" "INTERNAL_SSH_PORT=$INTERNAL_SSH_PORT" "SCREEN_SHARE_PORT=$SCREEN_SHARE_PORT" "ADDITIONAL_PORTS=$ADDITIONAL_PORTS" "NETWORKING=$NETWORKING" "MAC_ADDRESS=$MAC_ADDRESS" "EXTRA=$EXTRA" /home/arch/OSX-KVM/Launch-nopicker.sh 2>&1 &) > /dev/null \
; until [[ "$(ssh 127.0.0.1 'echo a' 2> /dev/null)" ]]; do \
sleep 15 \
; done
ssh 127.0.0.1 'sudo mount_9p act'
ssh 127.0.0.1 'sudo mount_9p src'
ssh 127.0.0.1 'sudo ln -s /Volumes/act /var/run/act'
ssh 127.0.0.1 'sudo ln -s /Volumes/src /drone/src'
fi
cat /proc/self/environ|ssh 127.0.0.1 'vars=(); while read -rd '"''"' keyVal; do; key=${keyVal%=*}; val=${keyVal#*=}; if [[ "$keyVal" == "GITHUB_WORKSPACE=/drone/src" ]]; then keyVal="GITHUB_WORKSPACE=/Volumes/src"; fi; if (( ! ${(P)+key} )); then vars+=("$keyVal"); elif [[ "$key" == "PATH" ]]; then vars+=("PATH=$val:$PATH"); fi; done; pwd="'"$PWD"'"; if [ -d "$pwd" ] ; then cd "$pwd"; fi; sudo -E env -i "${vars[@]}" '"$0"' '"$@"