Add Go modules to vendor directory

.github/workflows/main.yml

@@ -18,6 +18,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
+    - name: Check vendor
+      run: DOCKER_BUILDKIT=1 make check-vendor
+
     - name: Lint code
       run: DOCKER_BUILDKIT=1 make lint
 

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=composespec/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,8 +49,9 @@ 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: check-vendor
+check-vendor: build-validate-image
+	docker run --rm $(IMAGE_PREFIX)validate bash -c "./scripts/validate/vendor"
 
 .PHONY: help
 help:

ci/Dockerfile

@@ -15,10 +15,10 @@
 FROM golang:1.14
 
 WORKDIR /go/src
-RUN go mod init github.com/compose-spec/conformance-tests
 
-ARG GOLANGCILINT_VERSION=v1.23.8
+ARG GOLANGCILINT_VERSION=v1.24.0
 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
+RUN go get -v -u github.com/kunalkushwaha/ltag && rm -rf /go/src/github.com/kunalkushwaha
 
-COPY . /go/src
+ENV GOFLAGS=-mod=vendor
+COPY . .

client/Dockerfile

@@ -15,8 +15,7 @@
 FROM golang:1.14 AS dev
 WORKDIR /go/src
 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 client/main.go
 
 FROM scratch AS run
 COPY --from=dev client /

scripts/validate/fileheader

@@ -25,4 +25,4 @@ fi
 
 BASEPATH="${1-}"
 
-ltag -t "${BASEPATH}scripts/validate/template" --excludes "validate" --check -v
+ltag -t "${BASEPATH}scripts/validate/template" --excludes "validate vendor" --check -v

scripts/validate/vendor

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+#   Copyright The Compose Specification Authors.
+
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+
+#       http://www.apache.org/licenses/LICENSE-2.0
+
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+
+set -eu -o pipefail
+
+go mod tidy 2>/dev/null && go mod vendor 2>/dev/null
+
+status="$(git status --porcelain -- go.mod go.sum vendor 2>/dev/null)"
+diffs=$(echo "$status" | grep -v '^[RAD] ' || true)
+if [ "$diffs" ]; then
+    {
+        set +x
+        echo 'Unexpected vendor diff:'
+        echo
+        echo "$diffs"
+        echo
+    } >&2
+    exit 1
+fi

server/Dockerfile

@@ -15,8 +15,7 @@
 FROM golang:1.14 AS dev
 WORKDIR /go/src
 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 /