1
0
mirror of https://github.com/docker/compose-cli.git synced 2026-10-23 18:09:06 +03:00

3001 Commits

Author SHA1 Message Date
Nick Sieger
6135c5edf1 Merge pull request #2151 from crazy-max/build-metrics-futureproof
build metrics compatibility for next 22.06
v1.0.29
2022-07-27 12:01:04 -05:00
Nick Sieger
4dc3e196a4 Merge pull request #2179 from nicksieger/fix-windows-missing-existing-cli
Fix Windows e2e-local test
2022-07-27 10:05:23 -05:00
CrazyMax
668b262605 build metrics compatibility for next 22.06
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-07-27 17:03:03 +02:00
Nick Sieger
a451eba005 e2e-local: use platform-dependent name for com.docker.cli
Signed-off-by: Nick Sieger <nick@nicksieger.com>
2022-07-27 09:48:25 -05:00
Nick Sieger
bf1fd67911 Merge pull request #2176 from thaJeztah/gofmt_119
gofmt files with go 1.19
2022-07-27 09:18:21 -05:00
Nick Sieger
7e355b8a77 Merge pull request #2178 from nicksieger/cli-binary-path-handling
cli binary path handling
2022-07-27 09:18:10 -05:00
Nick Sieger
4678a3e780 mobycli: add test for comDockerCli
Signed-off-by: Nick Sieger <nick@nicksieger.com>
2022-07-27 09:07:27 -05:00
Nick Sieger
22d68602ae mobycli: append .exe to com.docker.cli on windows
Signed-off-by: Nick Sieger <nick@nicksieger.com>
2022-07-27 09:00:11 -05:00
Nick Sieger
fc215287b5 mobycli: update approach for finding cli command to use
1. Use path from env variable `$DOCKER_COM_DOCKER_CLI`
2. Use path formed from parent directory of current process joined with
   `com.docker.cli`
3. Look for `com.docker.cli` on $PATH

Signed-off-by: Nick Sieger <nick@nicksieger.com>
2022-07-26 15:12:11 -05:00
Nick Sieger
d8b9310e03 Merge commit '48c999679165e8f0355f32092063ab4f0ceeee42' of https://github.com/crazy-max/compose-cli into cli-binary-path-handling
Signed-off-by: Nick Sieger <nick@nicksieger.com>
2022-07-26 14:54:13 -05:00
Guillaume Lours
77e61c2f92 Merge pull request #2177 from p1-0tr/ps-global-cli-sock-fallback
Fall back to global CLI socket on Linux
v1.0.28
2022-07-25 15:48:53 +02:00
Piotr Stankiewicz
cfa212f15d Fall back to global CLI socket on Linux
DD relies on having the CLI socket available in /var/run when running in
WSL. So in case we can't find the CLI socket in the calling user's home
directory, fall back to /var/run.

Signed-off-by: Piotr Stankiewicz <piotr.stankiewicz@docker.com>
2022-07-25 15:33:00 +02:00
Guillaume Lours
2d878f7f4b Merge pull request #2175 from glours/update-gotest-go-1.18
update gotest.tools to v3.3.0 which support golang 1.18
v1.0.27
2022-07-25 12:55:30 +02:00
Sebastiaan van Stijn
fb71f3bc8a gofmt files with go 1.19
Prepare for future updates of Go, which may result in some changes in
formatting in GoDoc comments.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-07-25 12:31:30 +02:00
Guillaume Lours
1a01d2f198 update gotest.tools to v3.3.0 which support golang 1.18
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2022-07-25 12:20:42 +02:00
Guillaume Lours
8839c52fea Merge pull request #2174 from crazy-max/go-1.18
Go 1.18
2022-07-25 10:27:33 +02:00
CrazyMax
5780bc5656 ci: use cache feature from actions/setup-go
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-07-24 00:49:09 +02:00
CrazyMax
1dce98712a Go 1.18
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-07-24 00:49:08 +02:00
Guillaume Lours
0978185f3c Merge pull request #2163 from docker/dependabot/go_modules/github.com/containerd/containerd-1.5.13
Bump github.com/containerd/containerd from 1.5.10 to 1.5.13
2022-07-22 22:43:21 +02:00
Guillaume Lours
471888f366 Merge pull request #2171 from p1-0tr/ps-docker-cli-sock-from-home
Use Docker CLI socket from home
v1.0.26
2022-07-22 17:23:33 +02:00
Piotr Stankiewicz
19ac0adf62 Switch to using addlicense for copyright header validation
Signed-off-by: Piotr Stankiewicz <piotr.stankiewicz@docker.com>
2022-07-22 11:31:25 +02:00
Piotr Stankiewicz
f922ff963d Use Docker CLI socket from the User's home directory
We should not rely on having a global path for the Docker CLI socket. On
macOS this forces Docker Desktop to access directories which require
raised privileges. Whereas on Linux we do not create sockets in that
location at all, currently. So look for the Docker CLI socket in the
User's home directory.

Signed-off-by: Piotr Stankiewicz <piotr.stankiewicz@docker.com>
2022-07-22 11:31:22 +02:00
dependabot[bot]
059ae18bf1 Bump github.com/containerd/containerd from 1.5.10 to 1.5.13
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.5.10 to 1.5.13.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.5.10...v1.5.13)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-06 22:13:28 +00:00
CrazyMax
48c9996791 Allow to override classic cli binary via env var
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-05-31 07:25:16 +02:00
Guillaume Lours
6f3f942e1f Merge pull request #2157 from nahuel-soldevilla/2152-fix-typo
Fix typo: change "cpu" to "cpus" in resources
v1.0.25
2022-05-30 15:25:57 +02:00
Nahuel Soldevilla
128dae0d82 Fix typo: change "cpu" to "cpus" in resources
Signed-off-by: Nahuel Soldevilla <nahuel@leafnode.io>
2022-05-27 11:50:17 -03:00
Guillaume Lours
415b41042a Merge pull request #2149 from crazy-max/fix-buildx
metrics: fix unexpected usage output shown on cli
2022-05-23 10:46:09 +02:00
CrazyMax
8092874d41 metrics: fix unexpected usage output shown on cli
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-05-15 03:50:45 +02:00
Guillaume Tardif
84ba23e928 Merge pull request #2143 from gtardif/extension_cli_metrics
Add extension commands in command metrics
v1.0.24
2022-04-14 16:54:22 +02:00
Guillaume Tardif
f96ef1970c Add extension commands in command metrics
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2022-04-13 23:01:33 +02:00
Guillaume Lours
2001d0c4ed Merge pull request #2139 from wagoodman/add-sbom-command-for-metrics
Add SBOM management command
v1.0.23
2022-03-28 16:47:05 +02:00
Alex Goodman
29cbfa0485 add SBOM management command to metrics
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
2022-03-23 10:45:42 -04:00
Mathieu Champlon
660c181e1e Merge pull request #2137 from docker/dependabot/go_modules/github.com/containerd/containerd-1.5.10
Bump github.com/containerd/containerd from 1.5.9 to 1.5.10
2022-03-03 15:17:03 +01:00
dependabot[bot]
fc129e4540 Bump github.com/containerd/containerd from 1.5.9 to 1.5.10
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.5.9 to 1.5.10.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.5.9...v1.5.10)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-03 13:35:50 +00:00
Ulysses Souza
75863f22ab Merge pull request #2130 from ulyssessouza/fix-ecs-logs
Fix default behaviour for ecs flag `--tail` in log command
2022-03-01 20:10:28 +01:00
Mathieu Champlon
b440b87821 Merge pull request #2133 from docker/dependabot/maven/aci/e2e/aci-demo/words/org.postgresql-postgresql-42.3.3
Bump postgresql from 42.1.4 to 42.3.3 in /aci/e2e/aci-demo/words
2022-03-01 15:48:56 +01:00
dependabot[bot]
cc6af30acc Bump postgresql from 42.1.4 to 42.3.3 in /aci/e2e/aci-demo/words
Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.1.4 to 42.3.3.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.1.4...REL42.3.3)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-16 01:15:06 +00:00
Ulysses Souza
22b63fa612 Fix default behaviour for ecs flag log
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2022-02-03 14:03:58 +01:00
Mathieu Champlon
5f956ded9a Merge pull request #2127 from rumpl/fix-remove-context-call
Remove the call to com.docker.cli to get the default context
2022-01-26 06:44:30 +01:00
Djordje Lukic
bdc9d81a7a Remove the call to com.docker.cli to get the default context
This is no longer needed since the `docker compose` command was moved to a cli plugin
for moby contexts

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2022-01-25 23:36:59 +01:00
Mathieu Champlon
b46ffa7442 Merge pull request #2124 from docker/dependabot/go_modules/github.com/containerd/containerd-1.5.9
Bump github.com/containerd/containerd from 1.5.8 to 1.5.9
2022-01-06 21:15:56 +01:00
dependabot[bot]
772e4e6a36 Bump github.com/containerd/containerd from 1.5.8 to 1.5.9
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.5.8 to 1.5.9.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.5.8...v1.5.9)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-06 17:54:19 +00:00
Mathieu Champlon
eda269b742 Merge pull request #2117 from lucassscaravelli/fix/panic-ec2-sourceless-volumes
fix: panic with ec2 source less volumes
2021-11-29 09:43:15 +01:00
Lucas Scaravelli
0c3e6dee2b fix: panic with ec2 sourceless volumes
Signed-off-by: Lucas Scaravelli <lucas.scaravelli@gamersclub.com.br>
2021-11-28 10:49:42 -03:00
Mathieu Champlon
cf3c840d09 Merge pull request #2114 from mat007/bump-compose
Bump compose to v2.2.0 and compose-go to v1.0.5
v1.0.22
2021-11-24 18:34:16 +01:00
Mathieu Champlon
03a84495e7 Bump compose to v2.2.0 and compose-go to v1.0.5
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
2021-11-24 07:11:22 +01:00
Mathieu Champlon
cde09e23ed Merge pull request #2104 from crazy-max/build-metrics
Build metrics
2021-11-23 13:50:46 +01:00
CrazyMax
535fb93280 add build metrics
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-11-22 19:36:19 +01:00
Mathieu Champlon
e51e2c723b Merge pull request #2111 from WoodellJ/docker-label-support-ecs
[ECS] Add support for passing in docker labels.
2021-11-21 08:33:58 +01:00
Jonathan Woodell
1128ab8e9a Add support for passing in docker labels.
This add to `services.labels` to the compatibility file and maps the labels to the ECS provided DockerLabels.

Signed-off-by: Jonathan Woodell <jwoodell@snapattack.com>
2021-11-19 06:37:05 -06:00