summaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2018-08-23 08:22:04 -0400
committerMartin André <m.andre@redhat.com>2018-09-21 13:54:29 +0200
commit4f9ee9f1324fb05eff6be4cf5c4b00f8bb29bf7c (patch)
treef3d1e2da785e1b9273e581e58a81b1e180f2af3f /docker/base
parent09b1147665c73ebd6b3c27befb19652c75428ec2 (diff)
downloadkolla-4f9ee9f1324fb05eff6be4cf5c4b00f8bb29bf7c.tar.gz
kolla-4f9ee9f1324fb05eff6be4cf5c4b00f8bb29bf7c.zip
Add crane docker image
Crane is a lightweight 'pull only' container registry implementation. TripleO is aiming to replace our use of docker-distribution with crane for the Undercloud. Co-Authored-By: Martin André <m.andre@redhat.com> Change-Id: I59d9521f99243401d7703a3dedc26b5baed2d595
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j21
-rw-r--r--docker/base/crane.repo7
2 files changed, 8 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 9826ac765..d91a0cc4b 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -57,6 +57,7 @@ COPY yum.conf /etc/yum.conf
{% if base_arch == 'x86_64' %}
{% set base_yum_repo_files = [
+ 'crane.repo',
'elasticsearch.repo',
'grafana.repo',
'influxdb.repo',
diff --git a/docker/base/crane.repo b/docker/base/crane.repo
new file mode 100644
index 000000000..55d7084d7
--- /dev/null
+++ b/docker/base/crane.repo
@@ -0,0 +1,7 @@
+# TODO(mandre) Remove when crane is in centos repos
+# NOTE python-crane package is not signed
+[pulp-2-testing]
+name=Pulp 2 Testing
+baseurl=https://repos.fedorapeople.org/pulp/pulp/testing/automation/2-master/stage/7Server/$basearch/
+enabled=1
+gpgcheck=0