tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,537 Commits 25 Branches 262 Tags 66 MiB
Commit Graph

813 Commits

Author SHA1 Message Date
Laura Brehm 7781b7c992
deps: update docker/cli to fix go version selection issue 
see: 70216b662d

Signed-off-by: Laura Brehm <laurabrehm@hey.com>
 2023-12-19 14:15:16 +00:00
Albin Kerouanton 785835b1a2 Add support for endpoint-specific MAC address 
Related to:

- https://github.com/compose-spec/compose-spec/pull/435
- https://github.com/moby/moby/pull/45905

Since API v1.44, Moby supports a per-endpoint MAC address and returns a
warning when the container-wide mac_address field is set.

A corresponding field has been added to compose-spec and compose-go, so
we need to leverage it to set the right API field.

This commit is backward-compatible with compose files that still set the
container-wide mac_address field, and older API versions that don't know
about the endpoint-specific MAC address field.

Signed-off-by: Albin Kerouanton <albinker@gmail.com>
 2023-12-18 12:04:45 +01:00
Nicolas De Loof 74cc091225 github.com/golang/mock is deprecated 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-13 14:47:39 +01:00
Nicolas De Loof 5e61c62ecf collect services to build using WithServices 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-07 17:05:42 +01:00
Nicolas De Loof fb3868ffaf add support for start_interval 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-07 15:59:22 +01:00
Nicolas De Loof 26aca867d8 avoid use of service.Name when iterating on project.Services 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-05 18:54:31 +01:00
Nicolas De Loof 138facea62 project.Services is a map 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-05 18:54:31 +01:00
Nicolas De Loof cda04f288e adopt compose-go/v2 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-05 18:54:31 +01:00
Milas Bowman 07df9cc46e fix typo 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-12-05 18:08:38 +01:00
Milas Bowman 7c8ff36d78 move around OCI logic, auto fallback/retry 1.1 -> 1.0 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-12-05 18:08:38 +01:00
Milas Bowman 111ad3b039 fix(publish): add OCI 1.0 fallback support for AWS ECR 
Currently, we publish Compose artifacts following the OCI 1.1
specification, which is still in the RC state.

As a result, not all registries support it yet. Most notably,
AWS ECR will reject certain OCI 1.1-compliant requests with
`405 Method Not Supported` with cryptic `Invalid JSON` errors.

This adds initial support for Compose to generate either an
OCI 1.0 or OCI 1.1 compatible manifest. Notably, the OCI 1.0
manifest will be missing the `application/vnd.docker.compose.project`
artifact type, as that does not exist in that version of the
spec. (Less importantly, it uses an empty `ImageConfig`
instead of the newer `application/vnd.oci.empty.v1+json` media
type for the config.)

Currently, this is not exposed as an option (via CLI flags or
env vars). By default, OCI 1.1 is used unless the registry
domain is `amazonaws.com`, which indicates an ECR registry, so
Compose will instead use OCI 1.0.

Moving forward, we should decide how much we want to expose/
support different OCI versions and investigate if there's a
more generic way to feature probe the registry to avoid
maintaining a hardcoded list of domains, which is both tedious
and insufficient.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-12-05 18:08:38 +01:00
Nicolas De Loof 8026d0e2f2 adopt container.RestartPolicy* 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-05 17:02:37 +01:00
Nicolas De Loof df1533a1ca [lint] don't use deprecated types 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-05 17:02:37 +01:00
Wes Higbee 56e2ad9ee5 update to v1.25 for RunAttach 
Signed-off-by: Wes Higbee <wes.mcclure@gmail.com>
 2023-12-05 17:02:37 +01:00
vyneer 1f148244af send out a cancel event on SIGINT/SIGTERM 
Signed-off-by: vyneer <vyn33r@gmail.com>
 2023-11-30 09:11:55 +01:00
Nicolas De Loof 59f11ecbeb Fix configs are mounted under /<id> 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-29 16:53:22 +01:00
Amit Saha 750553c866 introduce compose logs --index to select a replica container 
Signed-off-by: Amit Saha <asaha@atlassian.com>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-29 13:56:16 +01:00
Amit Saha 8c964f5ad3 Update E2E test 
Signed-off-by: Amit Saha <asaha@atlassian.com>
 2023-11-29 13:56:16 +01:00
Amit Saha 90ca13b747 Fix E2E test to have index in the correct position 
Signed-off-by: Amit Saha <asaha@atlassian.com>
 2023-11-29 13:56:16 +01:00
Amit Saha e981c35863 Add failing test 
Signed-off-by: Amit Saha <asaha@atlassian.com>
 2023-11-29 13:56:16 +01:00
Nicolas De Loof 9025d63a63
bump ddev 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-27 14:19:53 +01:00
Nicolas De Loof a1de0b96c3 Restore `Project` is ps json output 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-24 10:46:33 +01:00
Guillaume Lours c665c53cc1 bump buildx to v0.12.0 and adapt code to changes 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-11-23 07:36:13 +01:00
Nicolas De Loof b1a26dac1d Assume /src/pkg/compose/testdata absolute workingdir to make tests reproducible 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-21 16:11:42 +01:00
Nicolas De Loof 5e77ae9247
avoir use of []types.ServiceConfig 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-21 12:08:12 +01:00
Guillaume Lours f557220140 identify services to build and don't display 'building' if none 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-11-21 11:35:11 +01:00
Nicolas De Loof 8e1b32365e fix --remove-orphans not to consider disabled services as orphaned 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-20 21:35:13 +01:00
Nicolas De Loof 7cb1f8baf2
introduce RuntimeVersion for code to check container runtime supports required features 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-20 11:45:16 +01:00
Nicolas De Loof cb01186c2b push also consider build.tags 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-17 16:31:52 +01:00
Ulysses Souza efea084df6
Merge pull request #11192 from ulyssessouza/exclude-tests-context 2023-11-16 12:25:13 +01:00
Nicolas De Loof 9c4efbdd92 Strip project prefix from docker-compose up output 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-15 21:39:16 +01:00
Ulysses Souza 8ea7c9e0d2 Make it context aware and add test skipping options 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2023-11-15 21:09:50 +01:00
Nicolas De Loof cf608fa954 bump compose-go to v1.20.1 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-13 22:07:02 +01:00
Nicolas De Loof 426377a4c9 reject compose file using `secrets|configs.driver or template_driver` 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-13 17:26:00 +01:00
Ulysses Souza 493f6c8055 skips flaky e2e tests on watch and attach 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2023-11-10 18:31:25 +01:00
Guillaume Lours e5cd265abb improve watch configuration logging 
Add action associated to each managed path

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-11-06 13:48:15 +01:00
Nicolas De Loof d646d757a2 lint 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-02 11:16:35 +01:00
Nicolas De Loof 71237ef62b do not resolve cache dir until remote resource is in use 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-02 11:16:35 +01:00
Nicolas De Loof 0d905a896d add a copyright notice with original author 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-02 11:16:35 +01:00
Nicolas De Loof 5e3d8f671d re-implement cache folder detection 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-02 11:16:35 +01:00
Nicolas De Loof 6727908803 introduce --resolve-image-digests for publish to seal service images by digest 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-02 10:43:45 +01:00
kimdcottrell 616bba0afd linter errors fixed 
Signed-off-by: kimdcottrell <me@kimdcottrell.com>
 2023-10-29 22:08:00 +01:00
kimdcottrell ee6e3c2a44 NetworkList to NetworkInspect for ID search 
Signed-off-by: kimdcottrell <me@kimdcottrell.com>
 2023-10-29 22:08:00 +01:00
kimdcottrell c7e31a3c15 Squashing feature branch commits in order to add signoff message. 
- added clarity with error handling. added test to show issue.

- in manual testing, this fixes the issue and allows watch to run after rebuild

- added cleanup back in

- fixed issue where watch extnet rebuild test would start all containers listed in the fixture

Signed-off-by: kimdcottrell <me@kimdcottrell.com>
 2023-10-29 22:08:00 +01:00
Nicolas De Loof dd0803dba1 fix SIGTERM support to stop/kill stack 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-10-26 12:19:50 +02:00
Nicolas De Loof 39008c539c align with OCI artifact best practices 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-10-23 20:26:13 +02:00
Eng Zer Jun 6c345b3755
refactor(cmd/compose/run): remove redundant `len` check 
From the Go specification [1]:

  "1. For a nil slice, the number of iterations is 0."

`len` returns 0 if the slice is nil [2]. Therefore, checking
`len(v) > 0` before a loop is unnecessary.

[1]: https://go.dev/ref/spec#For_range
[2]: https://pkg.go.dev/builtin#len

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
 2023-10-23 16:06:52 +08:00
Guillaume Lours b8773ad1c5
Merge pull request #11110 from ndeloof/wait_missing 
fail start if depependency is missing
 2023-10-19 10:04:32 +02:00
Nicolas De Loof 1ffa194e12
fail start if depependency is missing 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-10-19 09:50:37 +02:00
Guillaume Lours 5e1d3f2b41
Merge pull request #11051 from ndeloof/warn_remote_disabled 
warn user remote resource is disabled
 2023-10-18 12:54:40 +02:00