Skip to content

Commit f2614f2

Browse files
LK4D4LK4D4
committed
project: use vndr for vendoring
Signed-off-by: Alexander Morozov <[email protected]>
1 parent f54339d commit f2614f2

2,107 files changed

Lines changed: 99970 additions & 26269 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd6
130130
| tar -xzC /usr/local
131131

132132
ENV PATH /go/bin:/usr/local/go/bin:$PATH
133-
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
133+
ENV GOPATH /go
134134

135135
# Compile Go for cross compilation
136136
ENV DOCKER_CROSSPLATFORMS \
@@ -222,10 +222,10 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
222222
hello-world:latest@sha256:8be990ef2aeb16dbcb9271ddfe2610fa6658d13f6dfb8bc72074cc1ca36966a7
223223
# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
224224

225-
# Install tomlv, runc, containerd, grimes, docker-proxy
225+
# Install tomlv, vndr, runc, containerd, grimes, docker-proxy
226226
# Please edit hack/dockerfile/install-binaries.sh to update them.
227227
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
228-
RUN /tmp/install-binaries.sh tomlv runc containerd grimes proxy
228+
RUN /tmp/install-binaries.sh tomlv vndr runc containerd grimes proxy
229229

230230
# Wrap all commands in the "docker-in-docker" script to allow nested containers
231231
ENTRYPOINT ["hack/dind"]

‎Dockerfile.aarch64‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ RUN mkdir /usr/src/go && curl -fsSL https://storage.googleapis.com/golang/go${GO
101101
&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
102102

103103
ENV PATH /usr/src/go/bin:$PATH
104-
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
104+
ENV GOPATH /go
105105

106106
# Only install one version of the registry, because old version which support
107107
# schema1 manifests is not working on ARM64, we should skip integration-cli
@@ -160,10 +160,10 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
160160
aarch64/hello-world:latest@sha256:65a4a158587b307bb02db4de41b836addb0c35175bdc801367b1ac1ddeb9afda
161161
# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
162162

163-
# Install tomlv, runc, containerd, grimes, docker-proxy
163+
# Install tomlv, vndr, runc, containerd, grimes, docker-proxy
164164
# Please edit hack/dockerfile/install-binaries.sh to update them.
165165
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
166-
RUN /tmp/install-binaries.sh tomlv runc containerd grimes proxy
166+
RUN /tmp/install-binaries.sh tomlv vndr runc containerd grimes proxy
167167

168168
# Wrap all commands in the "docker-in-docker" script to allow nested containers
169169
ENTRYPOINT ["hack/dind"]

‎Dockerfile.armhf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ENV GO_VERSION 1.7.3
7070
RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv6l.tar.gz" \
7171
| tar -xzC /usr/local
7272
ENV PATH /go/bin:/usr/local/go/bin:$PATH
73-
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
73+
ENV GOPATH /go
7474

7575
# We're building for armhf, which is ARMv7, so let's be explicit about that
7676
ENV GOARCH arm
@@ -164,10 +164,10 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
164164
armhf/hello-world:latest@sha256:161dcecea0225975b2ad5f768058212c1e0d39e8211098666ffa1ac74cfb7791
165165
# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
166166

167-
# Install tomlv, runc, containerd, grimes, docker-proxy
167+
# Install tomlv, vndr, runc, containerd, grimes, docker-proxy
168168
# Please edit hack/dockerfile/install-binaries.sh to update them.
169169
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
170-
RUN /tmp/install-binaries.sh tomlv runc containerd grimes proxy
170+
RUN /tmp/install-binaries.sh tomlv vndr runc containerd grimes proxy
171171

172172
ENTRYPOINT ["hack/dind"]
173173

‎Dockerfile.ppc64le‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ RUN set -x \
108108

109109
ENV GOROOT_BOOTSTRAP /usr/local/go
110110
ENV PATH /usr/local/go/bin/:$PATH
111-
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
111+
ENV GOPATH /go
112112

113113
# Dependency for golint
114114
ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
@@ -183,10 +183,10 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
183183
ppc64le/hello-world:latest@sha256:186a40a9a02ca26df0b6c8acdfb8ac2f3ae6678996a838f977e57fac9d963974
184184
# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
185185

186-
# Install tomlv, runc, containerd, grimes, docker-proxy
186+
# Install tomlv, vndr, runc, containerd, grimes, docker-proxy
187187
# Please edit hack/dockerfile/install-binaries.sh to update them.
188188
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
189-
RUN /tmp/install-binaries.sh tomlv runc containerd grimes proxy
189+
RUN /tmp/install-binaries.sh tomlv vndr runc containerd grimes proxy
190190

191191
# Wrap all commands in the "docker-in-docker" script to allow nested containers
192192
ENTRYPOINT ["hack/dind"]

‎Dockerfile.s390x‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-s390
100100
| tar -xzC /usr/local
101101

102102
ENV PATH /go/bin:/usr/local/go/bin:$PATH
103-
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
103+
ENV GOPATH /go
104104

105105
# Dependency for golint
106106
ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
@@ -175,10 +175,10 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
175175
s390x/hello-world:latest@sha256:780d80b3a7677c3788c0d5cd9168281320c8d4a6d9183892d8ee5cdd610f5699
176176
# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
177177

178-
# Install tomlv, runc, containerd, grimes, docker-proxy
178+
# Install tomlv, vndr, runc, containerd, grimes, docker-proxy
179179
# Please edit hack/dockerfile/install-binaries.sh to update them.
180180
COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
181-
RUN /tmp/install-binaries.sh tomlv runc containerd grimes proxy
181+
RUN /tmp/install-binaries.sh tomlv vndr runc containerd grimes proxy
182182

183183
# Wrap all commands in the "docker-in-docker" script to allow nested containers
184184
ENTRYPOINT ["hack/dind"]

‎Dockerfile.simple‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ENV GO_VERSION 1.7.3
5353
RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
5454
| tar -xzC /usr/local
5555
ENV PATH /go/bin:/usr/local/go/bin:$PATH
56-
ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
56+
ENV GOPATH /go
5757
ENV CGO_LDFLAGS -L/lib
5858

5959
# Install runc, containerd, grimes and docker-proxy

‎Dockerfile.windows‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ SHELL ["powershell", "-command"]
126126
# - FROM_DOCKERFILE is used for detection of building within a container.
127127
ENV GO_VERSION=1.7.3 `
128128
GIT_LOCATION=https://github.com/git-for-windows/git/releases/download/v2.10.1.windows.1/Git-2.10.1-64-bit.exe `
129-
GOPATH=C:\go;C:\go\src\github.com\docker\docker\vendor `
129+
GOPATH=C:\go `
130130
GOROOT=C:\go `
131131
FROM_DOCKERFILE=1
132132

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ DOCKER_MOUNT := $(if $(DOCKER_MOUNT),$(DOCKER_MOUNT),-v /go/src/github.com/docke
5050

5151
# enable .go-pkg-cache if DOCKER_INCREMENTAL_BINARY and DOCKER_MOUNT (i.e.DOCKER_HOST) are set
5252
PKGCACHE_DIR := $(if $(PKGCACHE_DIR),$(PKGCACHE_DIR),.go-pkg-cache)
53-
PKGCACHE_MAP := gopath:/go/pkg vendor:/go/src/github.com/docker/docker/vendor/pkg goroot-linux_amd64_netgo:/usr/local/go/pkg/linux_amd64_netgo
53+
PKGCACHE_MAP := gopath:/go/pkg goroot-linux_amd64_netgo:/usr/local/go/pkg/linux_amd64_netgo
5454
DOCKER_MOUNT := $(if $(DOCKER_INCREMENTAL_BINARY),$(DOCKER_MOUNT) $(shell echo $(PKGCACHE_MAP) | sed -E 's@([^ ]*)@-v "$(CURDIR)/$(PKGCACHE_DIR)/\1"@g'),$(DOCKER_MOUNT))
5555

5656
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)

‎daemon/logger/jsonfilelog/read.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"os"
1010
"time"
1111

12+
"github.com/fsnotify/fsnotify"
1213
"golang.org/x/net/context"
13-
"gopkg.in/fsnotify.v1"
1414

1515
"github.com/Sirupsen/logrus"
1616
"github.com/docker/docker/daemon/logger"

‎hack/.vendor-helpers.sh‎

Lines changed: 0 additions & 148 deletions
This file was deleted.

0 commit comments

Comments
 (0)