Merge branch 'v2' into push-include-deps

.github/workflows/ci.yml

@@ -52,7 +52,6 @@ jobs:
         target:
           - lint
           - validate-go-mod
-          - validate-modules
           - validate-headers
           - validate-docs
     steps:

.github/workflows/scorecards.yml

@@ -0,0 +1,54 @@
+name: Scorecards supply-chain security
+on:
+  # Only the default branch is supported.
+  branch_protection_rule:
+  schedule:
+    - cron: '44 9 * * 4'
+  push:
+    branches: [ "v2" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecards analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Used to receive a badge.
+      id-token: write
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # tag=v2.0.6
+        with:
+          results_file: results.sarif
+          results_format: sarif
+
+          # Publish the results for public repositories to enable scorecard badges. For more details, see
+          # https://github.com/ossf/scorecard-action#publishing-results. 
+          # For private repositories, `publish_results` will automatically be set to `false`, regardless 
+          # of the value entered here.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # tag=v3.0.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # tag=v1.0.26
+        with:
+          sarif_file: results.sarif

Dockerfile

@@ -69,11 +69,6 @@ RUN --mount=type=bind,target=.,rw <<EOT
   fi
 EOT
 
-FROM vendored AS modules-validate
-RUN apk add --no-cache bash
-RUN apk add --no-cache jq
-RUN --mount=type=bind,target=.,rw ./verify-go-modules.sh e2e
-
 FROM build-base AS build
 ARG BUILD_TAGS
 ARG TARGETPLATFORM

Makefile

@@ -132,11 +132,7 @@ go-mod-tidy: ## Run go mod tidy in a container and output resulting go.mod and g
 validate-go-mod: ## Validate go.mod and go.sum are up-to-date
 	$(BUILDX_CMD) bake vendor-validate
 
-.PHONY: validate-modules
-validate-modules: ## Validate root and e2e go.mod are synced
-	$(BUILDX_CMD) bake modules-validate
-
-validate: validate-go-mod validate-modules validate-headers validate-docs  ## Validate sources
+validate: validate-go-mod validate-headers validate-docs  ## Validate sources
 
 pre-commit: validate check-dependencies lint build test e2e-compose
 

README.md

@@ -13,7 +13,7 @@
 [![Build Status](https://img.shields.io/github/workflow/status/docker/compose/ci?label=ci&logo=github&style=flat-square)](https://github.com/docker/compose/actions?query=workflow%3Aci)
 [![Go Report Card](https://goreportcard.com/badge/github.com/docker/compose/v2?style=flat-square)](https://goreportcard.com/report/github.com/docker/compose/v2)
 [![Codecov](https://codecov.io/gh/docker/compose/branch/master/graph/badge.svg?token=HP3K4Y4ctu)](https://codecov.io/gh/docker/compose)
-
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/docker/compose/badge)](https://api.securityscorecards.dev/projects/github.com/docker/compose)
 ![Docker Compose](logo.png?raw=true "Docker Compose Logo")
 
 Docker Compose is a tool for running multi-container applications on Docker
@@ -42,7 +42,7 @@ for Windows and macOS.
 You can download Docker Compose binaries from the
 [release page](https://github.com/docker/compose/releases) on this repository.
 
-Rename the relevant binary for your OS to `docker-compose` and copy it to `$HOME/.docker/cli-plugins` 
+Rename the relevant binary for your OS to `docker-compose` and copy it to `$HOME/.docker/cli-plugins`
 
 Or copy it into one of these folders to install it system-wide:
 

docker-bake.hcl

@@ -71,13 +71,7 @@ target "vendor-validate" {
   output = ["type=cacheonly"]
 }
 
-target "modules-validate" {
-  inherits = ["_common"]
-  target = "modules-validate"
-  output = ["type=cacheonly"]
-}
-
-target "vendor" {
+target "vendor-update" {
   inherits = ["_common"]
   target = "vendor-update"
   output = ["."]