Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Fedora 25 #72

Merged
merged 1 commit into from
Dec 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions rpm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RPMBUILD_FLAGS=-ba\
--define '_experimental $(DOCKER_EXPERIMENTAL)' \
SPECS/docker-ce.spec

.PHONY: help clean rpm fedora centos fedora-27 fedora-26 fedora-25 centos-7
.PHONY: help clean rpm fedora centos fedora-27 fedora-26 centos-7

help: ## show make targets
@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf " \033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
Expand All @@ -32,7 +32,7 @@ clean: ## remove build artifacts

rpm: fedora centos ## build all rpm packages

fedora: fedora-27 fedora-26 fedora-25 ## build all fedora rpm packages
fedora: fedora-27 fedora-26 ## build all fedora rpm packages

centos: centos-7 ## build all centos rpm packages

Expand All @@ -46,11 +46,6 @@ fedora-26: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build fedora-
$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
$(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild

fedora-25: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build fedora-25 rpm packages
docker build -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@
$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
$(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild

centos-7: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build centos-7 rpm packages
docker build -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@
$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
Expand Down
17 changes: 0 additions & 17 deletions rpm/fedora-25/Dockerfile.x86_64

This file was deleted.

203 changes: 0 additions & 203 deletions rpm/fedora-25/docker-ce.spec

This file was deleted.