Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: docker/compose
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.15.0
Choose a base ref
...
head repository: docker/compose
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.15.1
Choose a head ref
  • 7 commits
  • 9 files changed
  • 4 contributors

Commits on Jan 6, 2023

  1. add support for uts namespace 

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
    @ndeloof
    ndeloof committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    96bbda9 View commit details
    Browse the repository at this point in the history

  2. fix CVE-2022-27664 and CVE-2022-32149 high-risk vulnerability 

    Signed-off-by: fsl <1171313930@qq.com>
    @fengshunli @ndeloof
    fengshunli authored and ndeloof committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    a226d01 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. use a simpler prompt implementation when we lack a terminal 

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
    @ndeloof
    ndeloof committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    f1313f3 View commit details
    Browse the repository at this point in the history

  2. don't filter by services if no filter was set 

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
    @ndeloof
    ndeloof committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    b326a9d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #10145 from ndeloof/ps_filter 

    don't filter by services if no filter was set
    @glours
    glours authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    fbbc0de View commit details
    Browse the repository at this point in the history

  4. Don't share the options map 

    Without this I get an exception when building multiple images in a
compose run.

```
fatal error: concurrent map writes

goroutine 16 [running]:
github.com/docker/compose/v2/pkg/compose.(*composeService).build.func1({0x2cba4e0, 0xc00019b2c0}, {0xc000233150?, 0xd?})
        github.com/docker/compose/v2/pkg/compose/build.go:95 +0x652
github.com/docker/compose/v2/pkg/compose.(*graphTraversal).run.func1()
        github.com/docker/compose/v2/pkg/compose/dependencies.go:127 +0x63
golang.org/x/sync/errgroup.(*Group).Go.func1()
        golang.org/x/sync@v0.1.0/errgroup/errgroup.go:75 +0x64
created by golang.org/x/sync/errgroup.(*Group).Go
        golang.org/x/sync@v0.1.0/errgroup/errgroup.go:72 +0xa5
...
```

I'm not sure why the map is currently shared, but with this patch
applied my docker-compose build run works.

Signed-off-by: Edward Muller <emuller@fastly.com>
    @freeformz @glours
    freeformz authored and glours committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    73ebbff View commit details
    Browse the repository at this point in the history

  5. Merge pull request #10151 from freeformz/ffz/NoShareMap 

    Don't share the options map
    @glours
    glours authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    00c60da View commit details
    Browse the repository at this point in the history
Loading