beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove bindata

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2017-06-20 17:04:30 -04:00
parent ea2e4d73c4
commit 96e61f3173
6 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -201,9 +201,6 @@ RUN ln -sfv $PWD/.bashrc ~/.bashrc
# Add integration helps to bashrc
RUN echo "source $PWD/hack/make/.integration-test-helpers" >> /etc/bash.bashrc
# Register Docker's bash completion.
RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \

1
hack/dockerfile/binaries-commits
View file

@ -8,7 +8,6 @@ CONTAINERD_COMMIT=3addd840653146c90a254301d6c3a663c7fd6429
TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
VNDR_COMMIT=c56e082291115e369f77601f9c071dd0b87c7120
BINDATA_COMMIT=a0ff2567cfb70903282db057e799fd826784d41d
# CLI
DOCKERCLI_REPO=https://github.com/docker/cli

14
hack/dockerfile/install-binaries.sh
View file

@ -46,14 +46,6 @@ install_proxy() {
go build -ldflags="$PROXY_LDFLAGS" -o /usr/local/bin/docker-proxy github.com/docker/libnetwork/cmd/proxy
}
install_bindata() {
echo "Install go-bindata version $BINDATA_COMMIT"
git clone https://github.com/jteeuwen/go-bindata "$GOPATH/src/github.com/jteeuwen/go-bindata"
cd $GOPATH/src/github.com/jteeuwen/go-bindata
git checkout -q "$BINDATA_COMMIT"
go build -o /usr/local/bin/go-bindata github.com/jteeuwen/go-bindata/go-bindata
}
install_dockercli() {
echo "Install docker/cli version $DOCKERCLI_COMMIT"
git clone "$DOCKERCLI_REPO" "$GOPATH/src/github.com/docker/cli"
@ -117,16 +109,12 @@ do
go build -v -o /usr/local/bin/vndr .
;;
bindata)
install_bindata
;;
dockercli)
install_dockercli
;;
*)
echo echo "Usage: $0 [tomlv|runc|runc-dynamic|containerd|containerd-dynamic|tini|proxy|proxy-dynamic|bindata|vndr|dockercli]"
echo echo "Usage: $0 [tomlv|runc|runc-dynamic|containerd|containerd-dynamic|tini|proxy|proxy-dynamic|vndr|dockercli]"
exit 1
esac

2
hack/make.ps1
View file

@ -280,7 +280,7 @@ Function Validate-GoFormat($headCommit, $upstreamCommit) {
# Get a list of all go source-code files which have changed. Ignore exit code on next call - always process regardless
$files=@(); $files = Invoke-Expression "git diff $upstreamCommit...$headCommit --diff-filter=ACMR --name-only -- `'*.go`'"
$files = $files | Select-String -NotMatch "^vendor/" | Select-String -NotMatch "^cli/compose/schema/bindata.go"
$files = $files | Select-String -NotMatch "^vendor/"
$badFiles=@(); $files | %{
# Deliberately ignore error on next line - treat as failed
$content=Invoke-Expression "git show $headCommit`:$_"

3
hack/validate/gofmt
View file

@ -5,8 +5,7 @@ source "${SCRIPTDIR}/.validate"
IFS=$'\n'
files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' |
grep -v '^vendor/' |
grep -v '^cli/compose/schema/bindata.go' || true) )
grep -v '^vendor/' || true) )
unset IFS
badFiles=()

2
hack/validate/lint
View file

@ -4,7 +4,7 @@ export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "${SCRIPTDIR}/.validate"
IFS=$'\n'
files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' | grep -v '^api/types/container/' | grep -v '^cli/compose/schema/bindata.go' | grep -v '^api/types/plugins/logdriver/entry.pb.go' || true) )
files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' | grep -v '^api/types/container/' | grep -v '^api/types/plugins/logdriver/entry.pb.go' || true) )
unset IFS
errors=()