Garbaye/services-garbaye
3
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

my_buildctl : better PATH handling

Browse source
This commit is contained in:
Gitouche 2022-03-05 23:43:34 +01:00
parent 71397466d0
commit 105e71d77f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
functions.sh
View file

@ -264,5 +264,5 @@ my_buildctl () {
opts=$(echo -n "'$@" | sed -e "s| |', '|g" ; echo -n "'")
curl -sSLf https://github.com/moby/buildkit/releases/download/v0.9.3/buildkit-v0.9.3.linux-amd64.tar.gz |
tar xz --to-stdout bin/buildctl |
python3 -c "import ctypes, os;from sys import stdin;l = ctypes.CDLL(None);s = l.syscall;e = stdin.buffer.read();f = s(319, '', 1);os.write(f, e);p = '/proc/self/fd/%d' % f;env = os.environ; env['PATH'] = os.environ['PATH']; os.execle(p, 'buildctl', ${opts}, env)"
python3 -c "import ctypes, os;from sys import stdin;l = ctypes.CDLL(None);s = l.syscall;e = stdin.buffer.read();f = s(319, '', 1);os.write(f, e);p = '/proc/self/fd/%d' % f;os.execle(p, 'buildctl', ${opts}, {'PATH': '${PATH}'})"
}

2
podman-matrix/zz_build-images.sh
View file

@ -31,7 +31,7 @@ if ! podman image exists localhost/matrixdotorg/synapse:${synapse_version}; then
podman image tag localhost/synapse_${synapse_version}:latest ${synapse_image}:${synapse_version} &&
podman image rm localhost/synapse_${synapse_version}:latest &&
podman rm --force buildkitd &&
podman rmi docker.io/moby/buildkit:latest &&
podman rmi docker.io/moby/buildkit:latest
}
rm -rf ${buildfolder}
fi