From f832e757f8b00ffa773985fdf60c6ae00bc32ff4 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 7 Nov 2016 13:19:18 -0800 Subject: [PATCH] Remove more top level files Signed-off-by: Michael Crosby --- Dockerfile | 70 ------------------- Jenkinsfile | 13 ---- MAINTAINERS | 41 ----------- .../containerd-shim}/console.go | 0 .../containerd-shim}/console_solaris.go | 0 .../containerd-shim}/example/config.json | 0 .../containerd-shim}/example/init/exit | 0 .../containerd-shim}/example/init/pid | 0 .../example/init/process.json | 0 .../containerd-shim}/example/init/resize | 0 .../containerd-shim}/example/init/stderr | 0 .../containerd-shim}/example/init/stdin | 0 .../containerd-shim}/example/init/stdout | 0 .../containerd-shim}/example/logger/exit | 0 .../containerd-shim}/example/logger/pid | 0 .../example/logger/process.json | 0 .../containerd-shim}/example/logger/resize | 0 .../containerd-shim}/example/logger/stderr | 0 .../containerd-shim}/example/logger/stdin | 0 .../containerd-shim}/example/logger/stdout | 0 .../containerd-shim}/main.go | 0 .../containerd-shim}/process.go | 0 .../containerd-shim}/process_pdeathsig.go | 0 .../process_pdeathsig_unsupported.go | 0 24 files changed, 124 deletions(-) delete mode 100644 Dockerfile delete mode 100644 Jenkinsfile delete mode 100644 MAINTAINERS rename {containerd-shim => shim/containerd-shim}/console.go (100%) rename {containerd-shim => shim/containerd-shim}/console_solaris.go (100%) rename {containerd-shim => shim/containerd-shim}/example/config.json (100%) rename {containerd-shim => shim/containerd-shim}/example/init/exit (100%) rename {containerd-shim => shim/containerd-shim}/example/init/pid (100%) rename {containerd-shim => shim/containerd-shim}/example/init/process.json (100%) rename {containerd-shim => shim/containerd-shim}/example/init/resize (100%) rename {containerd-shim => shim/containerd-shim}/example/init/stderr (100%) rename {containerd-shim => shim/containerd-shim}/example/init/stdin (100%) rename {containerd-shim => shim/containerd-shim}/example/init/stdout (100%) rename {containerd-shim => shim/containerd-shim}/example/logger/exit (100%) rename {containerd-shim => shim/containerd-shim}/example/logger/pid (100%) rename {containerd-shim => shim/containerd-shim}/example/logger/process.json (100%) rename {containerd-shim => shim/containerd-shim}/example/logger/resize (100%) rename {containerd-shim => shim/containerd-shim}/example/logger/stderr (100%) rename {containerd-shim => shim/containerd-shim}/example/logger/stdin (100%) rename {containerd-shim => shim/containerd-shim}/example/logger/stdout (100%) rename {containerd-shim => shim/containerd-shim}/main.go (100%) rename {containerd-shim => shim/containerd-shim}/process.go (100%) rename {containerd-shim => shim/containerd-shim}/process_pdeathsig.go (100%) rename {containerd-shim => shim/containerd-shim}/process_pdeathsig_unsupported.go (100%) diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 43d256e..0000000 --- a/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -FROM debian:jessie - -# allow replacing httpredir mirror -ARG APT_MIRROR=httpredir.debian.org -RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list - -RUN apt-get update && apt-get install -y \ - build-essential \ - ca-certificates \ - curl \ - git \ - make \ - jq \ - pkg-config \ - apparmor \ - libapparmor-dev \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* - -# Install Go -ENV GO_VERSION 1.6.2 -RUN curl -sSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar -v -C /usr/local -xz -ENV PATH /go/bin:/usr/local/go/bin:$PATH -ENV GOPATH /go:/go/src/github.com/docker/docker/containerkit/vendor - -ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3 -# Grab Go's cover tool for dead-simple code coverage testing -# Grab Go's vet tool for examining go code to find suspicious constructs -# and help prevent errors that the compiler might not catch -RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \ - && (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT) \ - && go install -v golang.org/x/tools/cmd/cover \ - && go install -v golang.org/x/tools/cmd/vet -# Grab Go's lint tool -ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456 -RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \ - && (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \ - && go install -v github.com/golang/lint/golint - -WORKDIR /go/src/github.com/docker/docker/containerkit - -# install seccomp: the version shipped in trusty is too old -ENV SECCOMP_VERSION 2.3.0 -RUN set -x \ - && export SECCOMP_PATH="$(mktemp -d)" \ - && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \ - | tar -xzC "$SECCOMP_PATH" --strip-components=1 \ - && ( \ - cd "$SECCOMP_PATH" \ - && ./configure --prefix=/usr/local \ - && make \ - && make install \ - && ldconfig \ - ) \ - && rm -rf "$SECCOMP_PATH" - -# Install runc -ENV RUNC_COMMIT cc29e3dded8e27ba8f65738f40d251c885030a28 -RUN set -x \ - && export GOPATH="$(mktemp -d)" \ - && git clone git://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc" \ - && cd "$GOPATH/src/github.com/opencontainers/runc" \ - && git checkout -q "$RUNC_COMMIT" \ - && make BUILDTAGS="seccomp apparmor selinux" && make install - -COPY . /go/src/github.com/docker/docker/containerkit - -WORKDIR /go/src/github.com/docker/docker/containerkit - -RUN make all install diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index edd8355..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,13 +0,0 @@ -wrappedNode(label: "linux && x86_64") { - deleteDir() - checkout scm - - stage "build image" - def img = docker.build("dockerbuildbot/containerd:${gitCommit()}") - try { - stage "run tests" - sh "docker run --privileged --rm --name '${env.BUILD_TAG}' ${img.id} make test" - } finally { - sh "docker rmi -f ${img.id} ||:" - } -} diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index 77c5fa7..0000000 --- a/MAINTAINERS +++ /dev/null @@ -1,41 +0,0 @@ -# Containerd maintainers file -# -# This file describes who runs the docker/containerd project and how. -# This is a living document - if you see something out of date or missing, speak up! -# -# It is structured to be consumable by both humans and programs. -# To extract its contents programmatically, use any TOML-compliant parser. -# -# This file is compiled into the MAINTAINERS file in docker/opensource. -# -[Org] - [Org."Core maintainers"] - people = [ - "crosbymichael", - "tonistiigi", - "mlaventure", - ] - -[people] - -# A reference list of all people associated with the project. -# All other sections should refer to people by their canonical key -# in the people section. - - # ADD YOURSELF HERE IN ALPHABETICAL ORDER - - [people.crosbymichael] - Name = "Michael Crosby" - Email = "crosbymichael@gmail.com" - GitHub = "crosbymichael" - - [people.tonistiigi] - Name = "Tõnis Tiigi" - Email = "tonis@docker.com" - GitHub = "tonistiigi" - - [people.mlaventure] - Name = "Kenfe-Mickaël Laventure" - Email = "mickael.laventure@docker.com" - GitHub = "mlaventure" - diff --git a/containerd-shim/console.go b/shim/containerd-shim/console.go similarity index 100% rename from containerd-shim/console.go rename to shim/containerd-shim/console.go diff --git a/containerd-shim/console_solaris.go b/shim/containerd-shim/console_solaris.go similarity index 100% rename from containerd-shim/console_solaris.go rename to shim/containerd-shim/console_solaris.go diff --git a/containerd-shim/example/config.json b/shim/containerd-shim/example/config.json similarity index 100% rename from containerd-shim/example/config.json rename to shim/containerd-shim/example/config.json diff --git a/containerd-shim/example/init/exit b/shim/containerd-shim/example/init/exit similarity index 100% rename from containerd-shim/example/init/exit rename to shim/containerd-shim/example/init/exit diff --git a/containerd-shim/example/init/pid b/shim/containerd-shim/example/init/pid similarity index 100% rename from containerd-shim/example/init/pid rename to shim/containerd-shim/example/init/pid diff --git a/containerd-shim/example/init/process.json b/shim/containerd-shim/example/init/process.json similarity index 100% rename from containerd-shim/example/init/process.json rename to shim/containerd-shim/example/init/process.json diff --git a/containerd-shim/example/init/resize b/shim/containerd-shim/example/init/resize similarity index 100% rename from containerd-shim/example/init/resize rename to shim/containerd-shim/example/init/resize diff --git a/containerd-shim/example/init/stderr b/shim/containerd-shim/example/init/stderr similarity index 100% rename from containerd-shim/example/init/stderr rename to shim/containerd-shim/example/init/stderr diff --git a/containerd-shim/example/init/stdin b/shim/containerd-shim/example/init/stdin similarity index 100% rename from containerd-shim/example/init/stdin rename to shim/containerd-shim/example/init/stdin diff --git a/containerd-shim/example/init/stdout b/shim/containerd-shim/example/init/stdout similarity index 100% rename from containerd-shim/example/init/stdout rename to shim/containerd-shim/example/init/stdout diff --git a/containerd-shim/example/logger/exit b/shim/containerd-shim/example/logger/exit similarity index 100% rename from containerd-shim/example/logger/exit rename to shim/containerd-shim/example/logger/exit diff --git a/containerd-shim/example/logger/pid b/shim/containerd-shim/example/logger/pid similarity index 100% rename from containerd-shim/example/logger/pid rename to shim/containerd-shim/example/logger/pid diff --git a/containerd-shim/example/logger/process.json b/shim/containerd-shim/example/logger/process.json similarity index 100% rename from containerd-shim/example/logger/process.json rename to shim/containerd-shim/example/logger/process.json diff --git a/containerd-shim/example/logger/resize b/shim/containerd-shim/example/logger/resize similarity index 100% rename from containerd-shim/example/logger/resize rename to shim/containerd-shim/example/logger/resize diff --git a/containerd-shim/example/logger/stderr b/shim/containerd-shim/example/logger/stderr similarity index 100% rename from containerd-shim/example/logger/stderr rename to shim/containerd-shim/example/logger/stderr diff --git a/containerd-shim/example/logger/stdin b/shim/containerd-shim/example/logger/stdin similarity index 100% rename from containerd-shim/example/logger/stdin rename to shim/containerd-shim/example/logger/stdin diff --git a/containerd-shim/example/logger/stdout b/shim/containerd-shim/example/logger/stdout similarity index 100% rename from containerd-shim/example/logger/stdout rename to shim/containerd-shim/example/logger/stdout diff --git a/containerd-shim/main.go b/shim/containerd-shim/main.go similarity index 100% rename from containerd-shim/main.go rename to shim/containerd-shim/main.go diff --git a/containerd-shim/process.go b/shim/containerd-shim/process.go similarity index 100% rename from containerd-shim/process.go rename to shim/containerd-shim/process.go diff --git a/containerd-shim/process_pdeathsig.go b/shim/containerd-shim/process_pdeathsig.go similarity index 100% rename from containerd-shim/process_pdeathsig.go rename to shim/containerd-shim/process_pdeathsig.go diff --git a/containerd-shim/process_pdeathsig_unsupported.go b/shim/containerd-shim/process_pdeathsig_unsupported.go similarity index 100% rename from containerd-shim/process_pdeathsig_unsupported.go rename to shim/containerd-shim/process_pdeathsig_unsupported.go