From e56aced04de3440db37c6ccce0a062267e28de08 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:01:07 +0000 Subject: [PATCH 1/7] docs: changelog --- .../workflows/create_release_and_build.yml | 2 +- CHANGELOG.md | 30 ++++++------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.github/workflows/create_release_and_build.yml b/.github/workflows/create_release_and_build.yml index 051cbf6..4f8a307 100644 --- a/.github/workflows/create_release_and_build.yml +++ b/.github/workflows/create_release_and_build.yml @@ -27,7 +27,7 @@ jobs: ################################################# cross_platform_build: - needs: [cargo_publish] + needs: [cargo_publish] strategy: matrix: platform: diff --git a/CHANGELOG.md b/CHANGELOG.md index f0a56c9..05dd825 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,28 +1,16 @@ -# v0.4.1 -### 2023-11-20 - -### (Quick) Fixes -+ Bollard dependency fix, [1702414f](https://github.com/mrjackwills/oxker/commit/1702414f922d87ff1cb6654128c09c0074870123) -+ GitHub workflow, cargo publish before create release, [ae4ce3b5](https://github.com/mrjackwills/oxker/commit/ae4ce3b549c40cc8bd713f375f030b185179a6e2) -+ `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [77fbaa8b](https://github.com/mrjackwills/oxker/commit/77fbaa8b1669286369b6ec1edd80220c808b628f) - -See [https://github.com/mrjackwills/oxker/releases/tag/v0.4.0](https://github.com/mrjackwills/oxker/releases/tag/v0.4.0) for more detailed v0.4.0 release notes - -# v0.4.0 -### 2023-11-20 - ### Chores -+ workflow dependencies updated, [6a4cf649](https://github.com/mrjackwills/oxker/commit/6a4cf6490d08b976734e2bc8186d94c095700558) -+ dependencies updated, [e301b518](https://github.com/mrjackwills/oxker/commit/e301b51891e03ea40b2f904583119da3bc4daf53), [81d5b326](https://github.com/mrjackwills/oxker/commit/81d5b326db8881263f2c9072e1426948e41b4a0f), [294cc268](https://github.com/mrjackwills/oxker/commit/294cc2684f42daab9d51601e235a384f55617678) -+ lints moved from main.rs to Cargo.toml, [2de76e2f](https://github.com/mrjackwills/oxker/commit/2de76e2f358be9c1500ca3dc4f9df0979ed8ed28) -+ .devcontainer updated, [37d2ee91](https://github.com/mrjackwills/oxker/commit/37d2ee915625806dd11c2cc816a892aae12a777c) - ++ workflow dependencies updated, [6a4cf6490d08b976734e2bc8186d94c095700558] ++ dependencies updated, [e301b51891e03ea40b2f904583119da3bc4daf53], [81d5b326db8881263f2c9072e1426948e41b4a0f], [294cc2684f42daab9d51601e235a384f55617678] ++ lints moved from main.rs to Cargo.toml, [2de76e2f358be9c1500ca3dc4f9df0979ed8ed28] ++ .devcontainer updated, [37d2ee915625806dd11c2cc816a892aae12a777c] ### Features -+ Docker exec mode - you are now able to attempt to exec into a container by pressing the `e` key, closes [#28](https://github.com/mrjackwills/oxker/issues/28), [c8077bca](https://github.com/mrjackwills/oxker/commit/c8077bca0b673478cfbb417e677a885136ba9eff), [0e5ee143](https://github.com/mrjackwills/oxker/commit/0e5ee143b008c9d0ee0b681231a1568be227150b), [0e5ee143](https://github.com/mrjackwills/oxker/commit/0e5ee143b008c9d0ee0b681231a1568be227150b) -+ Export logs feature, press `s` to save logs, use `--save-dir` cli-arg to customise output location, closes [#1](https://github.com/mrjackwills/oxker/issues/1), [a15da5ed](https://github.com/mrjackwills/oxker/commit/a15da5ed43d07852504a4dd1884a189e3f5b9d84) ++ Docker exec mode - you are now able to attempt to exec into a container by pressing the `e` key, closes #28, [c8077bca0b673478cfbb417e677a885136ba9eff], [0e5ee143](https://github.com/mrjackwills/oxker/commit/0e5ee143b008c9d0ee0b681231a1568be227150b), [0e5ee143](https://github.com/mrjackwills/oxker/commit/0e5ee143b008c9d0ee0b681231a1568be227150b) ++ Export logs feature, press `s` to save logs, use `--save-dir` cli-arg to customise output location, closes #1, [a15da5ed43d07852504a4dd1884a189e3f5b9d84] ### Fixes -+ sorted created_at clash, closes [#22](https://github.com/mrjackwills/oxker/issues/22), [3a648939](https://github.com/mrjackwills/oxker/commit/3a6489396e87702ce94b349a7f47028ece7922f6) ++ GitHub workflow, cargo publish before create release, [ae4ce3b549c40cc8bd713f375f030b185179a6e2] ++ sorted created_at clash, closes #22, [3a6489396e87702ce94b349a7f47028ece7922f6] ++ `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [77fbaa8b1669286369b6ec1edd80220c808b628f] # v0.3.3 ### 2023-10-21 From 0cc793fe6fb8eee59660013cf0166933accfeff4 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:01:07 +0000 Subject: [PATCH 2/7] docs: changelog --- .../workflows/create_release_and_build.yml | 2 +- CHANGELOG.md | 30 ++++++------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.github/workflows/create_release_and_build.yml b/.github/workflows/create_release_and_build.yml index 051cbf6..4f8a307 100644 --- a/.github/workflows/create_release_and_build.yml +++ b/.github/workflows/create_release_and_build.yml @@ -27,7 +27,7 @@ jobs: ################################################# cross_platform_build: - needs: [cargo_publish] + needs: [cargo_publish] strategy: matrix: platform: diff --git a/CHANGELOG.md b/CHANGELOG.md index f0a56c9..711371d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,28 +1,16 @@ -# v0.4.1 -### 2023-11-20 - -### (Quick) Fixes -+ Bollard dependency fix, [1702414f](https://github.com/mrjackwills/oxker/commit/1702414f922d87ff1cb6654128c09c0074870123) -+ GitHub workflow, cargo publish before create release, [ae4ce3b5](https://github.com/mrjackwills/oxker/commit/ae4ce3b549c40cc8bd713f375f030b185179a6e2) -+ `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [77fbaa8b](https://github.com/mrjackwills/oxker/commit/77fbaa8b1669286369b6ec1edd80220c808b628f) - -See [https://github.com/mrjackwills/oxker/releases/tag/v0.4.0](https://github.com/mrjackwills/oxker/releases/tag/v0.4.0) for more detailed v0.4.0 release notes - -# v0.4.0 -### 2023-11-20 - ### Chores -+ workflow dependencies updated, [6a4cf649](https://github.com/mrjackwills/oxker/commit/6a4cf6490d08b976734e2bc8186d94c095700558) -+ dependencies updated, [e301b518](https://github.com/mrjackwills/oxker/commit/e301b51891e03ea40b2f904583119da3bc4daf53), [81d5b326](https://github.com/mrjackwills/oxker/commit/81d5b326db8881263f2c9072e1426948e41b4a0f), [294cc268](https://github.com/mrjackwills/oxker/commit/294cc2684f42daab9d51601e235a384f55617678) -+ lints moved from main.rs to Cargo.toml, [2de76e2f](https://github.com/mrjackwills/oxker/commit/2de76e2f358be9c1500ca3dc4f9df0979ed8ed28) -+ .devcontainer updated, [37d2ee91](https://github.com/mrjackwills/oxker/commit/37d2ee915625806dd11c2cc816a892aae12a777c) - ++ workflow dependencies updated, [6a4cf6490d08b976734e2bc8186d94c095700558] ++ dependencies updated, [e301b51891e03ea40b2f904583119da3bc4daf53], [81d5b326db8881263f2c9072e1426948e41b4a0f], [294cc2684f42daab9d51601e235a384f55617678] ++ lints moved from main.rs to Cargo.toml, [2de76e2f358be9c1500ca3dc4f9df0979ed8ed28] ++ .devcontainer updated, [37d2ee915625806dd11c2cc816a892aae12a777c] ### Features -+ Docker exec mode - you are now able to attempt to exec into a container by pressing the `e` key, closes [#28](https://github.com/mrjackwills/oxker/issues/28), [c8077bca](https://github.com/mrjackwills/oxker/commit/c8077bca0b673478cfbb417e677a885136ba9eff), [0e5ee143](https://github.com/mrjackwills/oxker/commit/0e5ee143b008c9d0ee0b681231a1568be227150b), [0e5ee143](https://github.com/mrjackwills/oxker/commit/0e5ee143b008c9d0ee0b681231a1568be227150b) -+ Export logs feature, press `s` to save logs, use `--save-dir` cli-arg to customise output location, closes [#1](https://github.com/mrjackwills/oxker/issues/1), [a15da5ed](https://github.com/mrjackwills/oxker/commit/a15da5ed43d07852504a4dd1884a189e3f5b9d84) ++ Docker exec mode - you are now able to attempt to exec into a container by pressing the `e` key, closes #28, [c8077bca0b673478cfbb417e677a885136ba9eff], [0e5ee143b008c9d0ee0b681231a1568be227150b], [0e5ee143b008c9d0ee0b681231a1568be227150b] ++ Export logs feature, press `s` to save logs, use `--save-dir` cli-arg to customise output location, closes #1, [a15da5ed43d07852504a4dd1884a189e3f5b9d84] ### Fixes -+ sorted created_at clash, closes [#22](https://github.com/mrjackwills/oxker/issues/22), [3a648939](https://github.com/mrjackwills/oxker/commit/3a6489396e87702ce94b349a7f47028ece7922f6) ++ GitHub workflow, cargo publish before create release, [ae4ce3b549c40cc8bd713f375f030b185179a6e2] ++ sorted created_at clash, closes #22, [3a6489396e87702ce94b349a7f47028ece7922f6] ++ `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [77fbaa8b1669286369b6ec1edd80220c808b628f] # v0.3.3 ### 2023-10-21 From 0db1184be17b98a42b41c165e44333d8ffd04a9e Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:25:12 +0000 Subject: [PATCH 3/7] docs: changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d9c0ff..216ecfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ + sorted created_at clash, closes #22, [3a6489396e87702ce94b349a7f47028ece7922f6] + `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [77fbaa8b1669286369b6ec1edd80220c808b628f] +Let's not talk about v0.4.0 or v4.0.1 + # v0.3.3 ### 2023-10-21 From 4c06abe0fbaf415b8481dc2aa3a26b9eebb0ebd8 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:33:09 +0000 Subject: [PATCH 4/7] docs: README.md updated --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f093869..dfede85 100644 --- a/README.md +++ b/README.md @@ -117,8 +117,8 @@ Available command line arguments |```-t```| Remove timestamps from each log entry.| |```-s```| If running via Docker, will display the oxker container.| |```-g```| No TUI, essentially a debugging mode with limited functionality, for now.| -|```--host [hostname]```| Connect to Docker with a custom hostname. Defaults to `/var/run/docker.sock`. Will use `$DOCKER_HOST` environment variable if set.| -|```--save-dir [directory]```| Save exported logs into a custom directory. Defaults to `$HOME`.| +|```--host [string]```| Connect to Docker with a custom hostname. Defaults to `/var/run/docker.sock`. Will use `$DOCKER_HOST` environment variable if set.| +|```--save-dir [string]```| Save exported logs into a custom directory. Defaults to `$HOME`.| |```--use-cli```| Use the Docker application when exec-ing into a container, instead of the Docker API.| ## Build step From b6625ee3a90fa29b4975c4e3aac7ea751990fc85 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Tue, 21 Nov 2023 09:26:55 +0000 Subject: [PATCH 5/7] fix: create_reelase cargo publish --- .../workflows/create_release_and_build.yml | 34 +++++++++---------- create_release.sh | 9 ++++- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.github/workflows/create_release_and_build.yml b/.github/workflows/create_release_and_build.yml index 4f8a307..2270b9b 100644 --- a/.github/workflows/create_release_and_build.yml +++ b/.github/workflows/create_release_and_build.yml @@ -6,28 +6,11 @@ on: jobs: - ######################### - ## Publish to crates.io # - ######################### - - cargo_publish: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: publish to crates.io - uses: katyo/publish-crates@v1 - with: - registry-token: ${{ secrets.CRATES_IO_TOKEN }} - - ################################################# ## Cross platform binary build for release page # ################################################# cross_platform_build: - needs: [cargo_publish] strategy: matrix: platform: @@ -105,14 +88,29 @@ jobs: **/oxker_*.zip **/oxker_*.tar.gz + ################## + ## Cargo publish # + ################## + + cargo_publish: + needs: [create_release] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: publish to crates.io + uses: katyo/publish-crates@v1 + with: + registry-token: ${{ secrets.CRATES_IO_TOKEN }} + ######################################### ## Build images for Dockerhub & ghcr.io # ######################################### image_build: - needs: [create_release] + needs: [cargo_publish] runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/create_release.sh b/create_release.sh index 297e54c..a66b1c1 100755 --- a/create_release.sh +++ b/create_release.sh @@ -1,7 +1,7 @@ #!/bin/bash # rust create_release -# v0.3.0 +# v0.3.1 STAR_LINE='****************************************' CWD=$(pwd) @@ -170,6 +170,12 @@ cargo_test () { ask_continue } +# Simulate publishing to crates.io +cargo_publish () { + cargo publish --dry-run + ask_continue +} + # Build all releases that GitHub workflow would # This will download GB's of docker images cargo_build () { @@ -221,6 +227,7 @@ release_flow() { cargo_test cargo_build + cargo_publish cd "${CWD}" || error_close "Can't find ${CWD}" check_tag From 58a9324d4fea2370bb45339598cb40b3a896028b Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Tue, 21 Nov 2023 09:43:20 +0000 Subject: [PATCH 6/7] docs: CHANGELOG.md --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 216ecfa..1d9c0ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,8 +13,6 @@ + sorted created_at clash, closes #22, [3a6489396e87702ce94b349a7f47028ece7922f6] + `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [77fbaa8b1669286369b6ec1edd80220c808b628f] -Let's not talk about v0.4.0 or v4.0.1 - # v0.3.3 ### 2023-10-21 From be8c4d01ad1eb434a79b9fd434e7e83c098cdafb Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Tue, 21 Nov 2023 09:57:04 +0000 Subject: [PATCH 7/7] chore: release v0.4.0 --- .github/release-body.md | 18 +++++++++++++----- CHANGELOG.md | 21 ++++++++++++--------- Cargo.lock | 2 +- Cargo.toml | 2 +- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.github/release-body.md b/.github/release-body.md index 380fac8..398d8da 100644 --- a/.github/release-body.md +++ b/.github/release-body.md @@ -1,10 +1,18 @@ -### 2023-11-20 +### 2023-11-21 -### (Quick) Fixes -+ Bollard dependency fix, [1702414f922d87ff1cb6654128c09c0074870123] +### Chores ++ workflow dependencies updated, [6a4cf6490d08b976734e2bc8186d94c095700558] ++ dependencies updated, [e301b51891e03ea40b2f904583119da3bc4daf53], [81d5b326db8881263f2c9072e1426948e41b4a0f], [294cc2684f42daab9d51601e235a384f55617678] ++ lints moved from main.rs to Cargo.toml, [2de76e2f358be9c1500ca3dc4f9df0979ed8ed28] ++ .devcontainer updated, [37d2ee915625806dd11c2cc816a892aae12a777c] + +### Features ++ Docker exec mode - you are now able to attempt to exec into a container by pressing the `e` key, closes #28, [c8077bca0b673478cfbb417e677a885136ba9eff], [0e5ee143b008c9d0ee0b681231a1568be227150b], [0e5ee143b008c9d0ee0b681231a1568be227150b] ++ Export logs feature, press `s` to save logs, use `--save-dir` cli-arg to customise output location, closes #1, [a15da5ed43d07852504a4dd1884a189e3f5b9d84] + +### Fixes + GitHub workflow, cargo publish before create release, [ae4ce3b549c40cc8bd713f375f030b185179a6e2] ++ sorted created_at clash, closes #22, [3a6489396e87702ce94b349a7f47028ece7922f6] + `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [77fbaa8b1669286369b6ec1edd80220c808b628f] -See [https://github.com/mrjackwills/oxker/releases/tag/v0.4.0](https://github.com/mrjackwills/oxker/releases/tag/v0.4.0) for more detailed v0.4.0 release notes - see CHANGELOG.md for more details diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d9c0ff..7e82da7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,20 @@ +# v0.4.0 +### 2023-11-21 + ### Chores -+ workflow dependencies updated, [6a4cf6490d08b976734e2bc8186d94c095700558] -+ dependencies updated, [e301b51891e03ea40b2f904583119da3bc4daf53], [81d5b326db8881263f2c9072e1426948e41b4a0f], [294cc2684f42daab9d51601e235a384f55617678] -+ lints moved from main.rs to Cargo.toml, [2de76e2f358be9c1500ca3dc4f9df0979ed8ed28] -+ .devcontainer updated, [37d2ee915625806dd11c2cc816a892aae12a777c] ++ workflow dependencies updated, [6a4cf649](https://github.com/mrjackwills/oxker/commit/6a4cf6490d08b976734e2bc8186d94c095700558) ++ dependencies updated, [e301b518](https://github.com/mrjackwills/oxker/commit/e301b51891e03ea40b2f904583119da3bc4daf53), [81d5b326](https://github.com/mrjackwills/oxker/commit/81d5b326db8881263f2c9072e1426948e41b4a0f), [294cc268](https://github.com/mrjackwills/oxker/commit/294cc2684f42daab9d51601e235a384f55617678) ++ lints moved from main.rs to Cargo.toml, [2de76e2f](https://github.com/mrjackwills/oxker/commit/2de76e2f358be9c1500ca3dc4f9df0979ed8ed28) ++ .devcontainer updated, [37d2ee91](https://github.com/mrjackwills/oxker/commit/37d2ee915625806dd11c2cc816a892aae12a777c) ### Features -+ Docker exec mode - you are now able to attempt to exec into a container by pressing the `e` key, closes #28, [c8077bca0b673478cfbb417e677a885136ba9eff], [0e5ee143b008c9d0ee0b681231a1568be227150b], [0e5ee143b008c9d0ee0b681231a1568be227150b] -+ Export logs feature, press `s` to save logs, use `--save-dir` cli-arg to customise output location, closes #1, [a15da5ed43d07852504a4dd1884a189e3f5b9d84] ++ Docker exec mode - you are now able to attempt to exec into a container by pressing the `e` key, closes [#28](https://github.com/mrjackwills/oxker/issues/28), [c8077bca](https://github.com/mrjackwills/oxker/commit/c8077bca0b673478cfbb417e677a885136ba9eff), [0e5ee143](https://github.com/mrjackwills/oxker/commit/0e5ee143b008c9d0ee0b681231a1568be227150b), [0e5ee143](https://github.com/mrjackwills/oxker/commit/0e5ee143b008c9d0ee0b681231a1568be227150b) ++ Export logs feature, press `s` to save logs, use `--save-dir` cli-arg to customise output location, closes [#1](https://github.com/mrjackwills/oxker/issues/1), [a15da5ed](https://github.com/mrjackwills/oxker/commit/a15da5ed43d07852504a4dd1884a189e3f5b9d84) ### Fixes -+ GitHub workflow, cargo publish before create release, [ae4ce3b549c40cc8bd713f375f030b185179a6e2] -+ sorted created_at clash, closes #22, [3a6489396e87702ce94b349a7f47028ece7922f6] -+ `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [77fbaa8b1669286369b6ec1edd80220c808b628f] ++ GitHub workflow, cargo publish before create release, [ae4ce3b5](https://github.com/mrjackwills/oxker/commit/ae4ce3b549c40cc8bd713f375f030b185179a6e2) ++ sorted created_at clash, closes [#22](https://github.com/mrjackwills/oxker/issues/22), [3a648939](https://github.com/mrjackwills/oxker/commit/3a6489396e87702ce94b349a7f47028ece7922f6) ++ `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [77fbaa8b](https://github.com/mrjackwills/oxker/commit/77fbaa8b1669286369b6ec1edd80220c808b628f) # v0.3.3 ### 2023-10-21 diff --git a/Cargo.lock b/Cargo.lock index 5ede08f..ee3802a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -783,7 +783,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "oxker" -version = "0.4.1" +version = "0.4.0" dependencies = [ "anyhow", "bollard", diff --git a/Cargo.toml b/Cargo.toml index 0983633..82175a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxker" -version = "0.4.1" +version = "0.4.0" edition = "2021" authors = ["Jack Wills "] description = "A simple tui to view & control docker containers"