Merge pull request #35 from docker/fix-release

Remove overcomplex layout in dist directory, due to previous goreleaser

Author: silvin-lubecki

Dockerfile

@@ -97,5 +97,5 @@ RUN chmod +x /root/.docker/scan/snyk /root/e2e/snyk
 # install docker CLI
 COPY --from=cli /usr/local/bin/docker /usr/local/bin/docker
 # install docker-scan plugin
-COPY --from=cross-build /go/src/github.com/docker/docker-scan/dist/docker-scan_linux_amd64/docker-scan/docker-scan /root/.docker/cli-plugins/docker-scan
+COPY --from=cross-build /go/src/github.com/docker/docker-scan/dist/docker-scan_linux_amd64 /root/.docker/cli-plugins/docker-scan
 CMD ["make", "-f", "builder.Makefile", "e2e"]

builder.Makefile

@@ -26,9 +26,9 @@ e2e:
 	go test -ldflags=$(LDFLAGS) ./e2e
 
 cross:
-	GOOS=linux   GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_linux_amd64/docker-scan/$(BINARY) ./cmd/docker-scan
-	GOOS=darwin  GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_darwin_amd64/docker-scan/$(BINARY) ./cmd/docker-scan
-	GOOS=windows GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_windows_amd64/docker-scan/$(BINARY).exe ./cmd/docker-scan
+	GOOS=linux   GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_linux_amd64 ./cmd/docker-scan
+	GOOS=darwin  GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_darwin_amd64 ./cmd/docker-scan
+	GOOS=windows GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_windows_amd64.exe ./cmd/docker-scan
 
 .PHONY: build
 build: