Commit graph

189 commits

Author SHA1 Message Date
Pieter van de Bruggen
a4bd90ff8a Correlate Services and Containers by Service Name
The config hash ends up not being a unique identifier of a Service.  Additionally, Services may have multiple associated Containers.

``` yaml
# Sample docker-compose.yml
version: "2.2"

services:
  named-service:
    container_name: 'named-container'
    image: 'alpine'
    command: 'sh -c "while :; do sleep 1; done"'

  anonymous-service:
    image: 'alpine'
    command: 'sh -c "while :; do sleep 1; done"'

  scaled-service:
    image: 'alpine'
    scale: 3
    command: 'sh -c "while :; do sleep 1; done"'
```

``` bash
$ docker-compose config --hash="*"
named-service e6e7c4564dfc435ba96725098c62e6b6cf8da9f0b76b0a08be2baddedad6d007
anonymous-service 254f4815ef36bc9fcc2ce80f82278187c9e233309a4106951551f3692657ce9c
scaled-service 254f4815ef36bc9fcc2ce80f82278187c9e233309a4106951551f3692657ce9c
```

This commit changes how Services are discovered (`docker-compose config --services`), how they're associated (by Container ID, rather than config hash or name), and allows for Services to reference multiple Containers (though only the first is directly used for anything at this time).
2019-07-23 13:42:18 -07:00
Dawid Dziurla
a7ccf40d3f
Merge branch 'reworking-dockerfile' 2019-07-21 15:40:17 +02:00
Dawid Dziurla
0c82a7089c
Merge pull request #132 from muesli/gocritic-fixes
Simplified code a bit
2019-07-19 11:08:04 +02:00
Dawid Dziurla
3197f28e94
Merge pull request #133 from muesli/unconvert-fixes
Removed unnecessary string conversion
2019-07-19 11:03:07 +02:00
Christian Muehlhaeuser
08861a53bf
Removed unnecessary string conversion
`s.expected` is already a string.
2019-07-19 05:01:29 +02:00
Christian Muehlhaeuser
78d7fda9ec
Simplified code a bit 2019-07-19 04:59:32 +02:00
Christian Muehlhaeuser
16b3eaedac
Simplified return and bool check code 2019-07-19 04:54:33 +02:00
Dawid Dziurla
2b3d380d10
config: use xdg package instead of configdir 2019-07-13 12:56:51 +02:00
Stefan Wendhausen
4b727fc24a
Update german.go 2019-07-13 11:59:32 +02:00
Stefan Wendhausen
9a558edf3b
typos and sentence structure
Corrected some typos and improved sentence structure
2019-07-13 11:56:36 +02:00
Jesse Duffield
7c87c21fa0 show y/n options on confirmation panels 2019-07-12 20:59:44 +10:00
Dawid Dziurla
bd16a78b06
Merge branch 'docker-sdk-update' 2019-07-08 14:44:51 +02:00
Dowideit, Sven (O&A, St. Lucia)
cdf075b00d Initial working demo
Signed-off-by: Dowideit, Sven (O&A, St. Lucia) <Sven.Dowideit@csiro.au>
2019-07-08 17:01:15 +10:00
mjarkk
209456fdcd
Changed the keybinding to e 2019-07-07 14:44:59 +02:00
Mark Kopenga
9bbd513a72
Update pkg/i18n/english.go
Co-Authored-By: Jesse Duffield <jessedduffield@gmail.com>
2019-07-07 14:33:23 +02:00
Mark Kopenga
0ca9235220
Merge branch 'master' into f110 2019-07-07 14:33:03 +02:00
mjarkk
401c6a39ed
Updated the keybindings 2019-07-07 14:30:18 +02:00
mjarkk
30a79faa49
Moved the filtering out of containers to the docker.go file 2019-07-07 14:19:35 +02:00
Jesse Duffield
a46074c581
Merge pull request #108 from jesseduffield/see-required-translations
add get_required_translations.go
2019-07-07 21:13:29 +10:00
Quentin McGaw
88896e9117 Removed terminal space check (gocui got fixed) 2019-07-07 12:19:44 +02:00
Jesse Duffield
cfd47b2877 add get_required_translations.go 2019-07-07 11:11:24 +10:00
Jesse Duffield
df7f9c4a99 update cheatsheets 2019-07-07 11:11:24 +10:00
mjarkk
867459af56
Merge remote-tracking branch 'jesse/master' into fix-git-typo 2019-07-06 22:28:41 +02:00
mjarkk
fddbc7cdf8
Removed some lazygit code 2019-07-06 22:27:52 +02:00
mjarkk
b89b02eee5
Added h key binding 2019-07-06 21:20:21 +02:00
Jesse Duffield
a5ec531b2b
Merge pull request #98 from mjarkk/fix-76
Add a limit to the c.StatsHistory
2019-07-06 09:26:03 +10:00
mjarkk
58baf82519
Added the sugestion from @jesseduffeild 2019-07-05 16:58:06 +02:00
Quentin McGaw
92837ca1cb Buffering channel with a size of 1 2019-07-05 14:46:38 +02:00
Quentin McGaw
ee6b990792 Applied changes from @dawidd6 to check on terminal space at start 2019-07-05 14:39:27 +02:00
Dawid Dziurla
bb319ddb59
adjust code to newer API 2019-07-05 14:18:44 +02:00
mjarkk
8ef19b781d
Added a litmit to the StatsHistory 2019-07-05 08:10:21 +02:00
Jesse Duffield
ea6eafe2df fix CI 2019-07-05 10:35:25 +10:00
Jesse Duffield
cd95ffce49
Merge pull request #97 from mjarkk/fix-94
Added rounding to timing (fixes #94)
2019-07-05 10:20:06 +10:00
Jesse Duffield
9207dc6faa
Merge pull request #88 from pvande/feature/display-project-directory
Show Project Directory in Status Panel
2019-07-05 10:19:18 +10:00
Quentin McGaw
29ad43c4a4 Fixed infinite loop for checking terminal space as discussed in PR
- All the checks are in the `waitForTerminalSpace` function
- It tries to run the program directly if the width is positive
- It then sleeps 50 milliseconds the first time if the width is zero
- If after the first sleep, the terminal width is still zero, it prints the waiting time to stderr and will keep on doing so with increasing sleep times.
2019-07-05 01:31:28 +02:00
mjarkk
74e8d6eb91
Added rounding to timeing 2019-07-04 21:25:49 +02:00
Jesse Duffield
6883c08f62
Merge pull request #90 from oguzcandemircan/turkhis-language-support
Added Turkish language support
2019-07-04 21:05:23 +10:00
Dawid Dziurla
16e596efaa
i18n: userLang variable was set needlessly 2019-07-04 11:17:39 +02:00
Dawid Dziurla
08c711a334
i18n: add polish translation 2019-07-04 11:12:21 +02:00
Oğuzcan Demircan
ce6cffa784
"Error return value of mergo.Merge is not checked (from errcheck)" issue solved 2019-07-04 11:53:33 +03:00
Oğuzcan Demircan
f811a3708a
Update turkish.go 2019-07-04 08:48:08 +03:00
Pieter van de Bruggen
b3422c87f4 Pull the project name from docker-compose labels, when available 2019-07-03 16:58:42 -07:00
Pieter van de Bruggen
f9ba4b875d Updating config tests with new parameter 2019-07-03 11:24:23 -07:00
Pieter van de Bruggen
86dfebdeaf Replace Project panel content with the project directory.
In the future, it may be worth trying to compute this from ComposeFiles.
2019-07-03 10:59:45 -07:00
Pieter van de Bruggen
8654d177d3 Move name to information area 2019-07-03 10:52:43 -07:00
Pieter van de Bruggen
12f3cfab55 Rename StatusPanel to ProjectPanel 2019-07-03 10:48:55 -07:00
Oguzcan Demircan
3bca81dd9a Added: Turkish language support 2019-07-03 18:17:27 +03:00
Jesse Duffield
4edf263dfa use default border color to support light theme 2019-07-03 20:45:02 +10:00
Quentin McGaw
d404716d0a Fixed bad loop for checking terminal size 2019-07-02 20:14:34 +02:00
Quentin McGaw
20f4ad8e49 Resolved screen size issue, final Docker image uses Scratch 2019-07-02 20:08:29 +02:00