From e1a52a314d8259e55071af24d3737a3871392db1 Mon Sep 17 00:00:00 2001 From: Bradley Cicenas Date: Sun, 25 Oct 2020 16:55:44 +0000 Subject: [PATCH] v0.7.4, update docs --- .circleci/config.yml | 2 +- README.md | 9 ++++++--- VERSION | 2 +- _docs/build.md | 9 +++++---- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35c5f52..00f663d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: steps: - checkout - setup_remote_docker: - version: 17.05.0-ce + version: 19.03.13 - run: make image - deploy: command: | diff --git a/README.md b/README.md index 3c0e6dc..531ed52 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Fetch the [latest release](https://github.com/bcicen/ctop/releases) for your pla #### Linux ```bash -sudo wget https://github.com/bcicen/ctop/releases/download/v0.7.3/ctop-0.7.3-linux-amd64 -O /usr/local/bin/ctop +sudo wget https://github.com/bcicen/ctop/releases/download/v0.7.4/ctop-0.7.4-linux-amd64 -O /usr/local/bin/ctop sudo chmod +x /usr/local/bin/ctop ``` @@ -31,7 +31,7 @@ brew install ctop ``` or ```bash -sudo curl -Lo /usr/local/bin/ctop https://github.com/bcicen/ctop/releases/download/v0.7.3/ctop-0.7.3-darwin-amd64 +sudo curl -Lo /usr/local/bin/ctop https://github.com/bcicen/ctop/releases/download/v0.7.4/ctop-0.7.4-darwin-amd64 sudo chmod +x /usr/local/bin/ctop ``` @@ -56,7 +56,9 @@ Build steps can be found [here][build]. ### Config file -While running, use `S` to save the current filters, sort field, and other options to a default config path. These settings will be loaded and applied the next time `ctop` is started. +While running, use `S` to save the current filters, sort field, and other options to a default config path (`~/.config/ctop/config` on XDG systems, else `~/.ctop`). + +Config file values will be loaded and applied the next time `ctop` is started. ### Options @@ -86,6 +88,7 @@ Option | Description | o | Open single view | | l | View container logs (`t` to toggle timestamp when open) | | e | Exec Shell | +| c | Configure columns | | S | Save current configuration to file | | q | Quit ctop | diff --git a/VERSION b/VERSION index f38fc53..0a1ffad 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7.3 +0.7.4 diff --git a/_docs/build.md b/_docs/build.md index 3d0b3c2..b69d924 100644 --- a/_docs/build.md +++ b/_docs/build.md @@ -1,10 +1,8 @@ # Build -To build `ctop` from source, ensure you have [dep](https://github.com/golang/dep) installed and run: +To build `ctop` from source, simply clone the repo and run: ```bash -go get github.com/bcicen/ctop && \ -cd $GOPATH/src/github.com/bcicen/ctop && \ make build ``` @@ -16,5 +14,8 @@ make image Now you can run your local image: ```bash -docker run -ti --name ctop --rm -v /var/run/docker.sock:/var/run/docker.sock ctop +docker run --rm -ti \ + --name ctop \ + -v /var/run/docker.sock:/var/run/docker.sock \ + ctop:latest ```