From 63f0f5af47b48bd05e797d5d83d26444de494bcf Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 12 Sep 2016 17:16:06 -0400
Subject: [PATCH] packaging: Add a cccp.yml and tweak Dockerfile

Let's try out https://wiki.centos.org/ContainerPipeline

Having maintained Docker images for rpm-ostree seems kind of overdue.
(I didn't actually test the CP bits since I'm not sure how to do that)

Closes: #460
Approved by: jlebon
---
 packaging/Dockerfile           | 11 +++++++----
 packaging/atomic7-testing.repo |  4 ++++
 packaging/cccp.yml             |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 packaging/atomic7-testing.repo
 create mode 100644 packaging/cccp.yml

diff --git a/packaging/Dockerfile b/packaging/Dockerfile
index 97f85b28..ac8ae856 100644
--- a/packaging/Dockerfile
+++ b/packaging/Dockerfile
@@ -1,6 +1,9 @@
 # Example invocation:
-# docker run --privileged --net=host -v /srv/work/centos-atomic-host:/srv --workdir /srv/ --rm -ti cgwalters/rpm-ostree compose tree --repo=repo --proxy=http://127.0.0.1:8123 centos-atomic-host.json
-FROM fedora
+# mkdir cache
+# ostree --repo=repo-build init --mode=bare-user
+# ostree --repo=repo init --mode=archive
+# alias run-rpmostree=docker run --privileged --net=host -v /srv/work/centos-atomic-host:/srv --workdir /srv/ --rm -ti registry.centos.org/rpm-ostree'
+# run-rpmostree rpm-ostree compose tree --repo=repo-build --cachedir=cache centos-atomic-host.json
+FROM centos
+ADD atomic7-testing.repo /etc/yum.repos.d/atomic7-testing.repo
 RUN yum -y update && yum -y install rpm-ostree && yum clean all
-VOLUME /srv/rpm-ostree
-ENTRYPOINT ["rpm-ostree"]
diff --git a/packaging/atomic7-testing.repo b/packaging/atomic7-testing.repo
new file mode 100644
index 00000000..fdfd698b
--- /dev/null
+++ b/packaging/atomic7-testing.repo
@@ -0,0 +1,4 @@
+[atomic7-testing]
+name=atomic7-testing
+baseurl=http://cbs.centos.org/repos/atomic7-testing/x86_64/os/
+gpgcheck=0
diff --git a/packaging/cccp.yml b/packaging/cccp.yml
new file mode 100644
index 00000000..09e3706c
--- /dev/null
+++ b/packaging/cccp.yml
@@ -0,0 +1 @@
+job-id: rpm-ostree