From cf9ad64f3b20cf3b3b3703ba8ca6153cb7854804 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Sat, 30 Sep 2017 22:28:24 -0400 Subject: [PATCH] Adjust the generic dockerfiles base for new gate Change-Id: Idde23a5552e033d793fff3c0067ca9f6f87e4938 --- dockerfiles/centos/CentOS-OpenStack.repo | 6 ++++ dockerfiles/centos/Dockerfile | 5 +++ .../centos/RPM-GPG-KEY-CentOS-SIG-Cloud | 20 +++++++++++ dockerfiles/debian/Dockerfile | 5 +++ dockerfiles/debian/ceph.gpg | Bin 0 -> 1143 bytes dockerfiles/debian/ceph.list | 1 + dockerfiles/dpkg/base/Dockerfile | 10 ------ dockerfiles/rpm/base/Dockerfile | 34 ------------------ dockerfiles/ubuntu/Dockerfile | 5 +++ dockerfiles/ubuntu/ceph.gpg | Bin 0 -> 1143 bytes dockerfiles/ubuntu/ceph.list | 1 + dockerfiles/ubuntu/cloud-archive.gpg | Bin 0 -> 2235 bytes dockerfiles/ubuntu/cloud-archive.list | 1 + 13 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 dockerfiles/centos/CentOS-OpenStack.repo create mode 100644 dockerfiles/centos/Dockerfile create mode 100644 dockerfiles/centos/RPM-GPG-KEY-CentOS-SIG-Cloud create mode 100644 dockerfiles/debian/Dockerfile create mode 100644 dockerfiles/debian/ceph.gpg create mode 100644 dockerfiles/debian/ceph.list delete mode 100644 dockerfiles/dpkg/base/Dockerfile delete mode 100644 dockerfiles/rpm/base/Dockerfile create mode 100644 dockerfiles/ubuntu/Dockerfile create mode 100644 dockerfiles/ubuntu/ceph.gpg create mode 100644 dockerfiles/ubuntu/ceph.list create mode 100644 dockerfiles/ubuntu/cloud-archive.gpg create mode 100644 dockerfiles/ubuntu/cloud-archive.list diff --git a/dockerfiles/centos/CentOS-OpenStack.repo b/dockerfiles/centos/CentOS-OpenStack.repo new file mode 100644 index 00000000..95fc4f73 --- /dev/null +++ b/dockerfiles/centos/CentOS-OpenStack.repo @@ -0,0 +1,6 @@ +[centos-openstack] +name=CentOS-7 - OpenStack +baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-pike/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud diff --git a/dockerfiles/centos/Dockerfile b/dockerfiles/centos/Dockerfile new file mode 100644 index 00000000..fe4fbf3f --- /dev/null +++ b/dockerfiles/centos/Dockerfile @@ -0,0 +1,5 @@ +ARG FROM=centos:7 +FROM ${FROM} + +COPY CentOS-OpenStack.repo /etc/yum.repos.d/ +COPY RPM-GPG-KEY-CentOS-SIG-Cloud /etc/pki/rpm-gpg/ diff --git a/dockerfiles/centos/RPM-GPG-KEY-CentOS-SIG-Cloud b/dockerfiles/centos/RPM-GPG-KEY-CentOS-SIG-Cloud new file mode 100644 index 00000000..91f8e1c5 --- /dev/null +++ b/dockerfiles/centos/RPM-GPG-KEY-CentOS-SIG-Cloud @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +mQENBFVWcCcBCACfm3eQ0526/I0/p7HpR0NjK7K307XHhnbcbZv1sDUjQABDaqh0 +N4gnZcovf+3fj6pcdOmeOpGI0cKE7Fh68RbEIqyjB7l7+j1grjewR0oCFFZ38KGm +j+DWQrj1IJW7JU5fH/G0Cu66ix+dJPcuTB3PJTqXN3ce+4TuG09D+epgwfbHlqaT +pH2qHCu2uiGj/AaRSM/ZZzcInMaeleHSB+NChvaQ0W/m+kK5d/20d7sfkaTfI/pY +SrodCfVTYxfKAd0TLW03kimHs5/Rdz+iZWecVKv6aFxzaywbrOjmOsy2q0kEWIwX +MTZrq6cBRRuWyiXsI2zT2YHQ4UK44IxINiaJABEBAAG0WkNlbnRPUyBDbG91ZCBT +SUcgKGh0dHA6Ly93aWtpLmNlbnRvcy5vcmcvU3BlY2lhbEludGVyZXN0R3JvdXAv +Q2xvdWQpIDxzZWN1cml0eUBjZW50b3Mub3JnPokBOQQTAQIAIwUCVVZwJwIbAwcL +CQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEPm5/ud2RCnmATUH/3HDtWxpFkmy +FiA3VGkMt5dp3bgCRSd84X6Orfx1LARowpI4LomCGglGBGXVJePBacwcclorbLaz +uWrW/wU0efz0aDB5c4NPg/yXfNvujvlda8ADJwZXVBQphzvaIKwl4PqBsEnxC10I +93T/0iyphAhfMRJ5R8AbEHMj7uF+TWTX/JoyQagllMqWTwoP4DFRutPdOmmjwvSV +kWItH7hq6z9+M4dhlqeoOvPbL5oCxX7TVmLck02Q5gI4syULOa7sqntzUQKFkhWp +9U0+5KrBQBKezrurrrkq/WZR3WNE1KQfNQ77f7S2JcXJdOaKgJ7xe7Y2flPq98Aq +wKXK7l1c3dc= +=W6yF +-----END PGP PUBLIC KEY BLOCK----- diff --git a/dockerfiles/debian/Dockerfile b/dockerfiles/debian/Dockerfile new file mode 100644 index 00000000..0f6b3012 --- /dev/null +++ b/dockerfiles/debian/Dockerfile @@ -0,0 +1,5 @@ +ARG FROM=debian:stretch +FROM ${FROM} + +COPY ceph.list /etc/apt/sources.list.d/ +COPY ceph.gpg /etc/apt/trusted.gpg.d/ diff --git a/dockerfiles/debian/ceph.gpg b/dockerfiles/debian/ceph.gpg new file mode 100644 index 0000000000000000000000000000000000000000..c5d8bd399481b290ab5da94b87bd860a33a998ee GIT binary patch literal 1143 zcmV--1c>{Y0u2OJ_=X7q5CF@nevbJ;Y5AM5al>VI3*qGa#K5Hwm2!_RG#_465sD38 zmXL=NLCNO`29zsUcXOrn|9+`WxR5h*eY-hs=XvlKgzqt0XNxo>!;HCEyQjioviTGX z^63AwMTc%);z$XmJLkgYyK`nM1CAhp7WF|reYxYAEUs_~4Q5B}26ndxL?Y|$Cver? z+Ak9m`0ngIQ{q$*^Y!*xlNj-t_r%K}ODaaT?*Dqdu%y^KW0` zS6ZrG;)BP!1)?WS`!>M&$0zQz>J5}1&X7`S)dDqhl(43rss_qx06btgIkE2bedIgK z;xG~&^jzqnT9NUuM4z@q&^f(3x^B&MdjnVbuzE8k)(4)w_9NhYi0H9|H7&%3I2aEb zh+q>nquudzb_uOvKITzY;vyJtM-HU~wRly1j%tlK+D;M`D%KzpMT}47p0{w%J|&ag z`%O4cbnWhhSU^G^3k166X92k`)Mx`N5%~SD@}t(xyk<&8q|`J0Q(hA}UIj{x-8%<| z0)_&zqylwwJA`^hL=$>tqdyAJt<5pl;fJECl3s| zLE5}_)s5UcL0JG10RRECDnn&(Xf9)KZ6GLeWo%_(b7dfFWqBzeJac7Zb#iHRc|c=j zaA+=LZ*4w_0yqQ{0RjLb1p-z0h6w^20|pBT2nPcK1{DYb2?`4Y76JnS0v-VZ7k~f? z2@vQ?!oWrkIh0+}5CD%DJ;qE0XK&-rYVa)amGnqOoyNcMzwjac5aBU$X%%PBW>k6L z3D6G=<^q??a9MD*mjZ4qFl~`Thg{o{=i*$KoW(gzrFN}Hzst1V_~#iu>_a{YPUJt&wDrHV^U72%DSq=FIzI>(lJk(k^-4(U`{P77CyD0%bq>ih zZBB+Kwrh5L1y&6*F39>os1BoYq>c-<=+D;}#zj`0g9`;rl3rwz((Gm4pRg-QOdCnE z{s#VPSsvu@5RJh(cGcL-DgN-d^tmU(lfkmllZx7il#QTWeuJ+xp#6a@O21agV0i zaTeo!x%2r>B-Too>JJHr2)h%LYsHAn939f>LsAFu - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 08B73419AC32B4E966C1A330E84AC2C0460F3994; \ - echo "deb http://download.ceph.com/debian-luminous xenial main" | tee /etc/apt/sources.list.d/ceph.list; \ - # Canonical Cloud Archive Signing Key - apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 391A9AA2147192839E9DB0315EDB1B62EC4926EA; \ - echo "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/pike main" | tee /etc/apt/sources.list.d/cloudarchive.list diff --git a/dockerfiles/rpm/base/Dockerfile b/dockerfiles/rpm/base/Dockerfile deleted file mode 100644 index 0176e5fe..00000000 --- a/dockerfiles/rpm/base/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -ARG FROM=centos:7 -FROM ${FROM} - -RUN set -eux; \ - cat <<-EOF > /etc/yum.repos.d/CentOS-OpenStack.repo - [centos-openstack] - name=CentOS-7 - OpenStack - baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-pike/ - gpgcheck=1 - enabled=1 - gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud - EOF; \ - cat <<-EOF > /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud - -----BEGIN PGP PUBLIC KEY BLOCK----- - Version: GnuPG v2.0.22 (GNU/Linux) - - mQENBFVWcCcBCACfm3eQ0526/I0/p7HpR0NjK7K307XHhnbcbZv1sDUjQABDaqh0 - N4gnZcovf+3fj6pcdOmeOpGI0cKE7Fh68RbEIqyjB7l7+j1grjewR0oCFFZ38KGm - j+DWQrj1IJW7JU5fH/G0Cu66ix+dJPcuTB3PJTqXN3ce+4TuG09D+epgwfbHlqaT - pH2qHCu2uiGj/AaRSM/ZZzcInMaeleHSB+NChvaQ0W/m+kK5d/20d7sfkaTfI/pY - SrodCfVTYxfKAd0TLW03kimHs5/Rdz+iZWecVKv6aFxzaywbrOjmOsy2q0kEWIwX - MTZrq6cBRRuWyiXsI2zT2YHQ4UK44IxINiaJABEBAAG0WkNlbnRPUyBDbG91ZCBT - SUcgKGh0dHA6Ly93aWtpLmNlbnRvcy5vcmcvU3BlY2lhbEludGVyZXN0R3JvdXAv - Q2xvdWQpIDxzZWN1cml0eUBjZW50b3Mub3JnPokBOQQTAQIAIwUCVVZwJwIbAwcL - CQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEPm5/ud2RCnmATUH/3HDtWxpFkmy - FiA3VGkMt5dp3bgCRSd84X6Orfx1LARowpI4LomCGglGBGXVJePBacwcclorbLaz - uWrW/wU0efz0aDB5c4NPg/yXfNvujvlda8ADJwZXVBQphzvaIKwl4PqBsEnxC10I - 93T/0iyphAhfMRJ5R8AbEHMj7uF+TWTX/JoyQagllMqWTwoP4DFRutPdOmmjwvSV - kWItH7hq6z9+M4dhlqeoOvPbL5oCxX7TVmLck02Q5gI4syULOa7sqntzUQKFkhWp - 9U0+5KrBQBKezrurrrkq/WZR3WNE1KQfNQ77f7S2JcXJdOaKgJ7xe7Y2flPq98Aq - wKXK7l1c3dc= - =W6yF - -----END PGP PUBLIC KEY BLOCK----- - EOF diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile new file mode 100644 index 00000000..78efda31 --- /dev/null +++ b/dockerfiles/ubuntu/Dockerfile @@ -0,0 +1,5 @@ +ARG FROM=ubuntu:xenial +FROM ${FROM} + +COPY cloud-archive.list ceph.list /etc/apt/sources.list.d/ +COPY cloud-archive.gpg ceph.gpg /etc/apt/trusted.gpg.d/ diff --git a/dockerfiles/ubuntu/ceph.gpg b/dockerfiles/ubuntu/ceph.gpg new file mode 100644 index 0000000000000000000000000000000000000000..c5d8bd399481b290ab5da94b87bd860a33a998ee GIT binary patch literal 1143 zcmV--1c>{Y0u2OJ_=X7q5CF@nevbJ;Y5AM5al>VI3*qGa#K5Hwm2!_RG#_465sD38 zmXL=NLCNO`29zsUcXOrn|9+`WxR5h*eY-hs=XvlKgzqt0XNxo>!;HCEyQjioviTGX z^63AwMTc%);z$XmJLkgYyK`nM1CAhp7WF|reYxYAEUs_~4Q5B}26ndxL?Y|$Cver? z+Ak9m`0ngIQ{q$*^Y!*xlNj-t_r%K}ODaaT?*Dqdu%y^KW0` zS6ZrG;)BP!1)?WS`!>M&$0zQz>J5}1&X7`S)dDqhl(43rss_qx06btgIkE2bedIgK z;xG~&^jzqnT9NUuM4z@q&^f(3x^B&MdjnVbuzE8k)(4)w_9NhYi0H9|H7&%3I2aEb zh+q>nquudzb_uOvKITzY;vyJtM-HU~wRly1j%tlK+D;M`D%KzpMT}47p0{w%J|&ag z`%O4cbnWhhSU^G^3k166X92k`)Mx`N5%~SD@}t(xyk<&8q|`J0Q(hA}UIj{x-8%<| z0)_&zqylwwJA`^hL=$>tqdyAJt<5pl;fJECl3s| zLE5}_)s5UcL0JG10RRECDnn&(Xf9)KZ6GLeWo%_(b7dfFWqBzeJac7Zb#iHRc|c=j zaA+=LZ*4w_0yqQ{0RjLb1p-z0h6w^20|pBT2nPcK1{DYb2?`4Y76JnS0v-VZ7k~f? z2@vQ?!oWrkIh0+}5CD%DJ;qE0XK&-rYVa)amGnqOoyNcMzwjac5aBU$X%%PBW>k6L z3D6G=<^q??a9MD*mjZ4qFl~`Thg{o{=i*$KoW(gzrFN}Hzst1V_~#iu>_a{YPUJt&wDrHV^U72%DSq=FIzI>(lJk(k^-4(U`{P77CyD0%bq>ih zZBB+Kwrh5L1y&6*F39>os1BoYq>c-<=+D;}#zj`0g9`;rl3rwz((Gm4pRg-QOdCnE z{s#VPSsvu@5RJh(cGcL-DgN-d^tmU(lfkmllZx7il#QTWeuJ+xp#6a@O21agV0i zaTeo!x%2r>B-Too>JJHr2)h%LYsHAn939f>LsAFu6743a04p4H8L#ar*?5jSEDDVt~VbVqPmmRddU&PZtyV)C6k<(@a}BvYB0^A z#lq<^%2jUxN;=`uqk%4%ZRy@n2<@-QY;fz5N;9rTI>y)2c4vV@%(&~KI6=^6k9$=i z_N5?xFW`4~&~%>-(49{zWXaz8byi@u5nd38#Vhsx9sNms$3_BZML|cry_$+8YoE^z zj;F(0UPl%cNpNF@xB!`*5H$QsldDRNqj9r|1Gt+TnTvMQRK9E&0AgWpZX#MFKBp4w zRgB-iDvZ`)INW*?aS^aWVg-p9y2|k|LySkck{$d_`5l-D;W>~f~|mwtCLNb2svGYt4p_b`t_2u zkcCLydno@ffn~bb7H9@QK}P|ue3*zSzmc4Paq(I@SKfXtyJSrCN!}{)V-y=LO*kmZ z;Gh=1;%-~){i7D*F-Za<8=5%RSywa(P=6*;>dX>f zQVOo%!_30-ZO_4R6FiE*vr;m6%K{wcm--`n^JCOtLGrpI<=L?8^sbkhK&cK&O{Mdf zs0lZl%n_W<;?XD?)M*1x#!V&2mCS!gX%s7;rK!{iG2D`$#>kmYmFlq4pyr76g@$6mL9?s-n&LA(8r3W<3;75L; zzRFhA2TkYcZ0-4N31yJ;YJ3|4@B#w!8`D2zycQ=IIPen^=#g5^%Ab8xSS_N$%n>L; zl}2N9ecEpQL)|hdGN9YNvoKjl8{|X>vxjw|c%F<~p=N{Eez`G8q84rDq1~qz8sWFD zH;JC`v2;z0;Cx2KPp173qB2Zc6VSJ+xdIIYP%27T0T2M@FLcDKm!k!W!27NF8j_LMw2^6MeD+(T{(glT zlCLVCLexr}Q4oL%fQ0feUjw9!Do>m#!D3 z0BG4$f}%JrLTK^0S^l_VaP<4}BmsBIIeYU{)h$dnpRS$2bY@~cA*&NZFDxO3a{mY} z%1}E&okc$gssGVEg`J11_>YzfSU9?a7A$)n>ecxG5di=Ji2@%47y$?X2?YXBDoR)a8w>yn z2@qb}8)EE9ChF(W5C2s+^Im_*b$4<9$#{4n>14kQLvi0)IeyKbgh%XE}d#*gVWfe@u4{xWjElS<2i)iI!Sk#@Wut zqiwe}Z6j&o7XBe$ELMPu<@qcoI4_`3_*FSqg2!y7?kG