diff options
| author | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-09-23 12:30:05 +0300 |
|---|---|---|
| committer | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-09-23 12:30:05 +0300 |
| commit | 9fc24a6b2f4a6a73a23dbef2abc932bbdb2a019d (patch) | |
| tree | a9dd8625590117775fbe556b84d8dc524998276d | |
| parent | 7b06986ee4572122ecc1e2ca02a13ead636e1d32 (diff) | |
build-docker.yml, build-sd-images.yml: Add workaround for qemu/sudo bug
for reference: https://github.com/multiarch/qemu-user-static/issues/17
Signed-off-by: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>
| -rw-r--r-- | .github/workflows/build-docker.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/build-sd-images.yml | 6 | ||||
| -rw-r--r-- | build/docker/Dockerfile | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index a6650711..81875de4 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -36,7 +36,11 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Apply workaround for sudo bug (https://github.com/multiarch/qemu-user-static/issues/17) - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes + run: | + for conf in qemu-{aarch64,arm}-static.conf + do + sed 's/:F$/:OC/' /usr/lib/binfmt.d/$conf > /etc/binfmt/$conf + done - name: Setup Docker Buildx uses: docker/setup-buildx-action@v1 diff --git a/.github/workflows/build-sd-images.yml b/.github/workflows/build-sd-images.yml index e35fb1c9..0f24068e 100644 --- a/.github/workflows/build-sd-images.yml +++ b/.github/workflows/build-sd-images.yml @@ -127,7 +127,11 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Apply workaround for sudo bug (https://github.com/multiarch/qemu-user-static/issues/17) - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes + run: | + for conf in qemu-{aarch64,arm}-static.conf + do + sed 's/:F$/:OC/' /usr/lib/binfmt.d/$conf > /etc/binfmt/$conf + done - name: Checkout code uses: actions/checkout@v3 with: diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index e995d9b5..438009b5 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -9,7 +9,7 @@ FROM ${arch}/debian:${release}-slim as debian-ncp ARG arch_qemu -LABEL maintainer="Ignacio Núñez Hernanz <nacho@ownyourbits.com>" +LABEL maintainer="Tobias Knöppler" CMD /bin/bash |