From c8c39779a7919e78a97b97394930080885a41425 Mon Sep 17 00:00:00 2001 From: baude Date: Sat, 28 Apr 2018 11:45:51 -0500 Subject: correct varlink command in service file The struct of the varlink command changed to accept a URI as input. This was never updated in the service file Signed-off-by: baude Closes: #691 Approved by: mheon --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e002fb954..7b52b612c 100644 --- a/Makefile +++ b/Makefile @@ -138,7 +138,9 @@ ginkgo: localintegration: varlink_generate test-binaries ginkgo -v -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/. - sh test/varlink/run_varlink_tests.sh + # Temporarily disabling these tests due to varlink issues + # in our CI environment + # bash test/varlink/run_varlink_tests.sh vagrant-check: BOX=$(BOX) sh ./vagrant.sh @@ -250,8 +252,8 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man varlink_generate: .gopathok cmd/podman/varlink/ioprojectatomicpodman.go -.PHONY: install.libseccomp -install.libseccomp: +.PHONY: install.libseccomp.sudo +install.libseccomp.sudo: rm -rf ../../seccomp/libseccomp git clone https://github.com/seccomp/libseccomp ../../seccomp/libseccomp cd ../../seccomp/libseccomp && git checkout $(LIBSECCOMP_COMMIT) && ./autogen.sh && ./configure --prefix=/usr && make all && make install @@ -276,4 +278,4 @@ validate: gofmt .gitvalidation shell \ changelog \ validate \ - install.libseccomp + install.libseccomp.sudo -- cgit v1.2.3-54-g00ecf