tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,949 Commits 25 Branches 264 Tags 67 MiB
Commit Graph

2949 Commits

Author SHA1 Message Date
Nicolas De Loof bf0b75cee0
report error on `ps` when no container found for service(s) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-07-12 10:42:31 +02:00
Mathieu Champlon 396d449d36
Merge pull request #1906 from mikesir87/fix-log-names 
Fix container name used in kube log output
 2021-07-09 08:08:50 +02:00
Mathieu Champlon a8fc2149b3
Merge pull request #1904 from ulyssessouza/bump-compose-go-volumes-lowcase 
Bump compose-go
 2021-07-09 08:01:53 +02:00
Michael Irwin 8c5b970376
Fix container name used in kube log output 
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
 2021-07-08 22:04:01 -04:00
Ulysses Souza f4947b68e5 Bump compose-go 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-07-08 18:37:25 -03:00
Ulysses Souza ed0b123b75
Merge pull request #1901 from mat007/fix-races 
Fix races
 2021-07-07 11:11:11 -03:00
Mathieu Champlon 2d0d3881ac Fix slice access 
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
 2021-07-07 12:57:13 +02:00
Mathieu Champlon 9317ffc0ab Serialize access to observed state 
This should fix concurrent accesses to the map.

Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
 2021-07-07 12:25:32 +02:00
Mathieu Champlon 918fe00f3e Fix loop variable captures in goroutines 
Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
 2021-07-07 12:25:22 +02:00
Mathieu Champlon 9d031553f3
Merge pull request #1897 from mikesir87/update-context-help-for-k8s 
Fix help text when for context create and kube backend
 2021-07-07 07:52:59 +02:00
Michael Irwin 08c2c44beb
Fix help text when for context create and kube backend 
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
 2021-07-06 15:46:00 -04:00
Lorena Rangel edcb23b11f Add dry run workflow to test release 
Signed-off-by: Lorena Rangel <lorena.rangel@docker.com>
 2021-07-05 10:07:37 +02:00
Mathieu Champlon 1da8be257b
Merge pull request #1884 from thaJeztah/dont_trim_version_prefix 
Do not strip "v" prefix from version when printing
 2021-07-03 16:15:53 +02:00
Sebastiaan van Stijn a0db32043e
Do not strip "v" prefix from version when printing 
I noticed this when building the binary; `internal.Version` is set to `v2.0.0-beta.4`,
to match the tag.

```bash
GIT_TAG=v2.0.0-beta.4
make COMPOSE_BINARY=bin/docker-compose -f builder.Makefile compose-plugin \
    GOOS=linux \
    GOARCH=amd64 \
    CGO_ENABLED=0 \
    go build \
        -trimpath \
        -ldflags="-s -w -X github.com/docker/compose-cli/internal.Version=v2.0.0-beta.4" \
        -o bin/docker-compose \
        ./cmd
```

However, the binary has the `v` prefix stripped (which caused a check to fail
when packaging):

```bash
/root/rpmbuild/BUILDROOT/docker-compose-plugin-2.0.0.beta.4-0.fc34.x86_64/usr/libexec/docker/cli-plugins/docker-compose docker-cli-plugin-metadata
++ awk '{ gsub(/[",:]/,"")}; $1 == "Version" { print $2 }'
+ ver=2.0.0-beta.4
+ test 2.0.0-beta.4 = v2.0.0-beta.4
FAIL: docker-compose version (2.0.0-beta.4) did not match
```

This also looks inconsistent with other binaries and plugins we ship:

```bash
docker info --format '{{json .ClientInfo.Plugins}}' | jq .
[
  {
    "SchemaVersion": "0.1.0",
    "Vendor": "Docker Inc.",
    "Version": "v0.5.1-docker",
    "ShortDescription": "Build with BuildKit",
    "Name": "buildx",
    "Path": "/usr/libexec/docker/cli-plugins/docker-buildx"
  },
  {
    "SchemaVersion": "0.1.0",
    "Vendor": "Docker Inc.",
    "Version": "2.0.0-beta.4",
    "ShortDescription": "Docker Compose",
    "Name": "compose",
    "Path": "/usr/libexec/docker/cli-plugins/docker-compose"
  },
  {
    "SchemaVersion": "0.1.0",
    "Vendor": "Docker Inc.",
    "Version": "v0.8.0",
    "ShortDescription": "Docker Scan",
    "Name": "scan",
    "Path": "/usr/libexec/docker/cli-plugins/docker-scan"
  }
]
```

Perhaps there was a specific reason for this, but thought I'd open this PR for
discussion (if the v-prefix should not be there, perhaps we should isntead strip
it when setting the version).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-07-03 15:53:21 +02:00
Mathieu Champlon 8d2ea5feb1
Merge pull request #1880 from ndeloof/stdin_eof 
close sdtin stream on EOF to propagate exec process' stdin
 2021-07-03 13:39:11 +02:00
Nicolas De Loof bee156fb97
close sdtin stream on EOF to propagate exec process' stdin 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-07-02 17:02:20 +02:00
Nicolas De Loof 41d5eb45b1
update compose-go 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-07-02 15:02:41 +02:00
Nicolas De Loof fc087a9e1d update compose-go 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-07-02 13:34:27 +02:00
Nicolas De loof 4049feb74d
Merge pull request #1878 from ndeloof/exec_streams 2021-07-02 11:05:06 +02:00
Nicolas De Loof 96e1e041d6
distinguish stdout and stderr 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-07-02 10:53:11 +02:00
Mathieu Champlon 5ea2b20341
Merge pull request #1877 from rfay/patch-2 
Issue template should ask for docker-compose version
 2021-07-02 07:58:54 +02:00
Randy Fay 1635451ac9 Issue template should ask for docker-compose version 
Signed-off-by: Randy Fay <randy@randyfay.com>
 2021-07-01 23:38:20 -06:00
Mathieu Champlon 04d9bc49ed
Merge pull request #1864 from ndeloof/main 
update compose-go
 2021-06-30 15:43:26 +02:00
Nicolas De Loof c280597b19
update compose-go 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-30 15:36:49 +02:00
Nicolas De loof 4bf7829d1b
Merge pull request #1860 from ndeloof/detach_keys 
add support for detach keys on compose run|exec
 2021-06-30 09:44:11 +02:00
Nicolas De loof 0d47defba7
Merge pull request #1859 from linux-on-ibm-z/s390x-support 
Adds s390x support
 2021-06-29 21:19:53 +02:00
Nicolas De loof 53eca14e87
Merge pull request #1847 from ndeloof/compose_e2e 
Move compose e2e tests into pkg
 2021-06-29 17:59:30 +02:00
Mathieu Champlon a756507bd2
Merge pull request #1855 from rfay/patch-1 
Minor readme.md issues (no more docker desktop stable/edge, etc.)
 2021-06-29 17:44:07 +02:00
Nicolas De Loof b6552cd935
add support for detach keys on compose run|exec 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-29 17:27:43 +02:00
Randy Fay d9fc75e9fa Update the docker desktop download URL 
Signed-off-by: Randy Fay <randy@randyfay.com>
 2021-06-29 07:44:42 -06:00
Randy Fay 1ba14202d5 Minor readme.md issues (no more docker desktop stable/edge, etc.) 
I noted that some statements in the README.md were outdated, minor updates.

You might want to do still more with the confusion about being v1 here but v2 in docker-compose

Signed-off-by: Randy Fay <randy@randyfay.com>
 2021-06-29 07:44:42 -06:00
vibhutisawant 9df5923079 Adds s390x support 
Signed-off-by: vibhutisawant <Vibhuti.Sawant@ibm.com>
 2021-06-29 12:37:10 +05:30
Nicolas De loof 32fccdda30
Merge pull request #1845 from manuelgrabowski/patch-1 2021-06-28 22:09:03 +02:00
Manu 90a879fa3f Fix references to docker-compose command 
Signed-off-by: Manuel Grabowski <git@manuelgrabowski.de>
 2021-06-28 16:45:44 +02:00
Nicolas De Loof fb73dd58d9 Move compose e2e tests into pkg 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-28 08:47:58 +02:00
Nicolas De loof d20c3b0e22
Merge pull request #1841 from ndeloof/convergence 2021-06-28 08:47:17 +02:00
Nicolas De loof f63ded4a0b
Merge pull request #1846 from ndeloof/rm_force 2021-06-25 15:27:11 +02:00
Nicolas De Loof b5827d4a86
pass --force and --volumes options to backend 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-25 13:46:34 +02:00
Nicolas De Loof c901edd65d
introduce `convergence` to hold per-service Containers and prevent race conditions 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-25 13:18:00 +02:00
Nicolas De Loof 0e67d3a35e don't create unecessary resources 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-24 10:11:41 +02:00
Nicolas De Loof d8d739307e test 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-24 10:11:01 +02:00
Nicolas De loof 9ca9aee4f8
Merge pull request #1839 from ndeloof/pending_label 
automation to remove pending label on new comment
 2021-06-24 10:05:34 +02:00
Nicolas De Loof 1fed4dd47f
pending label auto-removal on new comment 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-24 09:51:58 +02:00
Nicolas De loof 98a781f5cf
Merge pull request #1827 from ndeloof/ipam 2021-06-23 15:58:26 +02:00
Nicolas De loof 8d2019e77d
Merge pull request #1831 from ndeloof/inherit_volumes 
inherit anoymous volumes
 2021-06-23 15:35:18 +02:00
Nicolas De loof 99c39c8b3c
Merge pull request #1829 from ndeloof/ps_command 2021-06-23 08:28:47 +02:00
Nicolas De Loof 05b510a447
compose ps to include container command 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-22 16:09:47 +02:00
Nicolas De Loof 444fc26a51
inherit anoymous volumes 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-06-22 14:37:52 +02:00
Nicolas De loof 13b57023d7
Merge pull request #1823 from ndeloof/filter_status 
implement ps --status=xx filter
 2021-06-22 13:32:57 +02:00
Nicolas De loof 541cc0af7e
Merge pull request #1830 from ndeloof/verbose 
add --verbose option for compatibility
 2021-06-22 13:32:44 +02:00