Change builder in a new attempt to make it run
This commit is contained in:
parent
39f087c012
commit
dd3b0c9fc2
2 changed files with 10 additions and 14 deletions
|
@ -29,6 +29,16 @@ if ! docker buildx 2>&1 >/dev/null; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Ensure qemu is in binfmt_misc
|
||||
# Docker desktop already has these in versions recent enough to have buildx
|
||||
# We only need to do this setup on linux hosts
|
||||
if [ "$(uname)" == 'Linux' ]; then
|
||||
# NOTE: this is pinned to a digest for a reason!
|
||||
# Note2 (@rikatz) - Removing the pin, as apparently it's breaking new alpine builds
|
||||
# docker run --rm --privileged multiarch/qemu-user-static@sha256:28ebe2e48220ae8fd5d04bb2c847293b24d7fbfad84f0b970246e0a4efd48ad6 --reset -p yes
|
||||
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
|
||||
fi
|
||||
|
||||
# We can skip setup if the current builder already has multi-arch
|
||||
# AND if it isn't the docker driver, which doesn't work
|
||||
current_builder="$(docker buildx inspect)"
|
||||
|
@ -41,15 +51,6 @@ if ! grep -q "^Driver: docker$" <<<"${current_builder}" && \
|
|||
exit 0
|
||||
fi
|
||||
|
||||
# Ensure qemu is in binfmt_misc
|
||||
# Docker desktop already has these in versions recent enough to have buildx
|
||||
# We only need to do this setup on linux hosts
|
||||
if [ "$(uname)" == 'Linux' ]; then
|
||||
# NOTE: this is pinned to a digest for a reason!
|
||||
# Note2 (@rikatz) - Removing the pin, as apparently it's breaking new alpine builds
|
||||
# docker run --rm --privileged multiarch/qemu-user-static@sha256:28ebe2e48220ae8fd5d04bb2c847293b24d7fbfad84f0b970246e0a4efd48ad6 --reset -p yes
|
||||
docker run --rm --privileged multiarch/qemu-user-static:register --reset -p yes
|
||||
fi
|
||||
|
||||
# Ensure we use a builder that can leverage it (the default on linux will not)
|
||||
docker buildx rm ingress-nginx || true
|
||||
|
|
|
@ -21,8 +21,3 @@ _Using docker_
|
|||
docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro k8s.gcr.io/ingress-nginx/nginx:v20210809-g98288bc3c@sha256:f9363669cf26514c9548c1fe4f8f4e2f58dfb76616bcd638a0ff7f0ec3457c17
|
||||
```
|
||||
|
||||
_Creating a replication controller_
|
||||
|
||||
```console
|
||||
kubectl create -f ./rc.yaml
|
||||
```
|
||||
|
|
Loading…
Reference in a new issue