Merge 39de272f25 into 12df1363ce

modules/docker/README.md

@@ -17,13 +17,16 @@ Defines [Docker][1] aliases and functions.
 - `dki` List images
 - `dkin` Return low-level information on a container, image or task
 - `dkk` Kill a running container
+- `dkkh` Send `kill -s HUP` signal to a running container
 - `dkl` Fetch the logs of a container
+- `dkL` Fetch and follow (`-f`) the logs of a container
 - `dkli` Log in to a Docker registry
 - `dklo` Log out from a Docker registry
 - `dkls` is alias for `dkps`
 - `dkp` Pause all processes within one or more containers
 - `dkP` Unpause all processes within one or more containers
 - `dkpl` Pull an image or a repository from a registry
+- `dkplI` Pull all tagged images
 - `dkph` Push an image or a repository to a registry
 - `dkps` List containers
 - `dkpsa` List all containers (default lists just running)
@@ -57,9 +60,11 @@ Defines [Docker][1] aliases and functions.
 - `dkCcp` Copy files/folders between a container and the local filesystem
 - `dkCd` Inspect changes on a container's filesystem
 - `dkCe` Run a command in a running container
+- `dkCE` Run an interactive command in a running container
 - `dkCin` Display detailed information on one or more containers
 - `dkCk` Kill one or more running containers
 - `dkCl` Fetch the logs of a container
+- `dkCL` Fetch and follow (`-f`) the logs of a container
 - `dkCls` List containers
 - `dkCp` Pause all processes within one or more containers
 - `dkCpr` Remove all stopped containers
@@ -164,6 +169,7 @@ Defines [Docker][1] aliases and functions.
 - `dkce` Execute a command in a running container
 - `dkck` Kill containers
 - `dkcl` View output from containers
+- `dkcL` View and follow (`-f`) output from containers
 - `dkcls` is alias for `dkcps`
 - `dkcp` Pause services
 - `dkcP` Unpause services

modules/docker/alias.zsh

@@ -16,13 +16,15 @@ alias dkb='docker build'
 alias dkd='docker diff'
 alias dkdf='docker system df'
 alias dke='docker exec'
-alias dkE='docker exec -it'
+alias dkE='docker exec -e COLUMNS=`tput cols` -e LINES=`tput lines` -it'
 alias dkh='docker history'
 alias dki='docker images'
 alias dkin='docker inspect'
 alias dkim='docker import'
 alias dkk='docker kill'
+alias dkkh='docker kill -s HUP'
 alias dkl='docker logs'
+alias dkL='docker logs -f'
 alias dkli='docker login'
 alias dklo='docker logout'
 alias dkls='docker ps'
@@ -33,8 +35,8 @@ alias dkph='docker push'
 alias dkps='docker ps'
 alias dkpsa='docker ps -a'
 alias dkr='docker run'
-alias dkR='docker run -it --rm'
-alias dkRe='docker run -it --rm --entrypoint /bin/bash'
+alias dkR='docker run -e COLUMNS=`tput cols` -e LINES=`tput lines` -it --rm'
+alias dkRe='docker run -e COLUMNS=`tput cols` -e LINES=`tput lines` -it --rm --entrypoint /bin/bash'
 alias dkRM='docker system prune'
 alias dkrm='docker rm'
 alias dkrmi='docker rmi'
@@ -57,9 +59,11 @@ alias dkCa='docker container attach'
 alias dkCcp='docker container cp'
 alias dkCd='docker container diff'
 alias dkCe='docker container exec'
+alias dkCE='docker container exec -e COLUMNS=`tput cols` -e LINES=`tput lines` -it'
 alias dkCin='docker container inspect'
 alias dkCk='docker container kill'
 alias dkCl='docker container logs'
+alias dkCL='docker container logs -f'
 alias dkCls='docker container ls'
 alias dkCp='docker container pause'
 alias dkCpr='docker container prune'
@@ -67,8 +71,8 @@ alias dkCrn='docker container rename'
 alias dkCS='docker container restart'
 alias dkCrm='docker container rm'
 alias dkCr='docker container run'
-alias dkCR='docker container run -it --rm'
-alias dkCRe='docker container run -it --rm --entrypoint /bin/bash'
+alias dkCR='docker container run -e COLUMNS=`tput cols` -e LINES=`tput lines` -it --rm'
+alias dkCRe='docker container run -e COLUMNS=`tput cols` -e LINES=`tput lines` -it --rm --entrypoint /bin/bash'
 alias dkCs='docker container start'
 alias dkCss='docker container stats'
 alias dkCx='docker container stop'
@@ -124,12 +128,16 @@ alias dkW='docker swarm'
 ## CleanUp (rm)
 # Clean up exited containers (docker < 1.13)
 alias dkrmC='docker rm $(docker ps -qaf status=exited)'
+
 # Clean up dangling images (docker < 1.13)
 alias dkrmI='docker rmi $(docker images -qf dangling=true)'
+
+# Pull all tagged images
+alias dkplI='docker images --format "{{ .Repository }}" | grep -v "^<none>$" | xargs -L1 docker pull'
+
 # Clean up dangling volumes (docker < 1.13)
 alias dkrmV='docker volume rm $(docker volume ls -qf dangling=true)'
 
-
 # Docker Machine (m)
 alias dkm='docker-machine'
 alias dkma='docker-machine active'
@@ -156,17 +164,18 @@ alias dkc='docker-compose'
 alias dkcb='docker-compose build'
 alias dkcB='docker-compose build --no-cache'
 alias dkcd='docker-compose down'
-alias dkce='docker-compose exec'
+alias dkce='docker-compose exec -e COLUMNS=`tput cols` -e LINES=`tput lines`'
 alias dkck='docker-compose kill'
 alias dkcl='docker-compose logs'
+alias dkcL='docker-compose logs -f'
 alias dkcls='docker-compose ps'
 alias dkcp='docker-compose pause'
 alias dkcP='docker-compose unpause'
 alias dkcpl='docker-compose pull'
 alias dkcph='docker-compose push'
 alias dkcps='docker-compose ps'
-alias dkcr='docker-compose run'
-alias dkcR='docker-compose run --rm'
+alias dkcr='docker-compose run -e COLUMNS=`tput cols` -e LINES=`tput lines`'
+alias dkcR='docker-compose run -e COLUMNS=`tput cols` -e LINES=`tput lines` --rm'
 alias dkcrm='docker-compose rm'
 alias dkcs='docker-compose start'
 alias dkcsc='docker-compose scale'