From fdbae36237775854df4ea84bf67c24f6410b831e Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 1 Dec 2016 11:06:32 -0800 Subject: [PATCH] Move oci and shim to execution package Signed-off-by: Michael Crosby --- {oci => execution/oci}/oci.go | 0 {oci => execution/oci}/process.go | 0 {shim => execution/shim}/containerd-shim/console.go | 0 {shim => execution/shim}/containerd-shim/console_solaris.go | 0 {shim => execution/shim}/containerd-shim/example/config.json | 0 {shim => execution/shim}/containerd-shim/example/init/exit | 0 {shim => execution/shim}/containerd-shim/example/init/pid | 0 .../shim}/containerd-shim/example/init/process.json | 0 {shim => execution/shim}/containerd-shim/example/init/resize | 0 {shim => execution/shim}/containerd-shim/example/init/stderr | 0 {shim => execution/shim}/containerd-shim/example/init/stdin | 0 {shim => execution/shim}/containerd-shim/example/init/stdout | 0 {shim => execution/shim}/containerd-shim/example/logger/exit | 0 {shim => execution/shim}/containerd-shim/example/logger/pid | 0 .../shim}/containerd-shim/example/logger/process.json | 0 {shim => execution/shim}/containerd-shim/example/logger/resize | 0 {shim => execution/shim}/containerd-shim/example/logger/stderr | 0 {shim => execution/shim}/containerd-shim/example/logger/stdin | 0 {shim => execution/shim}/containerd-shim/example/logger/stdout | 0 {shim => execution/shim}/containerd-shim/main.go | 0 {shim => execution/shim}/containerd-shim/process.go | 0 {shim => execution/shim}/containerd-shim/process_pdeathsig.go | 0 .../shim}/containerd-shim/process_pdeathsig_unsupported.go | 0 {shim => execution/shim}/process.go | 0 {shim => execution/shim}/shim.go | 2 +- 25 files changed, 1 insertion(+), 1 deletion(-) rename {oci => execution/oci}/oci.go (100%) rename {oci => execution/oci}/process.go (100%) rename {shim => execution/shim}/containerd-shim/console.go (100%) rename {shim => execution/shim}/containerd-shim/console_solaris.go (100%) rename {shim => execution/shim}/containerd-shim/example/config.json (100%) rename {shim => execution/shim}/containerd-shim/example/init/exit (100%) rename {shim => execution/shim}/containerd-shim/example/init/pid (100%) rename {shim => execution/shim}/containerd-shim/example/init/process.json (100%) rename {shim => execution/shim}/containerd-shim/example/init/resize (100%) rename {shim => execution/shim}/containerd-shim/example/init/stderr (100%) rename {shim => execution/shim}/containerd-shim/example/init/stdin (100%) rename {shim => execution/shim}/containerd-shim/example/init/stdout (100%) rename {shim => execution/shim}/containerd-shim/example/logger/exit (100%) rename {shim => execution/shim}/containerd-shim/example/logger/pid (100%) rename {shim => execution/shim}/containerd-shim/example/logger/process.json (100%) rename {shim => execution/shim}/containerd-shim/example/logger/resize (100%) rename {shim => execution/shim}/containerd-shim/example/logger/stderr (100%) rename {shim => execution/shim}/containerd-shim/example/logger/stdin (100%) rename {shim => execution/shim}/containerd-shim/example/logger/stdout (100%) rename {shim => execution/shim}/containerd-shim/main.go (100%) rename {shim => execution/shim}/containerd-shim/process.go (100%) rename {shim => execution/shim}/containerd-shim/process_pdeathsig.go (100%) rename {shim => execution/shim}/containerd-shim/process_pdeathsig_unsupported.go (100%) rename {shim => execution/shim}/process.go (100%) rename {shim => execution/shim}/shim.go (99%) diff --git a/oci/oci.go b/execution/oci/oci.go similarity index 100% rename from oci/oci.go rename to execution/oci/oci.go diff --git a/oci/process.go b/execution/oci/process.go similarity index 100% rename from oci/process.go rename to execution/oci/process.go diff --git a/shim/containerd-shim/console.go b/execution/shim/containerd-shim/console.go similarity index 100% rename from shim/containerd-shim/console.go rename to execution/shim/containerd-shim/console.go diff --git a/shim/containerd-shim/console_solaris.go b/execution/shim/containerd-shim/console_solaris.go similarity index 100% rename from shim/containerd-shim/console_solaris.go rename to execution/shim/containerd-shim/console_solaris.go diff --git a/shim/containerd-shim/example/config.json b/execution/shim/containerd-shim/example/config.json similarity index 100% rename from shim/containerd-shim/example/config.json rename to execution/shim/containerd-shim/example/config.json diff --git a/shim/containerd-shim/example/init/exit b/execution/shim/containerd-shim/example/init/exit similarity index 100% rename from shim/containerd-shim/example/init/exit rename to execution/shim/containerd-shim/example/init/exit diff --git a/shim/containerd-shim/example/init/pid b/execution/shim/containerd-shim/example/init/pid similarity index 100% rename from shim/containerd-shim/example/init/pid rename to execution/shim/containerd-shim/example/init/pid diff --git a/shim/containerd-shim/example/init/process.json b/execution/shim/containerd-shim/example/init/process.json similarity index 100% rename from shim/containerd-shim/example/init/process.json rename to execution/shim/containerd-shim/example/init/process.json diff --git a/shim/containerd-shim/example/init/resize b/execution/shim/containerd-shim/example/init/resize similarity index 100% rename from shim/containerd-shim/example/init/resize rename to execution/shim/containerd-shim/example/init/resize diff --git a/shim/containerd-shim/example/init/stderr b/execution/shim/containerd-shim/example/init/stderr similarity index 100% rename from shim/containerd-shim/example/init/stderr rename to execution/shim/containerd-shim/example/init/stderr diff --git a/shim/containerd-shim/example/init/stdin b/execution/shim/containerd-shim/example/init/stdin similarity index 100% rename from shim/containerd-shim/example/init/stdin rename to execution/shim/containerd-shim/example/init/stdin diff --git a/shim/containerd-shim/example/init/stdout b/execution/shim/containerd-shim/example/init/stdout similarity index 100% rename from shim/containerd-shim/example/init/stdout rename to execution/shim/containerd-shim/example/init/stdout diff --git a/shim/containerd-shim/example/logger/exit b/execution/shim/containerd-shim/example/logger/exit similarity index 100% rename from shim/containerd-shim/example/logger/exit rename to execution/shim/containerd-shim/example/logger/exit diff --git a/shim/containerd-shim/example/logger/pid b/execution/shim/containerd-shim/example/logger/pid similarity index 100% rename from shim/containerd-shim/example/logger/pid rename to execution/shim/containerd-shim/example/logger/pid diff --git a/shim/containerd-shim/example/logger/process.json b/execution/shim/containerd-shim/example/logger/process.json similarity index 100% rename from shim/containerd-shim/example/logger/process.json rename to execution/shim/containerd-shim/example/logger/process.json diff --git a/shim/containerd-shim/example/logger/resize b/execution/shim/containerd-shim/example/logger/resize similarity index 100% rename from shim/containerd-shim/example/logger/resize rename to execution/shim/containerd-shim/example/logger/resize diff --git a/shim/containerd-shim/example/logger/stderr b/execution/shim/containerd-shim/example/logger/stderr similarity index 100% rename from shim/containerd-shim/example/logger/stderr rename to execution/shim/containerd-shim/example/logger/stderr diff --git a/shim/containerd-shim/example/logger/stdin b/execution/shim/containerd-shim/example/logger/stdin similarity index 100% rename from shim/containerd-shim/example/logger/stdin rename to execution/shim/containerd-shim/example/logger/stdin diff --git a/shim/containerd-shim/example/logger/stdout b/execution/shim/containerd-shim/example/logger/stdout similarity index 100% rename from shim/containerd-shim/example/logger/stdout rename to execution/shim/containerd-shim/example/logger/stdout diff --git a/shim/containerd-shim/main.go b/execution/shim/containerd-shim/main.go similarity index 100% rename from shim/containerd-shim/main.go rename to execution/shim/containerd-shim/main.go diff --git a/shim/containerd-shim/process.go b/execution/shim/containerd-shim/process.go similarity index 100% rename from shim/containerd-shim/process.go rename to execution/shim/containerd-shim/process.go diff --git a/shim/containerd-shim/process_pdeathsig.go b/execution/shim/containerd-shim/process_pdeathsig.go similarity index 100% rename from shim/containerd-shim/process_pdeathsig.go rename to execution/shim/containerd-shim/process_pdeathsig.go diff --git a/shim/containerd-shim/process_pdeathsig_unsupported.go b/execution/shim/containerd-shim/process_pdeathsig_unsupported.go similarity index 100% rename from shim/containerd-shim/process_pdeathsig_unsupported.go rename to execution/shim/containerd-shim/process_pdeathsig_unsupported.go diff --git a/shim/process.go b/execution/shim/process.go similarity index 100% rename from shim/process.go rename to execution/shim/process.go diff --git a/shim/shim.go b/execution/shim/shim.go similarity index 99% rename from shim/shim.go rename to execution/shim/shim.go index e16f88d..ced2f47 100644 --- a/shim/shim.go +++ b/execution/shim/shim.go @@ -13,8 +13,8 @@ import ( "time" "github.com/docker/containerd" + "github.com/docker/containerd/execution/oci" "github.com/docker/containerd/monitor" - "github.com/docker/containerd/oci" specs "github.com/opencontainers/runtime-spec/specs-go" )