Adjust the generic dockerfiles base for new gate

Change-Id: Idde23a5552e033d793fff3c0067ca9f6f87e4938

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

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/

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-----

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/

dockerfiles/debian/ceph.list

@@ -0,0 +1 @@
+deb http://download.ceph.com/debian-luminous/ stretch main

dockerfiles/dpkg/base/Dockerfile

@@ -1,10 +0,0 @@
-ARG FROM=ubuntu:xenial
-FROM ${FROM}
-
-RUN set -eux; \
-    # Ceph.com (release key) <security@ceph.com>
-    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 <ftpmaster@canonical.com>
-    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

dockerfiles/rpm/base/Dockerfile

@@ -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

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/

dockerfiles/ubuntu/ceph.list

@@ -0,0 +1 @@
+deb http://download.ceph.com/debian-jewel/ xenial main

dockerfiles/ubuntu/cloud-archive.list

@@ -0,0 +1 @@
+deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/pike main