sameo

diff --git a/server/container_create.go b/server/container_create.go
index 06c172d..117f386 100644
--- a/server/container_create.go
+++ b/server/container_create.go
@@ -376,7 +376,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
                if containerInfo.Config != nil && len(containerInfo.Config.Config.Cmd) > 0 {
                        processArgs = containerInfo.Config.Config.Cmd
                } else {
-                       processArgs = []string{"/bin/sh"}
+                       processArgs = []string{podInfraCommand}

sameo

Summary

• dnsmasq front ends the requests and sends them on to kube-dns

  dnsmasq
    --cache-size=1000
    --no-resolv
    --server=127.0.0.1#10053
  

--log-facility=-

sameo

diff --git a/src/spec_handlers/mounts.c b/src/spec_handlers/mounts.c
index bc172e4..c1362ed 100644
--- a/src/spec_handlers/mounts.c
+++ b/src/spec_handlers/mounts.c
@@ -20,6 +20,7 @@
 
 #include "spec_handler.h"
 #include "mount.h"
+#include "pod.h"
 

sameo

diff --git a/server/container_create.go b/server/container_create.go
index 06c172d..da120b4 100644
--- a/server/container_create.go
+++ b/server/container_create.go
@@ -15,6 +15,7 @@ import (
 	"github.com/kubernetes-incubator/cri-o/server/seccomp"
 	"github.com/opencontainers/runc/libcontainer/label"
 	"github.com/opencontainers/runtime-tools/generate"
+	"github.com/opencontainers/image-spec/specs-go/v1"
 	"golang.org/x/net/context"

sameo

diff --git a/server/container_create.go b/server/container_create.go
index 06c172d..86b8758 100644
--- a/server/container_create.go
+++ b/server/container_create.go
@@ -15,6 +15,7 @@ import (
        "github.com/kubernetes-incubator/cri-o/server/seccomp"
        "github.com/opencontainers/runc/libcontainer/label"
        "github.com/opencontainers/runtime-tools/generate"
+       "github.com/opencontainers/image-spec/specs-go/v1"
        "golang.org/x/net/context"

sameo

# The "crio" table contains all of the server options.
[crio]

# root is a path to the "root directory". CRI-O stores all of its data,
# including container images, in this directory.
root = "/var/lib/ocid"

# run is a path to the "run directory". CRI-O stores all of its state
# in this directory.
runroot = "/var/run/containers"

sameo

diff --git a/proxy/vm.go b/proxy/vm.go
index 01c3de9..cff59d3 100644
--- a/proxy/vm.go
+++ b/proxy/vm.go
@@ -16,7 +16,7 @@ package main
 
 import (
 	"bufio"
-	"encoding/hex"
+//	"encoding/hex"

sameo

# The "ocid" table contains all of the server options.
[ocid]

# root is a path to the "root directory". OCID stores all of its data,
# including container images, in this directory.
root = "/var/lib/ocid"

# run is a path to the "run directory". OCID stores all of its state
# in this directory.
runroot = "/var/run/containers"

sameo

#!/bin/bash

for k in {1..5};
do

	echo "k8s cleanup cycle #$k"

	kubeadm reset 1> /dev/null

	

sameo

diff --git a/server/container_create.go b/server/container_create.go
index 7834e88..608cade 100644
--- a/server/container_create.go
+++ b/server/container_create.go
@@ -71,23 +71,8 @@ func buildOCIProcessArgs(containerKubeConfig *pb.ContainerConfig, imageOCIConfig
 	kubeArgs := containerKubeConfig.Args
 
 	if imageOCIConfig == nil {
-		// HACK We should error out here, not being able to get an Image config is fatal.
-		// When https://github.com/kubernetes-incubator/cri-o/issues/395 is fixed