Skip to content

Commit

Permalink
Merge pull request coreos#4 from jlebon/pr/makefile
Browse files Browse the repository at this point in the history
Use Makefile to separate responsibilities a bit more
  • Loading branch information
openshift-merge-robot authored May 9, 2018
2 parents a7a1d78 + ac2a5e9 commit b269a21
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
8 changes: 2 additions & 6 deletions .prow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,5 @@
set -xeuo pipefail

yum -y install jq
for jsonfile in *.json; do
echo "Checking JSON syntax for $jsonfile"
jq < $jsonfile . >/dev/null
done

imagebuild -privileged .
make syntax-check
make container
14 changes: 11 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
refresh:
curl -q "https://storage.googleapis.com/origin-ci-test/releases/openshift/origin/master/origin.repo" 2>/dev/null >openshift.repo
.PHONY: refresh
.PHONY: syntax-check
syntax-check:
@set -e; for jsonfile in $$(find . -name '*.json'); do \
echo -n "Checking JSON syntax for $${jsonfile}... "; \
jq < $${jsonfile} . >/dev/null; \
echo "OK"; \
done

.PHONY: container
container:
imagebuild -privileged .
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Demonstration of building a host OSTree as a container image
# Demonstration of delivering OSTree host updates as a container image

This project does an [rpm-ostree](https://github.com/projectatomic/rpm-ostree)
build inside a container; that container can then be pulled and run in a cluster,
Expand Down

0 comments on commit b269a21

Please sign in to comment.