tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
345 Commits 23 Branches 268 Tags
Commit Graph

121 Commits

Author SHA1 Message Date
Djordje Lukic
e84b508e80
Merge pull request #171 from docker/windows_kill_child_processes 
Windows : kill child processes
 2020-06-05 00:42:21 -07:00
guillaume.tardif
995d047608 Windows specific : ensure all child processes are killed when parent exits (also works when killing parent). From Desktop code 2020-06-04 17:58:24 +02:00
Guillaume Tardif
b91eab0544
Merge pull request #170 from docker/context_create_check 
Do not allow context creation for unknown types
 2020-06-04 16:51:11 +02:00
Guillaume Tardif
4a4b62ded2 Do not allow context creation for unknown types 2020-06-04 16:44:08 +02:00
Guillaume Tardif
427527d197
Merge pull request #146 from docker/chore-refactor-azure-login 
Refactor Azure login local server
 2020-06-04 10:39:30 +02:00
Christopher Crone
e5335adedd Azure: Refactor login errors 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-06-04 10:20:39 +02:00
Christopher Crone
35789ace12 Azure: Refactor creation of login server 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-06-03 17:10:54 +02:00
Guillaume Tardif
5675763856 Interactive context create, adding method CreateContextData to CloudService interface, so Cloud Backends can provide a custom context creation method. 2020-06-02 16:04:08 +02:00
Guillaume Tardif
e2b9f5bc57 Move login to root command, delegate to classic login when only one arg and not dot in it 2020-06-01 22:55:46 +02:00
Guillaume Tardif
f1fb80ecc5
Merge pull request #161 from docker/context_inspect 
Add docker context inspect command relying on classic docker
 2020-05-29 15:51:10 +02:00
Guillaume Tardif
528d47ce08 Add docker context inspect command relying on classic docker 2020-05-29 12:02:14 +02:00
Guillaume Tardif
01aaec2dbe Fix Azure login : allow getting a backend when no corresponding context already exists with an explicit call from the login command. Will be usefull next for context creation with azure interactive things 2020-05-29 11:35:35 +02:00
Guillaume Tardif
ea98a2dd78 Fix docker-classic creation makefile target 2020-05-27 21:14:07 +02:00
Guillaume Tardif
cc46f84043 Forward closing signal to docker-classic when closing docker. Note this will not forward Kill signal, impossible to intercept / process this one. 2020-05-27 18:38:51 +02:00
Guillaume Tardif
e630ace677
Merge pull request #154 from docker/fix_context_inspect_shellout 
Fix shell out to docker-classic when invoking
 2020-05-27 17:02:01 +02:00
Guillaume Tardif
d2648da2d9 Fix shell out to docker-classic when invoking 2020-05-27 16:12:40 +02:00
Guillaume Tardif
66a83410dd Ensure we have a clear error message in case of wrong setup (previously it would just exit with no error message) 2020-05-26 23:46:02 +02:00
Djordje Lukic
cb14c05e74 Move the context server into own package 
It had notthing to do in the cli package
 2020-05-26 10:31:14 +02:00
Djordje Lukic
b8658b3f54 Rename cli protos to contexts 2020-05-26 10:20:13 +02:00
Djordje Lukic
129e675932 Put all protos inside the protos package 2020-05-25 15:04:28 +02:00
Djordje Lukic
11339761ca Change the way a context is stored 
Initially we stored the context data in the `Metadata` of the context
but in hindsight this data would be better of in the `Endpoints` because
that's what it is used for.

Before:
```json
{
  "Name": "aci",
  "Metadata": {
    "Type": "aci",
    "Data": {
      "key": "value"
    }
  },
  "Endpoints": {
      "docker": {}
  }
}
```

After:
```json
{
  "Name": "aci",
  "Type": "aci",
  "Metadata": {},
  "Endpoints": {
      "aci": {
          "key": "value"
      },
      "docker": {}
  }
}
```

With this change the contexts that we create are more in line with the contexts the docker cli creates.

It also makes the code less complicated since we don't need to marsal twice any more. The API is nicer too:

```go
// Get a context:
c, err := store.Get(contextName)

// Get the stored endpoint:
var aciContext store.AciContext
if err := contextStore.GetEndpoint(currentContext, &aciContext); err != nil {
	return nil, err
}
```
 2020-05-22 16:32:43 +02:00
Djordje Lukic
de33f183df
Merge pull request #139 from rumpl/feat-log-stream 
Implement gRPC logging
 2020-05-22 06:23:47 -07:00
Chris Crone
0917acfb01
Merge pull request #142 from chris-crone/fix-141 
Set random container name if not set
 2020-05-22 11:31:16 +02:00
Christopher Crone
88ba591fc3 Seed random with nanosecond time 
It's possible that users will run commands more than once a second.
Thus, seeding the random number generator with the current time in
seconds could produce results like the same container name in subsequent
commands.

Seeding with the current time in nanoseconds reduces the probability of
this.

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-22 10:46:54 +02:00
Djordje Lukic
36c01f511b Refactor the interceptors 
Avoid having a function that takes in two contexts as parameters
 2020-05-22 10:16:04 +02:00
Djordje Lukic
8495500aa2 Add a CliSuite for cli unit tests 
Makes writing unit tests for commands quite easier
 2020-05-22 10:13:56 +02:00
Christopher Crone
dd66646c06 Unit test run help 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-21 20:03:06 +02:00
Christopher Crone
0efa67f7d2 Set random container name if not set 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-21 19:28:42 +02:00
Djordje Lukic
fe36c49246 Use alpine as base image 
Installing docker on buster is a pain, use alpine to install it
 2020-05-20 18:39:10 +02:00
Djordje Lukic
95e07a2134 Add default context to the context ls output 2020-05-20 18:39:10 +02:00
Christopher Crone
ebe3fbc180 Use config dir for serving API 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-20 15:56:07 +02:00
Christopher Crone
058e6203a7 Store config dir in CLI context 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-20 15:55:05 +02:00
Christopher Crone
b7fb7e2e84 Allow setting config dir with env var 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-20 14:39:02 +02:00
Guillaume Tardif
d218c0745e
Merge pull request #121 from gtardif/docker-classic 
delegate Moby to docker-classic binary, link docker-classic in e2e tests
 2020-05-20 14:28:35 +02:00
Guillaume Tardif
2610b986fd delegate Moby to docker-classic binary, link docker-classic in e2e tests 2020-05-20 14:23:29 +02:00
Ulysses Souza
d2fece3311 Fix linter problems 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-20 10:16:36 +02:00
Ulysses Souza
d28e5fd742 Add e2e-aci tests for volumes 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-20 10:13:08 +02:00
Ulysses Souza
b25a6b4bd6 Add volumes to run command 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-20 10:06:12 +02:00
Djordje Lukic
0bd18986dd Add "*" for the current context 2020-05-18 16:42:06 +02:00
Djordje Lukic
cf1be96833
Merge pull request #99 from docker/feat-stop 
Add `Stop` command on the gRPC side.
 2020-05-18 07:40:39 -07:00
Djordje Lukic
a0dda2d094 Add tests for ps --all 2020-05-18 15:31:59 +02:00
Djordje Lukic
ce7cbd4463 Add Stop command on the gRPC side. 2020-05-18 15:31:59 +02:00
Christopher Crone
ad0fd73c31 Add config file tests 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-18 15:28:45 +02:00
Christopher Crone
292b6cbd84 Use const for default context name 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-18 15:27:47 +02:00
Chris Crone
cd6d192d07
Merge pull request #113 from chris-crone/appease-linter-main-test 
Appease linter in main test
 2020-05-18 15:26:59 +02:00
Guillaume Tardif
2e8251fb2d
Merge pull request #100 from gtardif/windows_grpc 
Allow server to start on tcp port or if windows, named pipe rather than unix socket
 2020-05-18 15:18:51 +02:00
Christopher Crone
7e81f9e147 Appease linter 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-18 15:12:52 +02:00
Christopher Crone
6d2f085717 Do not pass global flags to context show 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-18 14:58:03 +02:00
Djordje Lukic
7cbbab1739
Merge pull request #109 from chris-crone/context-show 
Add context show command
 2020-05-18 05:50:20 -07:00
Christopher Crone
10d826eb10 Add context show command 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-18 14:48:02 +02:00