tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,921 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

4921 Commits

Author SHA1 Message Date
Milas Bowman df6fe59f72 tweak help message on oci version flag 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-12-05 18:08:38 +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
Nicolas De Loof 8639fbae86 go mod tidy 
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
Nicolas De Loof ce1ddb6c7e fix combination of --pull always --no-build 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-12-04 11:08:08 +01:00
dependabot[bot] c5824702bf build(deps): bump golang.org/x/sys from 0.14.0 to 0.15.0 
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.14.0 to 0.15.0.
- [Commits](https://github.com/golang/sys/compare/v0.14.0...v0.15.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-30 09:42:39 +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
johnthagen 9faef4aebb Update README.md to use standard compose.yaml file name 
Signed-off-by: johnthagen <johnthagen@users.noreply.github.com>
 2023-11-30 08:53:44 +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 f9946127ce Fix docs 
Signed-off-by: Amit Saha <asaha@atlassian.com>
 2023-11-29 13:56:16 +01:00
Amit Saha ddda59a130 Add index option to compose logs command 
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 16c4241c0b log we don't expose service ports when --verbose 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-29 11:40:16 +01:00
Guillaume Lours f5e3ff03f0
Merge pull request #11225 from ndeloof/ddev-bump 
bump ddev to 1.22.4
 2023-11-27 14:29:36 +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 ba24a656bf
Merge pull request #11220 from ndeloof/ps_profile 
Introduce ps --orphans to include/exclude services not declared by project
 2023-11-23 13:52:20 +01:00
Nicolas De Loof caa0cbbc4b
Introduce ps --orphans so user can include/exclude services not declared by project 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-23 13:43:49 +01:00
Guillaume Lours 8c0c5cb671
Merge pull request #11219 from ndeloof/no_answer 
let contributor know we might close unanswered issues
 2023-11-23 11:28:04 +01:00
Nicolas De Loof 29e9fdba16
let contributor know we might close unanswered issues 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-11-23 11:06:31 +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
Guillaume Lours a1aceba655
Merge pull request #11215 from docker/dependabot/go_modules/github.com/compose-spec/compose-go-1.20.2 
build(deps): bump github.com/compose-spec/compose-go from 1.20.1 to 1.20.2
 2023-11-22 14:29:48 +01:00
dependabot[bot] a39cf75e86 build(deps): bump github.com/compose-spec/compose-go 
Bumps [github.com/compose-spec/compose-go](https://github.com/compose-spec/compose-go) from 1.20.1 to 1.20.2.
- [Release notes](https://github.com/compose-spec/compose-go/releases)
- [Commits](https://github.com/compose-spec/compose-go/compare/v1.20.1...v1.20.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-22 14:19:50 +01:00
Guillaume Lours 5b0dcc5a44
Merge pull request #11214 from docker/dependabot/go_modules/github.com/spf13/cobra-1.8.0 
build(deps): bump github.com/spf13/cobra from 1.7.0 to 1.8.0
 2023-11-22 14:19:27 +01:00
dependabot[bot] 46ba9c99ce
build(deps): bump github.com/spf13/cobra from 1.7.0 to 1.8.0 
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](https://github.com/spf13/cobra/compare/v1.7.0...v1.8.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-22 09:43:55 +00:00
Guillaume Lours 1148b6765a
Merge pull request #11142 from docker/dependabot/go_modules/github.com/docker/cli-24.0.7incompatible 
build(deps): bump github.com/docker/cli from 24.0.6+incompatible to 24.0.7+incompatible
 2023-11-22 10:15:33 +01:00
dependabot[bot] 5c5d30c674 build(deps): bump github.com/docker/cli 
Bumps [github.com/docker/cli](https://github.com/docker/cli) from 24.0.6+incompatible to 24.0.7+incompatible.
- [Commits](https://github.com/docker/cli/compare/v24.0.6...v24.0.7)

---
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-11-22 09:55:15 +01:00
Guillaume Lours 2068eceee4
Merge pull request #11143 from docker/dependabot/go_modules/github.com/docker/docker-24.0.7incompatible 
build(deps): bump github.com/docker/docker from 24.0.6+incompatible to 24.0.7+incompatible
 2023-11-22 09:54:14 +01:00
dependabot[bot] 36fa8d4e71 build(deps): bump github.com/docker/docker 
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 24.0.6+incompatible to 24.0.7+incompatible.
- [Release notes](https://github.com/docker/docker/releases)
- [Commits](https://github.com/docker/docker/compare/v24.0.6...v24.0.7)

---
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-11-22 09:43:45 +01:00
Guillaume Lours 69985b8b89
Merge pull request #11112 from docker/dependabot/go_modules/github.com/moby/buildkit-0.12.3 
build(deps): bump github.com/moby/buildkit from 0.12.2 to 0.12.3
 2023-11-22 09:43:06 +01:00
dependabot[bot] 2384635ee1 build(deps): bump github.com/moby/buildkit from 0.12.2 to 0.12.3 
Bumps [github.com/moby/buildkit](https://github.com/moby/buildkit) from 0.12.2 to 0.12.3.
- [Release notes](https://github.com/moby/buildkit/releases)
- [Commits](https://github.com/moby/buildkit/compare/v0.12.2...v0.12.3)

---
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-11-22 09:33:44 +01:00
Guillaume Lours 587dba1167
Merge pull request #11213 from glours/watch-force-build-at-startup 
in watch mode force pull policy to build for services with both build and develop attributes
 2023-11-22 09:32:15 +01:00
Guillaume Lours 2ba5e4c1d0
in watch mode force pull policy to build for services with both build and develop attributes 
This default behaviour will force a rebuild of the service images at watch process startup and be sure containers will be in sync with the local source code

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-11-21 16:42:43 +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
Guillaume Lours 0ab21a2080
Merge pull request #11211 from ndeloof/Services 
avoir use of []types.ServiceConfig
 2023-11-21 12:17:09 +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
Guillaume Lours a1b7bee094
Merge pull request #11206 from ndeloof/check_runtime 
introduce RuntimeVersion for code to check container runtime support
 2023-11-20 11:59:43 +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