From c2df8c79a097e99b94f3f26a87471aff68ca56ce Mon Sep 17 00:00:00 2001
From: Andrej Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 18 May 2020 19:02:22 +0200
Subject: [PATCH] Ignore failures from update-binfmts since it fails under
 Kaniko

Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
---
 worker/Dockerfile     | 7 ++++++-
 worker/update-binfmts | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 worker/update-binfmts

diff --git a/worker/Dockerfile b/worker/Dockerfile
index a198da1..0f61d3e 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -4,13 +4,16 @@ ENV LC_ALL C.UTF-8
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update \
- && apt-get install -y apt-transport-https ca-certificates
+ && apt-get install -y apt-transport-https ca-certificates binfmt-support
 
 RUN mkdir -p /etc/apt/sources.list.d
 COPY stretch-backports.list /etc/apt/sources.list.d/
 COPY collabora-tools.list /etc/apt/sources.list.d/
 COPY collabora-archive-keyring.gpg /usr/share/keyrings/
 
+RUN mv /usr/sbin/update-binfmts /usr/sbin/update-binfmts.distrib
+COPY update-binfmts /usr/sbin
+
 # Use stretch since it’s not the stable anymore
 RUN sed -i 's/stable/stretch/g' /etc/apt/sources.list \
  && apt-get update \
@@ -18,6 +21,8 @@ RUN sed -i 's/stable/stretch/g' /etc/apt/sources.list \
       obs-worker locales qemu-user-static \
  && sed -i 's/ENABLED=0/ENABLED=1/g' /etc/default/obsworker
 
+RUN mv -f /usr/sbin/update-binfmts.distrib /usr/sbin/update-binfmts
+
 VOLUME /srv/obs
 
 ADD services/service.conf /etc/supervisor/conf.d/service.conf
diff --git a/worker/update-binfmts b/worker/update-binfmts
new file mode 100755
index 0000000..e5a6d4d
--- /dev/null
+++ b/worker/update-binfmts
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/sbin/update-binfmts.distrib "$@" || true
-- 
GitLab