From e6e2aa6ebf6dbef88f6bfed812f1df43ceaab027 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 26 May 2017 18:44:40 -0500 Subject: [PATCH 1/2] Add simple script to test installation of a deb Signed-off-by: Eli Uriegas --- deb/test_install | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 deb/test_install diff --git a/deb/test_install b/deb/test_install new file mode 100755 index 0000000000..f0d7bacbce --- /dev/null +++ b/deb/test_install @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +dpkg -i $@ +apt update && apt install -y -f +dpkg -i $@ +docker --version +exit $? From 4d25369a557b86474dec5517c87fc7c4e6fd0e66 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 30 May 2017 14:12:32 -0500 Subject: [PATCH 2/2] Add deb install script to make target Signed-off-by: Eli Uriegas --- deb/Makefile | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ deb/test_install | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/deb/Makefile b/deb/Makefile index 4c62c275fc..d484618805 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -33,6 +33,13 @@ ubuntu-xenial: ## build ubuntu xenial deb packages -v $(CLI_DIR):/cli \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ + docker run --rm \ + -v $(CURDIR)/:/v \ + -v $(CURDIR)/debbuild/$@:/build \ + -w /v \ + --entrypoint ./test_install \ + debbuild-$@/$(ARCH) \ + /build/*.deb ubuntu-trusty: ## build ubuntu trusty deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . @@ -44,6 +51,13 @@ ubuntu-trusty: ## build ubuntu trusty deb packages -v $(CLI_DIR):/cli \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ + docker run --rm \ + -v $(CURDIR)/:/v \ + -v $(CURDIR)/debbuild/$@:/build \ + -w /v \ + --entrypoint ./test_install \ + debbuild-$@/$(ARCH) \ + /build/*.deb ubuntu-yakkety: ## build ubuntu yakkety deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . @@ -55,6 +69,13 @@ ubuntu-yakkety: ## build ubuntu yakkety deb packages -v $(CLI_DIR):/cli \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ + docker run --rm \ + -v $(CURDIR)/:/v \ + -v $(CURDIR)/debbuild/$@:/build \ + -w /v \ + --entrypoint ./test_install \ + debbuild-$@/$(ARCH) \ + /build/*.deb ubuntu-zesty: ## build ubuntu zesty deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . @@ -66,6 +87,13 @@ ubuntu-zesty: ## build ubuntu zesty deb packages -v $(CLI_DIR):/cli \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ + docker run --rm \ + -v $(CURDIR)/:/v \ + -v $(CURDIR)/debbuild/$@:/build \ + -w /v \ + --entrypoint ./test_install \ + debbuild-$@/$(ARCH) \ + /build/*.deb debian-jessie: ## build debian jessie deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . @@ -77,6 +105,13 @@ debian-jessie: ## build debian jessie deb packages -v $(CLI_DIR):/cli \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ + docker run --rm \ + -v $(CURDIR)/:/v \ + -v $(CURDIR)/debbuild/$@:/build \ + -w /v \ + --entrypoint ./test_install \ + debbuild-$@/$(ARCH) \ + /build/*.deb debian-stretch: ## build debian stretch deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . @@ -88,6 +123,13 @@ debian-stretch: ## build debian stretch deb packages -v $(CLI_DIR):/cli \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ + docker run --rm \ + -v $(CURDIR)/:/v \ + -v $(CURDIR)/debbuild/$@:/build \ + -w /v \ + --entrypoint ./test_install \ + debbuild-$@/$(ARCH) \ + /build/*.deb debian-wheezy: ## build debian wheezy deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . @@ -99,3 +141,10 @@ debian-wheezy: ## build debian wheezy deb packages -v $(CLI_DIR):/cli \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ + docker run --rm \ + -v $(CURDIR)/:/v \ + -v $(CURDIR)/debbuild/$@:/build \ + -w /v \ + --entrypoint ./test_install \ + debbuild-$@/$(ARCH) \ + /build/*.deb diff --git a/deb/test_install b/deb/test_install index f0d7bacbce..5f62818729 100755 --- a/deb/test_install +++ b/deb/test_install @@ -1,7 +1,7 @@ #!/usr/bin/env bash dpkg -i $@ -apt update && apt install -y -f +apt-get update && apt-get install -y -f dpkg -i $@ docker --version exit $?