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#R4+L{*RGS%f<>5-i9v~#2^6AC(#&k!oE+@TOl+bY
zOq^WYEMiQ|j7)NjOyUg;T$}<tAs0Kp?9%XMUBLdoc0sfmtIJxk%HFaq8Lpz6EVks^
z**w%v{&LQo{oT*FbG)^WECL?iz9x0H^VpZ{+dL<h$9q0)oe&aWeDK>!Y2T%-En*WU
zy>P1g_cGBht@XmUo`w~Q$ECd&C~ewb6;hWVb)fM)vzp!2XN-9!$Ai3{H^~%6g?x4Q
zpEk8s%)6>p!e}9<H?!_~wa~BObCzw0(Pnsf!75a+w7{1?-rxRy(97qH6{S3CtSgd_
z9K3cgG}G$mSMkjqZMRPGKir{jwMDUP_RE7Ex$eemnnl(22t4On>HXv6Ypn&h7T@{*
zY1+Tkr?)vb*-uy-na#U({ltP5=Vre0^Epy^yS_N-^M*?^M8EMAdUm+62naGUuz^Bu
z$5c@0`1ia?I(MO=x$Y>#{K_*^1(|xI`HtsoIJw~0DcQ7DSHCdK53gGJEa=Dk^J$N-
z8l|=!kFoCg@CB5by+qU2GjcF2cqiBU@@nNx=cp6YZ!cIIxi4&%K$^0{v>l&Lw9R>v
z7Qk7>{=Zy2q^kPAsJpPVXx_2QOSMF}l}#_|HOL4HPMVPG@knjD=o=9U(fX+;o3=AQ
z^gEdN_=x&kmSay@_UrM?trmS<Q|^1U@WUNO;mnOQcL`f0%W=Q;pCGBl%D>9Xs_bOm
zn;@;VQAfm&>#X3}QI;QZ?yiPaT=3f~Q>^xx?zzx+DEV{2$Bz}acmFt0_(CD~xX|zN
zg;RUZ-ggZWTD#|0?1ASCBR@@8T6a(O$18*UYONJ3G#r2bF0}tL>FuRQlgmGvuAA$c
zy!BO-<;3N0J4BthI3)Fal{xw%3Le?d@w<QRf-y#FF0L$2Ov%m6Q%EdI&d4lFRme`Q
zRIq`GIv}TIz0z#EPDV3uYF1!n0);3dHM58^aWJE$W#6_#ol{tn|F`P1|FdlS8l!pi
z%QUIll7QlC&+V3I)lJrNP@53l=9(UrE555f?R!k-lCLvAIC3nin6t`jikjG`ze|+c
z?mFMUrLL9t=Hc2y($5S-ib^hX#;0GXy13D6?YaL}TLMBI*mu45I)3|(Q0MA9Pu4Cf
zsoz!mN_+PMZ{wv5rHk~Omo>jlQpjGiB)>DwvG)1<;ss|N#Q2uUZFEuinkSpOul{O6
z;_v(A&56+qj#UZonV;=pG<|!-G5cm_$BPFHK013u{*T|FUSoD}?mg>Glh(Q<#mn@R
z+`F&mQ+@N-W5ZjWhnt)pos?7a{<~)3be?NM85~EK#ilE*lHabnrm)+++V0Hu6>cuc
H8rm-aR>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