From c68794b4e515013c6fdddd03aa79d163aefe986e Mon Sep 17 00:00:00 2001
From: Andrej Shadura <andrew.shadura@collabora.co.uk>
Date: Mon, 2 May 2022 09:01:56 +0100
Subject: [PATCH] Install patched reprepro with "conflictingarchall" ignore
option added
See https://bugs.debian.org/697630
Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
---
Dockerfile.backend | 11 ++++++++++-
docker/apt/collabora-archive-keyring.gpg | Bin 0 -> 1362 bytes
docker/apt/collabora-tools.list | 1 +
3 files changed, 11 insertions(+), 1 deletion(-)
create mode 100644 docker/apt/collabora-archive-keyring.gpg
create mode 100644 docker/apt/collabora-tools.list
diff --git a/Dockerfile.backend b/Dockerfile.backend
index 5cb13ef9da..ed7f0e3086 100644
--- a/Dockerfile.backend
+++ b/Dockerfile.backend
@@ -30,12 +30,21 @@ RUN apt-get update \
make \
patch \
procps \
- reprepro \
supervisor \
tzdata \
xzdec \
zstd
+RUN mkdir -p /etc/apt/sources.list.d
+COPY docker/apt/*.list /etc/apt/sources.list.d/
+COPY docker/apt/*.gpg /usr/share/keyrings/
+
+# reprepro #697630
+RUN apt-get update \
+ && apt-get install -y \
+ apt-utils \
+ reprepro
+
COPY . $WORKDIR
RUN make -C $WORKDIR/dist install
diff --git a/docker/apt/collabora-archive-keyring.gpg b/docker/apt/collabora-archive-keyring.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..2230cc79cd47bbfbe0ef99f6a83fd769a2a3a6d9
GIT binary patch
literal 1362
zcmbQq$jcHmb=zx34u*~0Q<6TfnZY@4Zlu}uIE9X7=gk5WQZ|`n9Md`AQ)0b%n&mF@
zZ(3KLx}SNj!|Oe}DUsE2-q&^A_h0i|Id|Zs--2nLWd_eIxA3N|D!%kE=%oF8$pxQZ
z-`H6_!|9brLcoDbEDyc<y3hQW;aVT~@9(jhPYoxXWH~H)cV^oU^(V0>cV$lBu|Fb#
zv;FW+)6=4YP5*YqybCRy(d8`rhN<S6Rr1H2uwLy6%isFMvU}}|wbc+^(95P~{G?!k
zjz*3}x#gK}t-f;tI$WmD+OL1hh*AB*gl9oc+S{5}?Vh<PaOtrnr`12riWbfZd*icP
zZJp*+8-pfemNQSSpEcP2(|5TukK6M_B7-0!1LGD;=lq<U#H9S9L<OJBq@q;+w6x6R
zR0W&j(t?8gq7sK3kYGMoP%jy#6v)c8>twWG5oTm!P-0~Qg(#CWGaEN22Rkzpn<xhp
zCl@!17!xxilN=+Hcmo3$rvOjL#m+CgG<;bXu>Y@J5N*clvR16Jw`@y>tLP?+E%|mf
z54DrOoHJ*C_cQJsZ|x(CfXBD5NuBLH_9go^&xz&no=;mRgajBL{I*iscWG;j*n~+h
zoa+9)O!P}@z3{E4VTIyxY3~I}oAy_Q)FntAXgtrXW_R@&W1h+JAg||5GKEngU)}wu
zO>GtPu4<JqTFB|mth-(<^lSK>WgB9&86IA+3Kc9Z@a2#9x4$3s@;PHgDUTZKisT~)
zuN@4{wEFo~d~-+JtyBCDcj#MfQ7oJN@?b}<yYZT4QMEk+&$(85|2X+tYr(C>cm98x
z_AmA6ZO%>h6V^s%^KM-~v0%lynXmkOj#S>RFHZWr;nEDzZ#;#b9d0ZFf=mo-ppe@!
z6%;!DJ#UiEU1(^oJIXM>^2}60rrv12<2f5nF8FmyHf`0_FAVd;t5!Y>`tkmJ+T*K6
zscpw&tb0CunF&nIUZQF1fvI`HJGtJMS1WHiN1d2{d%@bsePOc%(v%&h?f7(}ZO)Ul
z0M07*|K;K#Rn`AR-G!w^^Nw9!swKj$Y<f|zK}J|`(u7=(M{3hW--t+v)=xdzw4M2(
z-@(MkN7U!C9DB;LUyo;Qwdm`ba^I_kAMP*;XKtLiOV}b=j{B|u1W7Gc{#9O9Whe9A
z1Zk~}IwF2tX9drWviyj1cQvfyg5O@5Vztk7&xO82$)5{8eyq5?`^SO87Yez@g?^VW
zoZ55tzH5-s+C9Hw4?JHO`Dwz^x_h!eUK!+9YpqzJ;rRP^q5YRhZ!bNXT>jB?-CWn?
zt*@diCoX^6A?n1%A*tu9%+VK7@W_6S-~DSBj4@Jkab<C0N^WMJLSj*JMrK*6LUw8;
zFj+%I9gx$qUTHQkHJgD`vjQs<C`1vdnMIU|gBdL?`?ekGoWhd)zg3_8pJm(E7|o+!
zrb*S71QcI;Zns3MZnBnx+Jxvf*Yv1d@m=+4-(xbDe4Y8hkz-NCoK;>^)WkmhU83A}
z*ZKY}b*;QN57!=&er6a_RC1X!KK(+~#f@HT&;7UB5)kUZzU#Hu@!NNVI#=I$vUX8P
z{jS<q+Pfck8!u%jU8Lu{todz{LiUm+`JHKwwa?!dFF5NU#<xsvql?1VJlWKJ^;Z)T
zf8Q@}PK;h~tV(##{A>@S>DwcY**7ygUOZs%(b*&NfBXjZ8nc6Q?^$n}wALjlUZ$ty
z-hDlv>YKkF8{X<X+~oA=q@0@f-!%)T^IQ|k;5fQ0HeG3z{C3qfh28Gec4xM)aC1r4
H(0%~`R>Ns+
literal 0
HcmV?d00001
diff --git a/docker/apt/collabora-tools.list b/docker/apt/collabora-tools.list
new file mode 100644
index 0000000000..a17c70c7b9
--- /dev/null
+++ b/docker/apt/collabora-tools.list
@@ -0,0 +1 @@
+deb [signed-by=/usr/share/keyrings/collabora-archive-keyring.gpg] https://repositories.collabora.co.uk/sysadmin/debian bullseye tools
--
GitLab