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
1,668 Commits 23 Branches 268 Tags
Commit Graph

1668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillaume Tardif
624308134f Specific error message when specifying path as a volume source. Removed volume reference validation already done at https://github.com/compose-spec/compose-go/blob/5afecaa4cb/loader/validate.go#L38 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-12 11:38:40 +01:00
Guillaume Tardif
1cc0ccb189
Merge pull request #892 from docker/fix_log_stream_end 
Avoid nil pointer when reading logs of a just terminated container.
 2020-11-10 14:06:51 +01:00
Guillaume Tardif
40334d570a Avoid nil pointer when reading logs of a just terminated container. 
Hit this when following logs of a container restarted with a health check: 
```
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0x168771e]

goroutine 1 [running]:
github.com/docker/compose-cli/aci.getACIContainerLogs(0x2d85260, 0xc000526c60, 0xc0001465a0, 0x24, 0xc0004f4da0, 0xa, 0xc0004f4db0, 0x7, 0x7ffeefbffab2, 0xb, ...)
	github.com/docker/compose-cli/aci/aci.go:285 +0x1fe
github.com/docker/compose-cli/aci.streamLogs(0x2d85260, 0xc000526c60, 0xc0001465a0, 0x24, 0xc0004f4da0, 0xa, 0xc0004f4db0, 0x7, 0x7ffeefbffab2, 0xb, ...)
	github.com/docker/compose-cli/aci/aci.go:297 +0x2e5
```

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-09 18:19:31 +01:00
Nicolas De loof
2b8fa9934e
Merge pull request #889 from gtardif/run_restart_flags_move 
Minor refactoring: Move list of run specific flags where it’s used
 2020-11-09 10:25:50 +01:00
Guillaume Tardif
cfa090459b Move list of run specific flags where it’s used 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-06 15:38:50 +01:00
Guillaume Tardif
6a9d7c1371
Merge pull request #888 from docker/ecs_get_timeout 
ECS E2E timeout update due to flakiness in CI
 2020-11-06 14:47:12 +01:00
Guillaume Tardif
0a9373cbc2 ECS E2E timeout update due to flakiness in CI 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-06 14:36:35 +01:00
Guillaume Tardif
5c04e84e49
Merge pull request #882 from docker/yaml 
Marshall cloudformation template as yaml
 2020-11-06 13:51:12 +01:00
Guillaume Tardif
af1dae52eb
Merge pull request #845 from docker/add-aci-healthcheck 
Add Healthchecks to ACI
 2020-11-06 13:47:33 +01:00
Guillaume Tardif
37737c3887 Do not send zero values in LivenessProbe, blocking deployments in some cases 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-06 12:21:12 +01:00
Ulysses Souza
f6509ac814 Add Healthchecks to ACI 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-11-06 12:21:12 +01:00
Guillaume Tardif
5162982edc
Merge pull request #887 from docker/restart-policy-map 
Remap restart policies for command run
 2020-11-06 11:29:09 +01:00
Ulysses Souza
7aee922b35 Remap restart policies for command run 
This adds 'no' and 'always' as options.

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-11-06 10:37:53 +01:00
Guillaume Tardif
c1ee51f31e
Merge pull request #884 from docker/win_fix_execute_working_dir 
Windows: do not resolve files in current working dir if CWD is not explicitly in PATH.
 2020-11-05 18:05:21 +01:00
Guillaume Tardif
66a1263342 No specific case for windows, always resolve binary name before executing command 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-05 17:38:03 +01:00
Guillaume Tardif
41a1553dab No specific case for windows, always resolve binary name before executing command 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-05 17:31:26 +01:00
Guillaume Tardif
3936826673 Keep original license in windows lp_windows.go 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-05 17:12:03 +01:00
Guillaume Tardif
5a8eb000f6
Merge pull request #880 from gtardif/api_context_ls_endpoint 
Add context details in API context ls
 2020-11-05 17:08:32 +01:00
guillaume.tardif
4489f39e5d duplicate windows os/exec.LookPath() and do not resolve files in current working dir if CWD is not explicitly in PATH. 
Signed-off-by: guillaume.tardif <guillaume.tardif@gmail.com>
 2020-11-05 16:43:17 +01:00
Nicolas De loof
3afc1cd43d
Merge pull request #867 from docker/local-improvements 2020-11-05 14:40:37 +01:00
Nicolas De loof
c6fc0e116f
Merge pull request #879 from docker/acceskey_file 
Flag to import access key & secret from file
 2020-11-05 14:08:51 +01:00
Nicolas De loof
ba0d7c61f1
Merge pull request #883 from docker/no_changes 2020-11-05 14:06:41 +01:00
Nicolas De Loof
e99a8b54f8
Detect changeset creation failure when there's no changet 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-05 13:39:52 +01:00
Guillaume Tardif
2121cc5ca6
Merge pull request #878 from gtardif/remove_obsolete_hidden_json_flag 
Remove obsolete flag `docker context ls --json` (that was marked hidden)
 2020-11-05 13:38:12 +01:00
Guillaume Tardif
0720767d1e Adding unit test on context conversion 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-05 12:42:58 +01:00
Nicolas De Loof
cb02622318
Marshall cloudformation template as yaml 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-05 11:01:32 +01:00
Guillaume Tardif
6cdcc7cb3e Add context details in API context ls: docker endpoint host, ACI region, resource group, subscription id, ECS profile. Also added context description 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-04 17:39:15 +01:00
Nicolas De Loof
44c58e7806
Flag to import access key & secret from file 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-11-04 17:20:10 +01:00
Chris Crone
74a27541e4 backend.local: Add volume e2e test 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 15:50:28 +01:00
Guillaume Tardif
db7d04db79 Remove obsolete flag --json (that was marked hidden), kept for VSCode extension but is not used, docker context ls --format “{{ json . }}” is used. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-04 14:54:01 +01:00
Guillaume Tardif
4b88896547
Merge pull request #876 from docker/ecs_pin_secret_sidecar 
Pin ECS secrets sidecar image & add makefile targets
 2020-11-04 10:59:53 +01:00
Chris Crone
db3a14694b backend.local: Add command support 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 10:43:04 +01:00
Guillaume Tardif
8cc438c9a5 Pin ECS secrets sidecar image & add makefile targets 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-04 10:30:46 +01:00
Chris Crone
318e8c6e8b api: Fix typo 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 09:54:29 +01:00
Chris Crone
42eb0ecc35 backend.local: Add rudimentary volume support 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 09:54:29 +01:00
Chris Crone
637dd263c9 backend.local: Refactor container service 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 09:54:29 +01:00
Chris Crone
b2dcae685a backend.local: Add restart policy support to run 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 09:54:29 +01:00
Chris Crone
b8adb4b3dd backend.local: Refactor conversion code 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 09:54:29 +01:00
Chris Crone
6a9eca9bdf backend.local: Add memory limits 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 09:54:29 +01:00
Chris Crone
47aa069a3d backend.local: Add CPU limits 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 09:54:29 +01:00
Chris Crone
42f31d3129 backend.local: Improve inspect 
* Add restart policy
* Add environment
* Add labels
* Add auto remove

Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 09:54:29 +01:00
Chris Crone
dce884d5c8 backend.local: Set environment on run 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-04 09:54:29 +01:00
Chris Crone
4fc73d1cdf
Merge pull request #873 from docker/test-golang 
Replace Python test image with Go binary
 2020-11-04 09:46:40 +01:00
Chris Crone
aeab918688 tests: Replace Python test image with Go binary 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-11-03 18:50:44 +01:00
Guillaume Tardif
f48d8243bd
Merge pull request #872 from docker/ecs_secrets_e2e 
Changed test img to `dockerinternal` org + ECS E2E secret validation
 2020-11-03 18:24:52 +01:00
Guillaume Tardif
1a5ce029b4 Changed test img to dockerinternal org, removed the need of 2 images, added ECS E2E secret validation 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-03 18:04:45 +01:00
Guillaume Tardif
dd5f66ff09
Merge pull request #868 from docker/aci_e2e_regroup 
Regroup secret and resource ACI E2E test, and deploy a single compose file, to gain ~1 min test exec time
 2020-11-03 15:21:37 +01:00
Guillaume Tardif
ba0d2907ed Also validate we can share some secrets between services but not all secrets, without leaking secrets. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-03 15:05:57 +01:00
Guillaume Tardif
a26e1bd1a5 Regroup secret and resource ACI E2E test, and deploy a single compose file, to gain ~1 min test exec time 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-11-03 13:39:49 +01:00
Nicolas De loof
084a04fdd9
Merge pull request #866 from docker/token 
DescribeSubnets uses pagination
 2020-11-03 11:46:21 +01:00