Skip to content

Commit 42f5f2f

Browse files
committed
Add initial scripts for Fedora 29
Signed-off-by: Eli Uriegas <[email protected]>
1 parent 6f9e0b8 commit 42f5f2f

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

rpm/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ help: ## show make targets
5252
clean: ## remove build artifacts
5353
[ ! -d rpmbuild ] || $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild
5454
$(RM) -r rpmbuild/
55+
[ ! -d artifacts ] || $(CHOWN) -R $(shell id -u):$(shell id -g) artifacts
56+
$(RM) -r artifacts/
57+
[ ! -d tmp ] || $(CHOWN) -R $(shell id -u):$(shell id -g) tmp
58+
$(RM) -r tmp/
59+
-docker rm docker2oci
60+
$(MAKE) -C ../image clean
5561

5662
.PHONY: rpm
5763
rpm: fedora centos ## build all rpm packages
@@ -62,6 +68,14 @@ fedora: fedora-28 fedora-27 fedora-26 ## build all fedora rpm packages
6268
.PHONY: centos
6369
centos: centos-7 ## build all centos rpm packages
6470

71+
.PHONY: fedora-29
72+
fedora-29: ## build fedora-29 rpm packages
73+
fedora-29: $(SOURCES)
74+
$(CHOWN) -R root:root rpmbuild
75+
$(BUILD)
76+
$(RUN)
77+
$(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild
78+
6579
.PHONY: fedora-28
6680
fedora-28: ## build fedora-28 rpm packages
6781
fedora-28: $(SOURCES)

rpm/fedora-29/Dockerfile

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
ARG GO_IMAGE
2+
ARG ENGINE_IMAGE
3+
ARG BUILD_IMAGE=fedora:29
4+
FROM ${GO_IMAGE} as golang
5+
FROM ${ENGINE_IMAGE} as engine
6+
7+
FROM ${BUILD_IMAGE}
8+
ENV DISTRO fedora
9+
ENV SUITE 29
10+
ENV GOPATH /go
11+
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
12+
ENV AUTO_GOPATH 1
13+
ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
14+
ENV RUNC_BUILDTAGS seccomp selinux
15+
RUN dnf install -y rpm-build rpmlint dnf-plugins-core
16+
COPY SPECS /root/rpmbuild/SPECS
17+
RUN dnf builddep -y /root/rpmbuild/SPECS/*.spec
18+
COPY --from=golang /usr/local/go /usr/local/go/
19+
COPY --from=engine /bin/dockerd /sources/
20+
COPY --from=engine /bin/docker-proxy /sources/
21+
COPY --from=engine /bin/docker-init /sources/
22+
WORKDIR /root/rpmbuild
23+
ENTRYPOINT ["/bin/rpmbuild"]

0 commit comments

Comments
 (0)