tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 13:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,076 Commits 21 Branches 280 Tags
Commit Graph

4076 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
1892be8c70
Don't use "info.IndexServerAddress" for authentication 
The IndexServerAddress field was  as part of the initial Windows implementation
of the engine. For legal reasons, Microsoft Windows (and thus Docker images
based on Windows) were not allowed to be distributed through non-Microsoft
infrastructure. As a temporary solution, a dedicated "registry-win-tp3.docker.io"
registry was created to serve Windows images.

Using separate registries was not an ideal solution, and a more permanent
solution was created by introducing "foreign image layers" in the distribution
spec, after which the "registry-win-tp3.docker.io" ceased to exist, and
removed from the engine.

This replaces the code that calls out to the "/info" endpoint to use the
GetAuthConfigKey() function instead.

Related PR in docker/cli:
b4ca1c7368

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2023-04-11 23:10:22 +02:00
Guillaume Lours
a4af5e229d
Merge pull request #10455 from docker/dependabot/go_modules/github.com/opencontainers/runc-1.1.5 
build(deps): bump github.com/opencontainers/runc from 1.1.3 to 1.1.5
 2023-04-10 20:59:28 +02:00
dependabot[bot]
87da6c1470
build(deps): bump github.com/opencontainers/runc from 1.1.3 to 1.1.5 
Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.1.3 to 1.1.5.
- [Release notes](https://github.com/opencontainers/runc/releases)
- [Changelog](https://github.com/opencontainers/runc/blob/main/CHANGELOG.md)
- [Commits](https://github.com/opencontainers/runc/compare/v1.1.3...v1.1.5)

---
updated-dependencies:
- dependency-name: github.com/opencontainers/runc
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-10 18:47:06 +00:00
Guillaume Lours
a99acd940a
Merge pull request #10444 from glours/dry-run-down-support 
add dry-run support to down command
 2023-04-07 15:46:39 +02:00
Guillaume Lours
7fb87856aa add dry-run support to down command 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-04-07 10:41:51 +02:00
Guillaume Lours
eb933adde0
Merge pull request #10451 from glours/fix-gocyclo-ci-issue 
fix gocyclo lint error which currently block Compose CI
 2023-04-07 10:41:36 +02:00
Guillaume Lours
cb688b5fd4
fix gocyclo lint error which currently block Compose CI 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-04-07 10:19:06 +02:00
Nicolas De Loof
8b5b78fbb6 can't watch a service without a build section 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-04-06 08:55:49 +02:00
Nicolas De Loof
d3e49fe360 ansi=auto|never|always 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-04-06 08:24:04 +02:00
Guillaume Lours
1bca8d5c01
Merge pull request #10438 from glours/bump-docker-23.0.3 
bump docker version to 23.0.3 (CVE-2023-28840)
 2023-04-05 12:17:47 +02:00
Guillaume Lours
76d9cf2711
bump docker version to 23.0.3 (CVE-2023-28840) 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-04-05 12:02:57 +02:00
Nicolas De loof
d762f5f473
better support NO_COLOR by disabling colors, not ANSI TUI (#10434) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-04-04 17:00:10 -04:00
Guillaume Lours
90eda35f3d
Merge pull request #10437 from milas/bump-go-1.20.3 
ci: bump Go to 1.20.3 and various dependencies
 2023-04-04 21:33:20 +02:00
Milas Bowman
7ce0096f40 ci: bump Go to 1.20.3 and various dependencies 
Use latest Go minor release. Note: this release included fixes for
several CVEs, but they do not impact Compose.

Small errors have been fixed to keep the linter happy.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-04-04 15:15:02 -04:00
Milas Bowman
00eca0af70
Merge pull request #10432 from ndeloof/timeout 
restore `--timeout` flag renamed by mistake
 2023-04-04 15:03:04 -04:00
Nicolas De Loof
a10c4c6df5
restore --timeout flag renamed by mistake 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-04-04 08:48:00 +02:00
Guillaume Lours
6a37428491
Merge pull request #10413 from glours/dry-run-create-support 
add dry-run support to create command
 2023-04-03 18:25:55 +02:00
Guillaume Lours
449a46a252
Merge pull request #10423 from ndeloof/build_classic_panic 
prevent panic using classic builder
 2023-03-31 12:36:27 +02:00
Nicolas De Loof
981cb2024e
prevent panic using classic builder 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-31 11:59:22 +02:00
Guillaume Lours
b83edbd039 add dry-run support to create command 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-03-30 10:25:56 +02:00
Milas Bowman
02ad467f89
Merge pull request #10415 from docker/dependabot/go_modules/github.com/docker/cli-23.0.2incompatible 
build(deps): bump github.com/docker/cli from 23.0.1+incompatible to 23.0.2+incompatible
 2023-03-29 09:28:45 -04:00
Milas Bowman
d9e1d419c1
Merge pull request #10414 from docker/dependabot/go_modules/github.com/docker/docker-23.0.2incompatible 
build(deps): bump github.com/docker/docker from 23.0.1+incompatible to 23.0.2+incompatible
 2023-03-29 09:28:20 -04:00
dependabot[bot]
a4c324b8e6
build(deps): bump github.com/docker/cli 
Bumps [github.com/docker/cli](https://github.com/docker/cli) from 23.0.1+incompatible to 23.0.2+incompatible.
- [Release notes](https://github.com/docker/cli/releases)
- [Commits](https://github.com/docker/cli/compare/v23.0.1...v23.0.2)

---
updated-dependencies:
- dependency-name: github.com/docker/cli
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-29 09:59:37 +00:00
dependabot[bot]
087fae98b6
build(deps): bump github.com/docker/docker 
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 23.0.1+incompatible to 23.0.2+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](https://github.com/docker/docker/compare/v23.0.1...v23.0.2)

---
updated-dependencies:
- dependency-name: github.com/docker/docker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-29 09:59:27 +00:00
Milas Bowman
aafeaa66e2
Merge pull request #10409 from ndeloof/ContainerList_race 
workaround race condition in ContainerList
 2023-03-28 14:53:53 -04:00
Nicolas De Loof
c5317496ac
workaround race condition in ContainerList 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-28 12:28:41 +02:00
Milas Bowman
67c9ecb4f4
Merge pull request #10404 from glours/dry-run-run-support 
add dry-run support to run command
 2023-03-27 17:42:28 -04:00
Guillaume Lours
72a61c0602 add dry-run support to run command 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-03-27 18:57:11 +02:00
Guillaume Lours
0b6133f75b
Merge pull request #10406 from milas/fix-name-validation 
ci: bump compose-go to v1.13.2
v2.17.2 		2023-03-26 16:09:47 +02:00
Milas Bowman
b24af42bcc ci: bump compose-go to v1.13.2 
https://github.com/compose-spec/compose-go/releases/tag/v1.13.2

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-03-26 09:55:53 -04:00
Milas Bowman
cc70851bc8
Merge pull request #10403 from milas/fix-e2e-win 
test: fix e2e commands on Windows
v2.17.1 		2023-03-24 12:13:42 -04:00
Milas Bowman
3b85cd2fa9 test: fix e2e commands on Windows 
Instead of trying to make this work nicely cross-platform,
just push the Coverage logic into the GitHub Actions job,
as that's really where we care about it.

(It's surprisingly difficult to make this nicely portable;
to make PowerShell not error out if the path does not exist
you have to ignore ALL errors and the way that env vars are
passed to processes is not the same.)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-03-24 11:50:05 -04:00
Milas Bowman
d818bf6f34
Merge pull request #10401 from milas/deps-update 
ci: upgrade to Go 1.20.2 & bump deps
 2023-03-24 11:05:53 -04:00
Milas Bowman
45a852f438 test: generate valid Compose project names from Cucumber specs 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-03-24 10:54:33 -04:00
Milas Bowman
f0bf4fca76
Merge pull request #10402 from milas/fix-e2e-race 
test: fix race in e2e build test
 2023-03-24 10:44:54 -04:00
Milas Bowman
cd17c8a950 test: update error message 
Validation got improved in `compose-go` so the error message is
slightly different.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-03-24 10:42:43 -04:00
Milas Bowman
36625ed229 test: fix race in e2e build test 
This was running two tests in parallel that would build/delete the
same images. Run in serial instead since that's not safe.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-03-24 10:32:55 -04:00
Milas Bowman
a6ffdf6110 ci: upgrade to Go 1.20.2 & bump deps 
* Go 1.20.2
* golangci-lint v1.52.0
* compose-go v1.13.1: https://github.com/compose-spec/compose-go/releases/tag/v1.13.1

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-03-24 09:31:28 -04:00
Milas Bowman
72260d615d
Merge pull request #10400 from docker/dependabot/go_modules/github.com/moby/buildkit-0.11.5 
build(deps): bump github.com/moby/buildkit from 0.11.4 to 0.11.5
 2023-03-24 09:12:51 -04:00
Milas Bowman
fd28ab8d38
Merge pull request #10399 from ndeloof/watch_rebuild 
watch involves up --build after change has been detected
 2023-03-24 09:10:56 -04:00
dependabot[bot]
9ab5d8c44e
build(deps): bump github.com/moby/buildkit from 0.11.4 to 0.11.5 
Bumps [github.com/moby/buildkit](https://github.com/moby/buildkit) from 0.11.4 to 0.11.5.
- [Release notes](https://github.com/moby/buildkit/releases)
- [Commits](https://github.com/moby/buildkit/compare/v0.11.4...v0.11.5)

---
updated-dependencies:
- dependency-name: github.com/moby/buildkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-24 10:00:03 +00:00
Nicolas De Loof
d637cc3ade watch involves up --build after change has been detected 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-24 10:49:27 +01:00
Milas Bowman
925bc6fbf3
Merge pull request #10393 from milas/fix-watch-segfault 
watch: data race / segfault fixes
 2023-03-23 17:07:49 -04:00
Milas Bowman
16d5354d70 watch: add note about goroutine-safety & test 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-03-23 11:33:03 -04:00
Milas Bowman
7aaea283ca watch: data race / segfault fixes 
Was getting segfaults with multiple services using
`x-develop` and `watch` at the same time. Turns out
the Moby path matcher lazily initializes the regex
pattern internally the first time it's used, so it's
not goroutine-safe.

Change here is to not use a global instance for the
ephemeral path matcher, but a per-watcher instance.

Additionally, the data race detector caught a couple
other issues that were easy enough to fix:
 * Use the lock that's used elsewhere for convergence
   before manipulating
 * Eliminate concurrent map access when triggering
   rebuilds

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-03-22 18:05:56 -04:00
Guillaume Lours
6bedc196cc update -p project name flag documentation 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
v2.17.0 		2023-03-22 10:53:54 +01:00
Nicolas De Loof
a11515e038 introduce ignore attribute for watch triggers 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-21 18:29:49 +01:00
Nicolas De Loof
6c1f06e420 Run classic builder with BuildConfig, not buildx.Options 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-21 15:37:55 +01:00
Nicolas De Loof
88b0d17ff8 use build as common API for build scenarios 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-21 15:37:55 +01:00
Nicolas De Loof
9e19bc8441 use progress to show copy status 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-21 14:40:52 +01:00