From 0d841b2e2f11c360d2c96e2c5d1b10dc3bd03fb2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 22 Aug 2019 22:23:18 +0000
Subject: [PATCH] ci: More fixes for cosa build

Use --entrypoint and also rename it while we're here.

Closes: #1889
Approved by: rfairley
---
 .papr.yml                               | 2 +-
 ci/{f29-cosa-build.sh => cosa-build.sh} | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename ci/{f29-cosa-build.sh => cosa-build.sh} (79%)

diff --git a/.papr.yml b/.papr.yml
index 1a94f4ea..d70efff5 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -27,7 +27,7 @@ host:
   distro: fedora/29/atomic
 
 tests:
-  - ./ci/f29-cosa-build.sh
+  - ./ci/cosa-build.sh
 
 timeout: 120m
 
diff --git a/ci/f29-cosa-build.sh b/ci/cosa-build.sh
similarity index 79%
rename from ci/f29-cosa-build.sh
rename to ci/cosa-build.sh
index 33b7096f..70f9651b 100755
--- a/ci/f29-cosa-build.sh
+++ b/ci/cosa-build.sh
@@ -7,10 +7,11 @@ cosaimg=quay.io/coreos-assembler/coreos-assembler:latest
 podman pull "${cosaimg}"
 
 # Build rpm-ostree using cosa as a buildroot, and extract the result
-podman run --privileged --rm \
+podman run --security-opt label=disable --rm \
        -v $(pwd):/srv/code -w /srv/code \
+       --entrypoint bash --user root \
        "${cosaimg}" \
-       /bin/sh -c './ci/build.sh && make install DESTDIR=$(pwd)/installroot'
+       -c 'yum -y swap fedora-release-container fedora-release && ./ci/build.sh && make install DESTDIR=$(pwd)/installroot'
 
 codedir=$(pwd)
 mkdir fcos