From 5815c31e926c9ab205a6c2a75a3012b14201759d Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <matifali@live.com>
Date: Thu, 13 Jul 2023 11:00:25 +0300
Subject: [PATCH 1/4] Add files via upload

---
 .../share/keyrings/githubcli-archive-keyring.gpg | Bin 0 -> 2270 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 dogfood/files/usr/share/keyrings/githubcli-archive-keyring.gpg

diff --git a/dogfood/files/usr/share/keyrings/githubcli-archive-keyring.gpg b/dogfood/files/usr/share/keyrings/githubcli-archive-keyring.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..eddea90bd75df1a43698f0735174f72222e9992f
GIT binary patch
literal 2270
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

literal 0
HcmV?d00001


From c63bc6611ffb01f2a688c3bb874f8271a31153c8 Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <atif@coder.com>
Date: Thu, 13 Jul 2023 11:16:28 +0300
Subject: [PATCH 2/4] use latest gh from GitHub releases

---
 dogfood/Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile
index 6f104967539f5..0a40b4e4eea7f 100644
--- a/dogfood/Dockerfile
+++ b/dogfood/Dockerfile
@@ -109,6 +109,7 @@ RUN apt-get update --quiet && apt-get install --yes \
 	curl \
 	fd-find \
 	file \
+ 	gh \
 	git \
 	gnupg \
 	graphviz \
@@ -176,8 +177,10 @@ RUN DOCKER_BUILDX_VERSION=$(curl -s "https://api.github.com/repos/docker/buildx/
 
 # See https://github.com/cli/cli/issues/6175#issuecomment-1235984381 for proof
 # the apt repository is unreliable
-RUN curl -L https://github.com/cli/cli/releases/download/v2.14.7/gh_2.14.7_linux_amd64.deb -o gh.deb && \
-	dpkg -i gh.deb
+RUN GH_CLI_VERSION=$(curl -s "https://api.github.com/repos/cli/cli/releases/latest" | grep '"tag_name":' |  sed -E 's/.*"v([^"]+)".*/\1/') && \
+	curl -L https://github.com/cli/cli/releases/download/v${GH_CLI_VERSION}/gh_${GH_CLI_VERSION}_linux_amd64.deb -o gh.deb && \
+	dpkg -i gh.deb && \
+	rm gh.deb
 
 # Install Lazygit
 # See https://github.com/jesseduffield/lazygit#ubuntu

From 31fa4e20c6955dd8a3aa399b4d9db57cfc3bff17 Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <atif@coder.com>
Date: Thu, 13 Jul 2023 11:17:13 +0300
Subject: [PATCH 3/4] Delete githubcli-archive-keyring.gpg

---
 .../share/keyrings/githubcli-archive-keyring.gpg | Bin 2270 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 dogfood/files/usr/share/keyrings/githubcli-archive-keyring.gpg

diff --git a/dogfood/files/usr/share/keyrings/githubcli-archive-keyring.gpg b/dogfood/files/usr/share/keyrings/githubcli-archive-keyring.gpg
deleted file mode 100644
index eddea90bd75df1a43698f0735174f72222e9992f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2270
zcmV<42qE{G0u2OX7cPnc5CG4Z9|nEjWG<-)DsU${OHipCBaG#XO%;895s#Kjl|U!o
zhV5Jb9;qyR0{zZeL>-v*AlJpV04RH>15hu-d0gn>T!}yoq)jq_0kXKsg4`@J7)|Q^
zDDOG%eA#MagF<!{I!1{Ng8nN4wnxOURClt6)%`5O1-po00Xa^wgaPq%`Y|EKW>ANd
zdqy65SW2nr1~YT_@-0VQK|8{6A8j7(Mjt*2q7@a7+r$F=ve;|<m~SX!Q7hcHol*M|
z^cW=AW{Nk-Qyb+JN?(>lz>JOUg*BozUJg2!M`kgS_a#f~DzmR>8^={7wt+%CwK#i~
zvfpjM2D7BD_&w;T7TX(_p32`UA_jgy8>H)hjrvW8{`$-wZl>gPv@74L#o=DIx{-%P
z3LY3kB));25usaDw%9uVdqKM}3gA5$m>8-aoY;31*`RKJoH{q*k)ASLLDza|{FSl*
zk;T}a!$a;d89iqXj*OKUxwgdm(;BaihD8wc*`Y3+&$Bh2H!}mE{&o28;!FZVVFa9r
zf}&suGl4c&vijKuG)jrOdNys)@)#N5f%|l5RZz7u#8j^9<;>GcNxSldEX=~~=Gq%5
zPotZ>R5W0yfibkPC$F;dRN_4a^1ef%*GM8Or%~|)EFb=FOHv-Xle>XTzC<q};#=ye
zq55$+Tw2Tvg+Txj0RRECCP!&>NOfW$Lrh5^Ja2GiZgX#Sa${vHV{B<aXK8e3bz&}K
zZ*4w_0#pPO0SEv-79j*IVFn->g|-fCddPDl^VI5fabQ^m0%I30iUJ!01qlPgwlxI{
z2?z%Q1{Dek2nzxP76JnS0v-VZ7k~f?2@oUm)arF{U|H*p5CF;U7+w)&dmEsC8#og8
z5_2=?)^EXR9c!3F?n!}$o07sQjYGJ%p0Jh<6LZfxh~tc@MG|B)L;Vnun~)_zv0cB+
zu}s0+M8(1umItr%ra^|kdG(!ilHe0rt;(jdrmB+qV=X$Vz(nO)AdJU#jh5MZV++<&
z&nmrb%!n{()|Xtfl&=gga-ZCL1=?71_=2ZfR#!sblX7$gCswgZ!+KQ-7YB6T3`?cm
zT3m<m<8S)C5Xfe{w@aFO6>O9e(~XFl9!v-u2-zu(=N-Mi7O61PmxVehEf9}e<08`r
zk1x{*Jxv^-*9~)2tg(!<91uR;yx)i2EMOl%nM>M-Qe0BVf5B*1Rv#45?90`ZhZ!tZ
zB|8Uap0K?P^ob8VCVHz1Mwh&0H+K%%n4+$IngUwO%%XkmT|E|Ao&7N5gJiSBykJP(
zE{0Ke2dK$IV??<FJi{IwiRnk4-UF!GWl&kkRvDh_S99DL^d0Nhk5;1H(NI9|X^5?L
zB1{tj7gcWTXn6LR%3^c<ykZ<>I^{x%NLeEF*cK2EmOBCm-QTA76-y=b2qHcFZMAoT
z)(cvZOlX0FKSAd***#Kt#98^iJ`}dO$pLreyzu(-t?L7fz3Y@eBkSU7Cm_w0UT)o{
zN1<BzHPlDUY}oo+vtWZm0PDpKD>ra9HHL-2<Wji;4FqEsE{XvV0QlloMlPl6%pDHZ
z_XLKHcHlZ;OgFHs3e>0doWO|{IHK(1u~#KSAr_)JX?U}y+lHN=vMqZY^G&vqEevUh
z02}4RMH=qdn6HAqpI-&)*M>=BYJJY>JQ{B9@MrzSanDQx@2YO)%U$81ggp8kBr%s{
z()PfUzZ_7b!+u>nXwCH~x9+wX<&>~SV-O_n7{zXXIWiNuRHG6Inc3aBFNfL^L_C%m
zWxMiT)5+(xAX+GBwNRfO9O>=-gtU3t5>JFi4)tLStA74u2U1(zb|(K20Yfv(y`W&I
z`4}35I1lrycfTu{rJcg2W*s#9(%TD|w-kEulDzQ<Zk<2{g<Abt*~`^~=BsOs6~g|$
zP57-Gg&n+CYM00kLIfkw*Duk_HXvo_lfendi=U5QZ#`4rO4?^{Ou|^ddx1jTe?hyG
zp^N0Y21NP$7Q%t{rdWQMZ>;x^L85-;^0nD24@+{kkzkCl<!d3)H0TS%`l|r*pP*d9
z(D#T*J;8<r!0l~oDRF3HQT|nJTg^E+&7!Wx(;%BTxugc&QH^0)7$C4Y!`G7B$?}~e
z(dPuzPvxlOsH07?cMnrWQZu^H(P?P49gav>+~X=amxsdqY&&K@YDOVLj0hTMI-AER
zwOOJDY&*Qbd{##mLzM%8R_;bC`64LxDc{~vP3kZbUjPvS00D^tJOmg42mmG)Ap|U8
z1|S)QwhnB1$a5p})arF{U|9tMV;3%p0vikk2?N8nH2?|;5F_){>UD8oSr!}*{ycRS
zrJh#FkClGa{<=F4uNSP<VdbYfe{q*@68DQ<LN_~*I3!^i()t6_;c&)uL$4!A6MO04
zP5MmzDC6U~D?dFL6m%E5IFQ$UcXL>OAF;ZkzPKWuF7Qo{cGeR6?3%ZgaY0&CSOA%~
z*OF*d8q0N1h4xs<_<hg>Y_%~3a+0-2H(x%{tj(hE6?spdG9)V~tF|VG2z3YHlb2BM
z#+XfkoU<rhNJj8jb&(iy^A6={JIskb<K#}*H|}hJW=dGbK7UV@KSu>JFRVS-05s$9
zc6KAOl~vnZ=7V=*=y%SXo^W@ZL?M=+A>E75&3|P3$KwOg?f+dn)G>5z${Oj9JCbye
z5)otPqv`51z_B5|#?*!jI8=UFw1sVOPP?KcFk6u&J2Fg@{1#<#_|9f`l`i<Zp+nJz
z2E|sSJ<#=;j=RX4_*>?p;?B2RwXp3pcKeTrl;Td-b2q6H8rV6E`jrVuKM3B*nLzX$
zoTKZDG<cct!z<{nH9|su=1K2hfRVx?!70M21~<&Y5%S#vEQVR-C99B{UDX4qIPlIn
zt*0Syx<@X#f2MNBH1Ab+_iArvkgGZD>Y4)TUxW$~Hg}wi7PR++UHHxOyHwfd=cQU{
sZP_ZaFT{IF`p$Ndo-}Rtf(Sc1oxsL`tTUqvGA4#k*w>jgJntA|!*H)MKmY&$


From 6618d34c6e9581369ef5e3729225d1818cd6d3f3 Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <atif@coder.com>
Date: Thu, 13 Jul 2023 11:17:33 +0300
Subject: [PATCH 4/4] Update Dockerfile

---
 dogfood/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile
index 0a40b4e4eea7f..47dd89a5b3fe1 100644
--- a/dogfood/Dockerfile
+++ b/dogfood/Dockerfile
@@ -109,7 +109,6 @@ RUN apt-get update --quiet && apt-get install --yes \
 	curl \
 	fd-find \
 	file \
- 	gh \
 	git \
 	gnupg \
 	graphviz \