chore: merge release-v0.4.1 into main

.github/release-body.md

@@ -1,17 +1,10 @@
 ### 2023-11-20
 
-### Chores
+### (Quick) Fixes
-+ workflow dependencies updated, [6a4cf6490d08b976734e2bc8186d94c095700558]
++ Bollard dependency fix, [1702414f922d87ff1cb6654128c09c0074870123]
-+ dependencies updated, [e301b51891e03ea40b2f904583119da3bc4daf53], [81d5b326db8881263f2c9072e1426948e41b4a0f], [294cc2684f42daab9d51601e235a384f55617678]
++ GitHub workflow, cargo publish before create release, [ae4ce3b549c40cc8bd713f375f030b185179a6e2]
-+ lints moved from main.rs to Cargo.toml, [2de76e2f358be9c1500ca3dc4f9df0979ed8ed28]
++ `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [77fbaa8b1669286369b6ec1edd80220c808b628f]
-+ .devcontainer updated, [37d2ee915625806dd11c2cc816a892aae12a777c]
 
-### Features
+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
-+ 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
-+ `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [0e06c9c172629dc7f7e7766f5372da9466e786d8]
-+ sorted created_at clash, closes #22, [3a6489396e87702ce94b349a7f47028ece7922f6]
 
 see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details

.github/workflows/create_release_and_build.yml

@@ -6,11 +6,28 @@ 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:
@@ -88,28 +105,14 @@ jobs:
             **/oxker_*.zip
             **/oxker_*.tar.gz
 
-  #########################
-  ## Publish to crates.io #
-  #########################
 
-  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: [cargo_publish]
+    needs: [create_release]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code

CHANGELOG.md

@@ -1,3 +1,13 @@
+# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.4.1'>v0.4.1</a>
+### 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
+
 # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.4.0'>v0.4.0</a>
 ### 2023-11-20
 
@@ -12,7 +22,6 @@
 + 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
-+ `as_ref()` fixed, thanks [Daniel-Boll](https://github.com/Daniel-Boll), [0e06c9c1](https://github.com/mrjackwills/oxker/commit/0e06c9c172629dc7f7e7766f5372da9466e786d8)
 + sorted created_at clash, closes [#22](https://github.com/mrjackwills/oxker/issues/22), [3a648939](https://github.com/mrjackwills/oxker/commit/3a6489396e87702ce94b349a7f47028ece7922f6)
 
 # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.3.3'>v0.3.3</a>

Cargo.lock

@@ -146,7 +146,8 @@ checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 [[package]]
 name = "bollard"
 version = "0.15.0"
-source = "git+https://www.github.com/fussybeaver/bollard.git?rev=cef1cd5#cef1cd568684d0c3c497ce56221ff22ca18334f4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6"
 dependencies = [
  "base64",
  "bollard-stubs",
@@ -174,7 +175,8 @@ dependencies = [
 [[package]]
 name = "bollard-stubs"
 version = "1.43.0-rc.2"
-source = "git+https://www.github.com/fussybeaver/bollard.git?rev=cef1cd5#cef1cd568684d0c3c497ce56221ff22ca18334f4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b58071e8fd9ec1e930efd28e3a90c1251015872a2ce49f81f36421b86466932e"
 dependencies = [
  "serde",
  "serde_repr",
@@ -781,7 +783,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "oxker"
-version = "0.4.0"
+version = "0.4.1"
 dependencies = [
  "anyhow",
  "bollard",
@@ -1418,9 +1420,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58fe91d841bc04822c9801002db4ea904b9e4b8e6bbad25127b46eff8dc516b"
+checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
 dependencies = [
  "getrandom",
  "rand",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "oxker"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 authors = ["Jack Wills <email@mrjackwills.com>"]
 description = "A simple tui to view & control docker containers"
@@ -27,8 +27,7 @@ similar_names = "allow"
 
 [dependencies]
 anyhow = "1.0"
-# bollard = "0.15"
+bollard = "0.15"
-bollard = { git = "https://www.github.com/fussybeaver/bollard.git", rev = "cef1cd5" }
 cansi = "2.2"
 clap = { version = "4.4", features = ["derive", "unicode", "color"] }
 crossterm = "0.27"