Merge pull request #1308 from runcom/fix-listen

Mrunal Patel · web-flow · commit d7b7b82ae34e · 2018-02-08T14:42:33.000-08:00
cmd/crio: fix listen address dir creation
diff --git a/Makefile b/Makefile
@@ -221,7 +221,10 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
 
 .install.md2man: .gopathok
 	if [ ! -x "$(GOPATH)/bin/go-md2man" ]; then \
-		go get -u github.com/cpuguy83/go-md2man; \
+		go get -u -d github.com/cpuguy83/go-md2man; \
+		cd $(GOPATH)/src/github.com/cpuguy83/go-md2man; \
+		git checkout 20f5889cbdc3c73dbd2862796665e7c465ade7d1; \
+		$(GO) install github.com/cpuguy83/go-md2man; \
 	fi
 
 .install.ostree: .gopathok
diff --git a/cmd/crio/main.go b/cmd/crio/main.go
@@ -8,6 +8,7 @@ import (
 	_ "net/http/pprof"
 	"os"
 	"os/signal"
+	"path/filepath"
 	"sort"
 	"strings"
 	"time"
@@ -430,6 +431,10 @@ func main() {
 			return fmt.Errorf("invalid --runtime value %q", err)
 		}
 
+		if err := os.MkdirAll(filepath.Dir(config.Listen), 0755); err != nil {
+			return err
+		}
+
 		// Remove the socket if it already exists
 		if _, err := os.Stat(config.Listen); err == nil {
 			if err := os.Remove(config.Listen); err != nil {
diff --git a/contrib/test/integration/main.yml b/contrib/test/integration/main.yml
@@ -34,6 +34,11 @@
     - integration
     - e2e
   tasks:
+    - name: fixup go-md2man
+      shell: |
+              cd {{ ansible_env.GOPATH }}/src/github.com/cpuguy83/go-md2man
+              git checkout 20f5889cbdc3c73dbd2862796665e7c465ade7d1
+              go install github.com/cpuguy83/go-md2man
     - name: clone build and install cri-o
       include: "build/cri-o.yml"
 
diff --git a/version/version.go b/version/version.go
@@ -1,4 +1,4 @@
 package version
 
 // Version is the version of the build.
-const Version = "1.0.9-dev"
+const Version = "1.0.10-dev"
