Commit graph

354 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
b5f64c0a2e
README: lzd docker alias 2019-07-21 15:46:57 +02: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
Dawid Dziurla
07e108d16c
Merge pull request #131 from muesli/gosimple-fixes
Simplified return and bool check code
2019-07-19 11:02:17 +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
857053de56
Merge pull request #129 from jesseduffield/xdg
Use xdg package instead of configdir
2019-07-18 02:59:03 +02:00
Quentin McGaw
25e877539d Removed PATH variable definition in Dockerfile
As @ibnesayeed mentionned, some environment variables are actually defined even in Scratch Docker images. `PATH` contains `/bin` so there is no need to overwrite it.
2019-07-16 05:06:35 -07:00
Quentin McGaw
80fdf3142b Switched to opencontainers.org labels for Docker image 2019-07-16 05:03:09 -07:00
Quentin McGaw
a497b56e36 Simplified readme instructions for Docker run and removed volume
- Volume did not work properly as the config would be persistent but not shared across restart of the container running interactively.
- Docker run instructions were therefore updated and simplified to bind mount the config directory as volume do not really work in this situation.
2019-07-16 05:02:48 -07:00
Quentin McGaw
84320dd4de Uses modules for Docker build 2019-07-16 05:00:52 -07:00
Quentin McGaw
dedafb3acf All binaries are in /bin directory. 2019-07-15 22:11:08 -07:00
Quentin McGaw
98697c544e Added Docker CLI binary to final image 2019-07-15 22:03:17 -07:00
Quentin McGaw
dec14665e1 Simplified docker run readme thanks to default volume 2019-07-15 22:02:04 -07:00
Dawid Dziurla
e413252d3b
mod: newer xdg package
need to use newer commit, because of BSD support
2019-07-13 13:08:01 +02:00
Dawid Dziurla
2b3d380d10
config: use xdg package instead of configdir 2019-07-13 12:56:51 +02:00
Dawid Dziurla
f384e57917
mod: tidy and vendor 2019-07-13 12:39:50 +02:00
Dawid Dziurla
f7d566b915
Merge pull request #128 from tecpromotion/patch-2
typos and sentence structure
2019-07-13 12:09:29 +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
Dawid Dziurla
690a7c62f4
main: check for encoding error 2019-07-12 23:48:49 +02:00
Dawid Dziurla
8024ba77f1
main: nicer --version output 2019-07-12 23:41:40 +02:00
Jesse Duffield
c99bdaa5ff
Merge pull request #124 from jesseduffield/confirmation-options
show y/n options on confirmation panels
2019-07-12 21:01:43 +10:00
Jesse Duffield
7c87c21fa0 show y/n options on confirmation panels 2019-07-12 20:59:44 +10:00
Dawid Dziurla
0e81129024
README: set minimal docker version 2019-07-08 14:48:46 +02:00
Dawid Dziurla
bd16a78b06
Merge branch 'docker-sdk-update' 2019-07-08 14:44:51 +02:00
Jesse Duffield
06c80ec36f
Merge pull request #120 from SvenDowideit/add-image-and-volume-custom-commands
custom commands for images and volumes
2019-07-08 18:22:55 +10: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
Jesse Duffield
cca69e64f3
Merge pull request #111 from mjarkk/f110
Added `e` keybinding for toggling visibility stopped containers
2019-07-07 22:50:44 +10:00
mjarkk
209456fdcd
Changed the keybinding to e 2019-07-07 14:44:59 +02:00
mjarkk
ec5bd8cd38
Updated keybindings file 2019-07-07 14:34:06 +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
87d657ccf2 only update docs on release 2019-07-07 13:07:13 +10:00
lazydocker bot
7e490b9ee0 update docs 2019-07-07 03:03:29 +00:00
Jesse Duffield
17fc1bd2e3
Merge pull request #114 from jesseduffield/ci-cheatsheet
update docs when merging to master
2019-07-07 13:03:15 +10:00
Jesse Duffield
018e151e1f update docs when merging to master 2019-07-07 13:01:08 +10: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
Jesse Duffield
da6deff199
Merge pull request #112 from mjarkk/fix-git-typo
Cleaned up some code from lazygit
2019-07-07 11:05:10 +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