Add Go modules to vendor/

Signed-off-by: Christopher Crone <[email protected]>

Author: chris-crone

Makefile

@@ -12,10 +12,12 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+.DEFAULT_GOAL := help
+
 PACKAGE=github.com/compose-spec/conformance-tests
 IMAGE_PREFIX=compose-spec/conformance-tests-
 
-.DEFAULT_GOAL := help
+GOFLAGS=-mod=vendor
 
 .PHONY: check
 check: ## Checks the environment before running any command
@@ -24,12 +26,12 @@ check: ## Checks the environment before running any command
 
 .PHONY: images
 images: ## Build the test images
-	docker build server -t $(IMAGE_PREFIX)server
-	docker build client -t $(IMAGE_PREFIX)client
+	docker build . -f server/Dockerfile -t $(IMAGE_PREFIX)server
+	docker build . -f client/Dockerfile -t $(IMAGE_PREFIX)client
 
 .PHONY: test
 test: check images ## Run tests
-	GOPRIVATE=$(PACKAGE) go test ./... -v
+	GOPRIVATE=$(PACKAGE) GOFLAGS=$(GOFLAGS) go test ./... -v
 
 .PHONY: fmt
 fmt: ## Format go files
@@ -47,9 +49,6 @@ lint: build-validate-image
 check-license: build-validate-image
 	docker run --rm $(IMAGE_PREFIX)validate bash -c "./scripts/validate/fileheader"
 
-.PHONY: validate
-validate: lint check-license
-
 .PHONY: help
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

ci/Dockerfile

@@ -21,4 +21,5 @@ ARG GOLANGCILINT_VERSION=v1.23.8
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCILINT_VERSION}
 RUN go get -u github.com/kunalkushwaha/ltag
 
+ENV GOFLAGS=-mod=vendor
 COPY . /go/src

client/Dockerfile

@@ -14,9 +14,9 @@
 
 FROM golang:1.14 AS dev
 WORKDIR /go/src
+RUN go mod init github.com/compose-spec/conformance-tests
 COPY . .
-RUN go mod init github.com/compose-spec/conformance-tests/client
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /client .
+RUN CGO_ENABLED=0 GOFLAGS=-mod=vendor go build -o /client server/main.go
 
 FROM scratch AS run
 COPY --from=dev client /

server/Dockerfile

@@ -14,9 +14,9 @@
 
 FROM golang:1.14 AS dev
 WORKDIR /go/src
+RUN go mod init github.com/compose-spec/conformance-tests
 COPY . .
-RUN go mod init github.com/compose-spec/conformance-tests/server
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /server .
+RUN CGO_ENABLED=0 GOFLAGS=-mod=vendor go build -o /server server/main.go
 
 FROM scratch AS run
 COPY --from=dev server /