change dowstream ref

Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
update PAT token name
2026-02-10 18:49:28 +08:00 · 2022-05-25 14:28:23 +02:00 · 2022-05-25 14:21:17 +02:00 · 2022-05-25 14:19:46 +02:00 · 2022-05-25 14:12:02 +02:00 · 2022-05-23 15:01:05 +02:00
19 changed files with 221 additions and 32 deletions
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -7,10 +7,10 @@ jobs:
    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/generate-artifacts')
    runs-on: ubuntu-latest
    steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.18
        uses: actions/setup-go@v2
        with:
-          go-version: 1.17
+          go-version: 1.18.2
        id: go

      - name: Checkout code into the Go module directory
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,12 @@ on:
    branches:
      - v2
  pull_request:
+  workflow_dispatch:
+    inputs:
+      debug_enabled:
+        description: 'To run with tmate enter "debug_enabled"'
+        required: false
+        default: "false"

 jobs:
  lint:
@@ -13,10 +19,10 @@ jobs:
    env:
      GO111MODULE: "on"
    steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.18
        uses: actions/setup-go@v2
        with:
-          go-version: 1.17
+          go-version: 1.18.2
        id: go

      - name: Checkout code into the Go module directory
@@ -40,10 +46,10 @@ jobs:
    env:
      GO111MODULE: "on"
    steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.18
        uses: actions/setup-go@v2
        with:
-          go-version: 1.17
+          go-version: 1.18.2
        id: go

      - name: Checkout code into the Go module directory
@@ -65,10 +71,10 @@ jobs:
    env:
      GO111MODULE: "on"
    steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.18
        uses: actions/setup-go@v2
        with:
-          go-version: 1.17
+          go-version: 1.18.2
        id: go

      - name: Setup docker CLI
@@ -90,7 +96,7 @@ jobs:
      - name: Build for local E2E
        env:
          BUILD_TAGS: e2e
-        run: make -f builder.Makefile compose-plugin
+        run: make GIT_TAG=e2e-PR-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }} -f builder.Makefile compose-plugin

      - name: E2E Test in plugin mode
        run: make e2e-compose
@@ -101,10 +107,10 @@ jobs:
    env:
      GO111MODULE: "on"
    steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.18
        uses: actions/setup-go@v2
        with:
-          go-version: 1.17
+          go-version: 1.18.2
        id: go

      - name: Setup docker CLI
@@ -123,7 +129,17 @@ jobs:
      - name: Build for local E2E
        env:
          BUILD_TAGS: e2e
-        run: make -f builder.Makefile compose-plugin
+        run: make GIT_TAG=e2e-PR-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.sha }} -f builder.Makefile compose-plugin
+
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        with:
+          limit-access-to-actor: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+        if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}

      - name: E2E Test in standalone mode
-        run: make e2e-compose-standalone
+        run: |
+          rm -f /usr/local/bin/docker-compose
+          cp bin/docker-compose /usr/local/bin
+          make e2e-compose-standalone
--- a/.github/workflows/dispatch-release.yml
+++ b/.github/workflows/dispatch-release.yml
@@ -0,0 +1,22 @@
+name: dispatch release event to downstream repositories
+
+on:
+  workflow_dispatch:
+
+jobs:
+  dispatch_release_version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          github-token: ${{ secrets.PAT_DOC_TOKEN }}
+          script: |
+            await github.rest.actions.createWorkflowDispatch({
+              owner: 'docker',
+              repo: 'docker.github.io',
+              workflow_id: 'compose_release',
+              ref: 'compose-api-upstream',
+              inputs: {
+                release: ${{ GITHUB_REF }},
+              },
+            })
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -11,10 +11,10 @@ jobs:
  upload-release:
    runs-on: ubuntu-latest
    steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.18
        uses: actions/setup-go@v2
        with:
-          go-version: 1.17
+          go-version: 1.18.2
        id: go

      - name: Setup docker CLI
--- a/4
+++ b/4
@@ -15,7 +15,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.

-ARG GO_VERSION=1.17-alpine
+ARG GO_VERSION=1.18.2-alpine
 ARG GOLANGCI_LINT_VERSION=v1.40.1-alpine
 ARG PROTOC_GEN_GO_VERSION=v1.4.3

@@ -88,7 +88,7 @@ RUN --mount=target=. \
    make -f builder.Makefile test

 FROM base AS check-license-headers
-RUN go get -u github.com/kunalkushwaha/ltag
+RUN go install github.com/kunalkushwaha/ltag@latest
 RUN --mount=target=. \
    make -f builder.Makefile check-license-headers

--- a/4
+++ b/4
@@ -43,11 +43,13 @@ compose-plugin: ## Compile the compose cli-plugin

 .PHONY: e2e-compose
 e2e-compose: ## Run end to end local tests in plugin mode. Set E2E_TEST=TestName to run a single test
+	docker compose version
 	go test $(TEST_FLAGS) -count=1 ./pkg/e2e

 .PHONY: e2e-compose-standalone
 e2e-compose-standalone: ## Run End to end local tests in standalone mode. Set E2E_TEST=TestName to run a single test
-	go test $(TEST_FLAGS) -count=1 --tags=standalone ./pkg/e2e
+	docker-compose version
+	go test $(TEST_FLAGS) -v -count=1 -parallel=1 --tags=standalone ./pkg/e2e

 .PHONY: mocks
 mocks:
--- a/cmd/compose/up.go
+++ b/cmd/compose/up.go
@@ -185,6 +185,9 @@ func runUp(ctx context.Context, backend api.Service, createOptions createOptions
 	if upOptions.attachDependencies {
 		attachTo = project.ServiceNames()
 	}
+	if len(attachTo) == 0 {
+		attachTo = project.ServiceNames()
+	}

 	create := api.CreateOptions{
 		Services:             services,
--- a/docs/docs.Dockerfile
+++ b/docs/docs.Dockerfile
@@ -15,7 +15,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.

-ARG GO_VERSION=1.17
+ARG GO_VERSION=1.18.2
 ARG FORMATS=md,yaml

 FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION}-alpine AS docsgen
--- a/go.mod
+++ b/go.mod
@@ -1,12 +1,12 @@
 module github.com/docker/compose/v2

-go 1.17
+go 1.18

 require (
 	github.com/AlecAivazis/survey/v2 v2.3.2
 	github.com/buger/goterm v1.0.4
 	github.com/cnabio/cnab-to-oci v0.3.1-beta1
-	github.com/compose-spec/compose-go v1.2.5
+	github.com/compose-spec/compose-go v1.2.6
 	github.com/containerd/console v1.0.3
 	github.com/containerd/containerd v1.6.2
 	github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e
--- a/go.sum
+++ b/go.sum
@@ -259,7 +259,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4=
 github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
 github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -302,8 +301,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
 github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
 github.com/compose-spec/compose-go v1.0.8/go.mod h1:REnCbBugoIdHB7S1sfkN/aJ7AJpNApGNjNiVjA9L8x4=
-github.com/compose-spec/compose-go v1.2.5 h1:yGaACRJrWTQMFW89/ck2o1qd3gIxAji4EQkgewH3hqc=
-github.com/compose-spec/compose-go v1.2.5/go.mod h1:a/H2RY5UejNRhzbNXHygSAxBARTpLmLlaCkh58xfStM=
+github.com/compose-spec/compose-go v1.2.6 h1:9l2Y/yNn/OSngnkUBP8h8CchTmMcf1MW4BeUEaZXy8k=
+github.com/compose-spec/compose-go v1.2.6/go.mod h1:cg8yTeI+7rfQsEW9XHOLx0sNVjGKEXr6XwVB4fxmG3A=
 github.com/compose-spec/godotenv v1.1.1/go.mod h1:zF/3BOa18Z24tts5qnO/E9YURQanJTBUf7nlcCTNsyc=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
@@ -1475,7 +1474,6 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0=
 go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w=
@@ -1492,7 +1490,6 @@ go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtB
 go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g=
 go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4=
 go.opentelemetry.io/otel/exporters/jaeger v1.4.1/go.mod h1:ZW7vkOu9nC1CxsD8bHNHCia5JUbwP39vxgd1q4Z5rCI=
-go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg=
 go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM=
 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4=
@@ -2194,7 +2191,6 @@ k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
 k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
@@ -2233,7 +2229,6 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyz
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
-sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU=
 sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
--- a/pkg/compose/build.go
+++ b/pkg/compose/build.go
@@ -275,6 +275,10 @@ func (s *composeService) toBuildOptions(project *types.Project, service types.Se
 		sessionConfig = append(sessionConfig, p)
 	}

+	if len(service.Build.Tags) > 0 {
+		tags = append(tags, service.Build.Tags...)
+	}
+
 	return build.Options{
 		Inputs: build.Inputs{
 			ContextPath:    service.Build.Context,
--- a/pkg/compose/up.go
+++ b/pkg/compose/up.go
@@ -61,12 +61,12 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
 			go func() {
 				<-signalChan
 				s.Kill(ctx, project.Name, api.KillOptions{ // nolint:errcheck
-					Services: options.Create.Services,
+					Services: project.ServiceNames(),
 				})
 			}()

 			return s.Stop(ctx, project.Name, api.StopOptions{
-				Services: options.Create.Services,
+				Services: project.ServiceNames(),
 			})
 		})
 	}
--- a/pkg/e2e/compose_build_test.go
+++ b/pkg/e2e/compose_build_test.go
@@ -181,3 +181,24 @@ func TestBuildSecrets(t *testing.T) {
 		res.Assert(t, icmd.Success)
 	})
 }
+
+func TestBuildTags(t *testing.T) {
+	c := NewParallelE2eCLI(t, binDir)
+
+	t.Run("build with tags", func(t *testing.T) {
+
+		// ensure local test run does not reuse previously build image
+		c.RunDockerOrExitError("rmi", "build-test-tags")
+
+		c.RunDockerComposeCmd("--project-directory", "./fixtures/build-test/tags", "build", "--no-cache")
+
+		res := c.RunDockerCmd("image", "inspect", "build-test-tags")
+		expectedOutput := `"RepoTags": [
+            "docker/build-test-tags:1.0.0",
+            "build-test-tags:latest",
+            "other-image-name:v1.0.0"
+        ],
+`
+		res.Assert(t, icmd.Expected{Out: expectedOutput})
+	})
+}
--- a/pkg/e2e/compose_test.go
+++ b/pkg/e2e/compose_test.go
@@ -95,7 +95,7 @@ func TestLocalComposeUp(t *testing.T) {

 		res := c.RunDockerComposeCmd("-p", projectName, "ps")
 		res.Assert(t, icmd.Expected{Out: `NAME                       COMMAND                  SERVICE             STATUS              PORTS`})
-		res.Assert(t, icmd.Expected{Out: `compose-e2e-demo-web-1     "/dispatcher"            web                 running (healthy)   0.0.0.0:90->80/tcp, :::90->80/tcp`})
+		res.Assert(t, icmd.Expected{Out: `compose-e2e-demo-web-1     "/dispatcher"            web                 running (healthy)   0.0.0.0:90->80/tcp`})
 		res.Assert(t, icmd.Expected{Out: `compose-e2e-demo-db-1      "docker-entrypoint.s…"   db                  running             5432/tcp`})
 	})

--- a/pkg/e2e/ddev_test.go
+++ b/pkg/e2e/ddev_test.go
@@ -0,0 +1,86 @@
+/*
+   Copyright 2020 Docker Compose CLI 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.
+*/
+
+package e2e
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+	"testing"
+
+	"gotest.tools/v3/assert"
+)
+
+const ddevVersion = "v1.19.1"
+
+func TestComposeRunDdev(t *testing.T) {
+	if !composeStandaloneMode {
+		t.Skip("Not running on standalone mode.")
+	}
+	if runtime.GOOS == "windows" {
+		t.Skip("Running on Windows. Skipping...")
+	}
+	_ = os.Setenv("DDEV_DEBUG", "true")
+
+	c := NewParallelE2eCLI(t, binDir)
+	dir, err := os.MkdirTemp("", t.Name()+"-")
+	assert.NilError(t, err)
+
+	// ddev needs to be able to find mkcert to figure out where certs are.
+	_ = os.Setenv("PATH", fmt.Sprintf("%s:%s", os.Getenv("PATH"), dir))
+
+	siteName := filepath.Base(dir)
+
+	t.Cleanup(func() {
+		_ = c.RunCmdInDir(dir, "./ddev", "delete", "-Oy")
+		_ = c.RunCmdInDir(dir, "./ddev", "poweroff")
+		_ = os.RemoveAll(dir)
+	})
+
+	osName := "linux"
+	if runtime.GOOS == "darwin" {
+		osName = "macos"
+	}
+
+	compressedFilename := fmt.Sprintf("ddev_%s-%s.%s.tar.gz", osName, runtime.GOARCH, ddevVersion)
+	c.RunCmdInDir(dir, "curl", "-LO",
+		fmt.Sprintf("https://github.com/drud/ddev/releases/download/%s/%s",
+			ddevVersion,
+			compressedFilename))
+
+	c.RunCmdInDir(dir, "tar", "-xzf", compressedFilename)
+
+	// Create a simple index.php we can test against.
+	c.RunCmdInDir(dir, "sh", "-c", "echo '<?php\nprint \"ddev is working\";' >index.php")
+
+	c.RunCmdInDir(dir, "./ddev", "config", "--auto")
+	c.RunCmdInDir(dir, "./ddev", "config", "global", "--use-docker-compose-from-path")
+	vRes := c.RunCmdInDir(dir, "./ddev", "version")
+	out := vRes.Stdout()
+	fmt.Printf("ddev version: %s\n", out)
+
+	c.RunCmdInDir(dir, "./ddev", "poweroff")
+
+	c.RunCmdInDir(dir, "./ddev", "start", "-y")
+
+	curlRes := c.RunCmdInDir(dir, "curl", "-sSL", fmt.Sprintf("http://%s.ddev.site", siteName))
+	out = curlRes.Stdout()
+	fmt.Println(out)
+	assert.Assert(c.test, strings.Contains(out, "ddev is working"), "Could not start project")
+}
--- a/pkg/e2e/fixtures/build-test/tags/Dockerfile
+++ b/pkg/e2e/fixtures/build-test/tags/Dockerfile
@@ -0,0 +1,17 @@
+#   Copyright 2020 Docker Compose CLI 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.
+
+FROM nginx:alpine
+
+RUN echo "SUCCESS"
--- a/pkg/e2e/fixtures/build-test/tags/compose.yaml
+++ b/pkg/e2e/fixtures/build-test/tags/compose.yaml
@@ -0,0 +1,9 @@
+services:
+  nginx:
+    image: build-test-tags
+    build:
+      context: .
+      tags:
+        - docker.io/docker/build-test-tags:1.0.0
+        - other-image-name:v1.0.0
+
--- a/pkg/e2e/framework.go
+++ b/pkg/e2e/framework.go
@@ -192,6 +192,17 @@ func (c *E2eCLI) RunCmd(args ...string) *icmd.Result {
 	return res
 }

+// RunCmdInDir runs a command in a given dir, expects no error and returns a result
+func (c *E2eCLI) RunCmdInDir(dir string, args ...string) *icmd.Result {
+	fmt.Printf("\t[%s] %s\n", c.test.Name(), strings.Join(args, " "))
+	assert.Assert(c.test, len(args) >= 1, "require at least one command in parameters")
+	cmd := c.NewCmd(args[0], args[1:]...)
+	cmd.Dir = dir
+	res := icmd.RunCmd(cmd)
+	res.Assert(c.test, icmd.Success)
+	return res
+}
+
 // RunDockerCmd runs a docker command, expects no error and returns a result
 func (c *E2eCLI) RunDockerCmd(args ...string) *icmd.Result {
 	if len(args) > 0 && args[0] == compose.PluginName {
--- a/pkg/progress/tty.go
+++ b/pkg/progress/tty.go
@@ -83,7 +83,10 @@ func (w *ttyWriter) Event(e Event) {
 		last.Status = e.Status
 		last.Text = e.Text
 		last.StatusText = e.StatusText
-		last.ParentID = e.ParentID
+		// allow set/unset of parent, but not swapping otherwise prompt is flickering
+		if last.ParentID == "" || e.ParentID == "" {
+			last.ParentID = e.ParentID
+		}
 		w.events[e.ID] = last
 	} else {
 		e.startTime = time.Now()
Author	SHA1	Message	Date
Guillaume Lours	6b2ca93981	change dowstream ref Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>	2022-05-25 14:28:23 +02:00
Guillaume Lours	963e2e8757	update PAT token name Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>	2022-05-25 14:21:17 +02:00
Guillaume Lours	342ddc5ee5	Trigger dispatch manually for test purpose Co-authored-by: CrazyMax <github@crazymax.dev>	2022-05-25 14:19:46 +02:00
Guillaume Lours	3b7f5ffc6b	add a workflow to trigger a PR creation on Docker Documentation repo Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>	2022-05-25 14:12:02 +02:00
Guillaume Lours	5b6b674da9	Merge pull request #9495 from maxcleme/chore/bump_compose_go bump compose-go to 1.2.6	2022-05-23 15:01:05 +02:00
Maxime CLEMENT	31d9490a0b	bump compose-go to 1.2.6 Signed-off-by: Maxime CLEMENT <maxime.clement@docker.com>	2022-05-23 14:51:09 +02:00
Guillaume Lours	6b71073ae2	Merge pull request #9453 from glours/go-18 update golang version to 1.18	2022-05-23 10:41:03 +02:00
Guillaume Lours	e806acce88	Merge pull request #9481 from glours/add-tags-to-build add tags property to build section	2022-05-23 10:23:40 +02:00
Guillaume Lours	71600a52bf	update golang version to 1.18 Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>	2022-05-20 22:13:55 +02:00
Guillaume Lours	285a9c94f7	Merge pull request #9476 from maxcleme/9469-fix-flickering-prompt fix: prevent flickering prompt when pulling same image from N services	2022-05-20 22:09:02 +02:00
Guillaume Lours	22194f6ef7	Merge pull request #9493 from ulyssessouza/fix-local-e2e-compose-standalone Fix local run of `make e2e-compose-standalone`	2022-05-20 21:41:42 +02:00
Ulysses Souza	e51fd0a844	Fix local run of `make e2e-compose-standalone` Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>	2022-05-20 21:31:16 +02:00
Ulysses Souza	b961d49859	Merge pull request #9033 from ulyssessouza/add-e2e-ddev Add ddev's e2e test	2022-05-20 20:02:58 +02:00
Guillaume Lours	9cae9eb0fe	Merge pull request #9488 from ndeloof/attach_profiles attach _only_ to services declared by project applying profiles	2022-05-20 14:38:08 +02:00
Nicolas De Loof	8d03e29994	attach _only_ to services declared by project applying profiles Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>	2022-05-20 10:36:06 +02:00
Guillaume Lours	7ee7becd01	fix TestLocalComposeUp which fail locally Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>	2022-05-20 07:36:34 +02:00
Randy Fay	97d46a14ef	Fix problems with ddev e2e test and minor cleanup, add tmate (#27 ) * Add tmate for debugging * Use -parallel=1 for standaone tests Signed-off-by: Randy Fay <randy@randyfay.com>	2022-05-19 14:14:03 +02:00
Ulysses Souza	a5a1c5f2f1	Add ddev's e2e test Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>	2022-05-19 14:14:03 +02:00
Guillaume Lours	a2770b66ff	add tags property to build section Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>	2022-05-18 14:43:54 +02:00
Maxime CLEMENT	48b150beff	fix: prevent flickering prompt when pulling same image from N services Signed-off-by: Maxime CLEMENT <maxime.clement@docker.com>	2022-05-18 08:58:06 +02:00