From 3cf3a6d8dd6fa8c1f8d63d4feb8641c15c74aa95 Mon Sep 17 00:00:00 2001
From: Eli Uriegas <eli.uriegas@docker.com>
Date: Fri, 14 Sep 2018 03:13:17 -0700
Subject: [PATCH] Add initial scripts for Fedora 29

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 42f5f2f4384f1699fbe55746d53718016cd6fb87)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6c3958b6ac3633a500d268a8238bd20f636e366d
Component: packaging
---
 components/packaging/rpm/Makefile             | 14 +++++++++++
 components/packaging/rpm/fedora-29/Dockerfile | 23 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 components/packaging/rpm/fedora-29/Dockerfile

diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile
index c07862c185..f224f6f664 100644
--- a/components/packaging/rpm/Makefile
+++ b/components/packaging/rpm/Makefile
@@ -52,6 +52,12 @@ help: ## show make targets
 clean: ## remove build artifacts
 	[ ! -d rpmbuild ] || $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild
 	$(RM) -r rpmbuild/
+	[ ! -d artifacts ] || $(CHOWN) -R $(shell id -u):$(shell id -g) artifacts
+	$(RM) -r artifacts/
+	[ ! -d tmp ] || $(CHOWN) -R $(shell id -u):$(shell id -g) tmp
+	$(RM) -r tmp/
+	-docker rm docker2oci
+	$(MAKE) -C ../image clean
 
 .PHONY: rpm
 rpm: fedora centos ## build all rpm packages
@@ -62,6 +68,14 @@ fedora: fedora-28 fedora-27 fedora-26 ## build all fedora rpm packages
 .PHONY: centos
 centos: centos-7 ## build all centos rpm packages
 
+.PHONY: fedora-29
+fedora-29: ## build fedora-29 rpm packages
+fedora-29: $(SOURCES)
+	$(CHOWN) -R root:root rpmbuild
+	$(BUILD)
+	$(RUN)
+	$(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild
+
 .PHONY: fedora-28
 fedora-28: ## build fedora-28 rpm packages
 fedora-28: $(SOURCES)
diff --git a/components/packaging/rpm/fedora-29/Dockerfile b/components/packaging/rpm/fedora-29/Dockerfile
new file mode 100644
index 0000000000..79e1604d08
--- /dev/null
+++ b/components/packaging/rpm/fedora-29/Dockerfile
@@ -0,0 +1,23 @@
+ARG GO_IMAGE
+ARG ENGINE_IMAGE
+ARG BUILD_IMAGE=fedora:29
+FROM ${GO_IMAGE} as golang
+FROM ${ENGINE_IMAGE} as engine
+
+FROM ${BUILD_IMAGE}
+ENV DISTRO fedora
+ENV SUITE 29
+ENV GOPATH /go
+ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
+ENV AUTO_GOPATH 1
+ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
+ENV RUNC_BUILDTAGS seccomp selinux
+RUN dnf install -y rpm-build rpmlint dnf-plugins-core
+COPY SPECS /root/rpmbuild/SPECS
+RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec
+COPY --from=golang /usr/local/go /usr/local/go/
+COPY --from=engine /bin/dockerd /sources/
+COPY --from=engine /bin/docker-proxy /sources/
+COPY --from=engine /bin/docker-init /sources/
+WORKDIR /root/rpmbuild
+ENTRYPOINT ["/bin/rpmbuild"]