chore: merge release-v0.5.0 into main

.devcontainer/devcontainer.json

@@ -15,30 +15,25 @@
 		"--security-opt",
 		"seccomp=unconfined"
 	],
-
 	"postCreateCommand": "rustup target add x86_64-unknown-linux-musl && cargo install cross typos-cli cargo-expand",
-
 	"mounts": [
-		"source=/etc/timezone,target=/etc/timezone,type=bind,readonly"
+		"source=/run/shm,target=/dev/shm,type=bind"
 	],
-
 	"customizations": {
 		"vscode": {
 			// Add the IDs of extensions you want installed when the container is created.
 			"extensions": [
 				"bmuskalla.vscode-tldr",
 				"christian-kohler.path-intellisense",
-				"ms-vscode.live-server",
+				"foxundermoon.shell-format",
 				"mutantdino.resourcemonitor",
-				"rangav.vscode-thunder-client",
 				"redhat.vscode-yaml",
 				"rust-lang.rust-analyzer",
 				"serayuzgur.crates",
 				"tamasfe.even-better-toml",
 				"timonwong.shellcheck",
 				"vadimcn.vscode-lldb"
 			],
-
 			// Set *default* container specific settings.json values on container create.
 			"settings": {
 				"lldb.executable": "/usr/bin/lldb",
@@ -56,10 +51,10 @@
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {
 			"version": "latest",
 			"moby": true,
-			"dockerDashComposeVersion":"v2"
+			"dockerDashComposeVersion": "v2"
 		},
 		"ghcr.io/devcontainers/features/git:1": {
-				"version":"os-provided"
-			}
+			"version": "os-provided"
+		}
 	}
 }

.gitattributes

@@ -1,4 +1 @@
-*.sh eol=lf
-*.md eol=CRLF
-*.txt eol=lf
-
+* text=auto

.github/release-body.md

@@ -1,18 +1,26 @@
-### 2023-11-21
+### 2024-01-05
 
 ### Chores
-+ workflow dependencies updated, [6a4cf6490d08b976734e2bc8186d94c095700558]
-+ dependencies updated, [e301b51891e03ea40b2f904583119da3bc4daf53], [81d5b326db8881263f2c9072e1426948e41b4a0f], [294cc2684f42daab9d51601e235a384f55617678]
-+ lints moved from main.rs to Cargo.toml, [2de76e2f358be9c1500ca3dc4f9df0979ed8ed28]
-+ .devcontainer updated, [37d2ee915625806dd11c2cc816a892aae12a777c]
++ .devcontainer updated, [2313618eb1493ce41d70847b888c32b65fdc40ea], [5af6b8bcd31c3c38ff5a5799c76dc1cbe1167763], [9b0b6b10c3a0c1d5095490cfd3cda18d252f38f5]
++ alpine version bump, [061de032dad935c56c6caab419ecb5c9bbac4c7e]
++ dependencies updated, [0890991ff1a239fe2d556a0c4eac6ae05beb9b50], [0a7b266b2a358a4788ae877ca8a97f08eac4eef2], [333621f1a7321c1fdf73fd35dd7f3ab165a9dc64], [3e51889cd8a552b1da463ae6a40d5de6eec188f5], [a179bb6f6a7e076269fa830f56c0d4a31cf8488a]
++ file formatting, [eb5e74ae67d815bf49f241d2baf319e41cf9adf8]
++ Rust 1.75.0 linting, [81be75f27fd32a59ebff57e44c5022ff862df84b]
+
+### Docs
++ screenshot updated, [0231d1bdcda304300d289243a95044ab3bdce85c]
++ comment typo, [0ad1ec9d85d6f0cac743b4421d0ad03432c9d717]
 
 ### 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]
++ re-arrange columns, container name is now the first column, added a ContainerName & ContainerImage struct via `string_wrapper` macro, closes #32, [e936bb4b78980d0e34a1ef5e9f6f82a9ed0ddc7f]
 
 ### 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]
++ Docker Commands hidden, [4301e4709f99fc23ee438bf345b0dc698a05dc4e]
++ .gitattributes, [1234ea53897b2ed6ada0eb18cd81b8783a5dc5f5]
+
+### Refactors
++ GitHub workflow action improved, [04b66af2b60c96cfbece0b13109e30b08ef35cc4]
++ sort_containers, [ccf8b55a7495982f72b4fb3af6e11a9bd7465216]
++ string_wrapper .get() return `&str`, [a722731c6a77e00d1fb13967b51400aa34e72213]
 
 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

@@ -2,22 +2,29 @@ name: Release CI
 on:
   push:
     tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - "v[0-9]+.[0-9]+.[0-9]+"
 
 jobs:
-
   #################################################
   ## Cross platform binary build for release page #
   #################################################
 
   cross_platform_build:
     strategy:
       matrix:
-        platform:
+        include:
           - target: x86_64-unknown-linux-musl
+            output_name: linux_x86_64.tar.gz
+
           - target: aarch64-unknown-linux-musl
+            output_name: linux_aarch64.tar.gz
+
           - target: arm-unknown-linux-musleabihf
+            output_name: linux_armv6.tar.gz
+
           - target: x86_64-pc-windows-gnu
+            output_name: windows_x86_64.zip
+
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -31,35 +38,29 @@ jobs:
       - name: install cross
         run: cargo install cross --git https://github.com/cross-rs/cross
 
-      # Set env's
-      - name: set names
-        run: |
-              translate_platform() { case "$1" in x86_64-unknown-linux-musl) echo "linux_x86_64.tar.gz";; aarch64-unknown-linux-musl) echo "linux_aarch64.tar.gz";; arm-unknown-linux-musleabihf) echo "linux_armv6.tar.gz";; x86_64-pc-windows-gnu) echo "windows_x86_64.zip";; *) echo "Error: Unsupported platform $1"; exit 1;; esac; }
-              target_platform="${{ matrix.platform.target }}"
-              output_name=$(translate_platform "$target_platform")
-              echo "TARGET_OUTPUT_NAME=${output_name}" >> $GITHUB_ENV
-              echo "TARGET_PLATFORM=${target_platform}" >> $GITHUB_ENV
-     
       # Build binary
       - name: build
-        run: cross build --target "${TARGET_PLATFORM}" --release
-
-      # Compress, rename, and move
-      - name: compress
+        run: cross build --target ${{ matrix.target }} --release
+
+      # Compress the output
+      - name: compress windows
+        if: matrix.target == 'x86_64-pc-windows-gnu'
+        run: |
+          zip -j "./oxker_${{ matrix.output_name }}" target/${{ matrix.target }}/release/oxker.exe
+
+      # Compress the output
+      - name: compress linux
+        if: matrix.target != 'x86_64-pc-windows-gnu'
         run: |
-            if [[ $TARGET_PLATFORM == *windows-gnu* ]]; then
-               zip -j "./oxker_${TARGET_OUTPUT_NAME}" target/${TARGET_PLATFORM}/release/oxker.exe
-            else
-              tar -C "target/${TARGET_PLATFORM}/release" -czf "./oxker_${TARGET_OUTPUT_NAME}" oxker
-            fi
+          tar -C "target/${{ matrix.target }}/release" -czf "./oxker_${{ matrix.output_name }}" oxker
 
       # Upload output for release page
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
           if-no-files-found: error
-          name: ${{ env.TARGET_PLATFORM }}
-          path: oxker_${{ env.TARGET_OUTPUT_NAME }}
+          name: ${{ matrix.target }}
+          path: oxker_${{ matrix.output_name }}
           retention-days: 1
 
   ###################
@@ -91,7 +92,7 @@ jobs:
   ##################
   ## Cargo publish #
   ##################
-  
+
   cargo_publish:
     needs: [create_release]
     runs-on: ubuntu-latest
@@ -103,12 +104,11 @@ jobs:
         uses: katyo/publish-crates@v1
         with:
           registry-token: ${{ secrets.CRATES_IO_TOKEN }}
-
 
   #########################################
   ## Build images for Dockerhub & ghcr.io #
   #########################################
-  
+
   image_build:
     needs: [cargo_publish]
     runs-on: ubuntu-latest
@@ -138,7 +138,7 @@ jobs:
         id: buildx
         with:
           install: true
-      - name: Build for Dockerhub & ghcr.io 
+      - name: Build for Dockerhub & ghcr.io
         run: |
           docker build --platform linux/arm/v6,linux/arm64,linux/amd64 \
           -t ${{ secrets.DOCKERHUB_USERNAME }}/oxker:latest \
@@ -147,4 +147,4 @@ jobs:
           -t ghcr.io/${{ github.repository_owner }}/oxker:${{env.CURRENT_SEMVER}} \
           --provenance=false --sbom=false \
           --push \
-          -f containerised/Dockerfile .
+          -f containerised/Dockerfile .

CHANGELOG.md

@@ -1,3 +1,29 @@
+# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.5.0'>v0.5.0</a>
+### 2024-01-05
+
+### Chores
++ .devcontainer updated, [2313618e](https://github.com/mrjackwills/oxker/commit/2313618eb1493ce41d70847b888c32b65fdc40ea), [5af6b8bc](https://github.com/mrjackwills/oxker/commit/5af6b8bcd31c3c38ff5a5799c76dc1cbe1167763), [9b0b6b10](https://github.com/mrjackwills/oxker/commit/9b0b6b10c3a0c1d5095490cfd3cda18d252f38f5)
++ alpine version bump, [061de032](https://github.com/mrjackwills/oxker/commit/061de032dad935c56c6caab419ecb5c9bbac4c7e)
++ dependencies updated, [0890991f](https://github.com/mrjackwills/oxker/commit/0890991ff1a239fe2d556a0c4eac6ae05beb9b50), [0a7b266b](https://github.com/mrjackwills/oxker/commit/0a7b266b2a358a4788ae877ca8a97f08eac4eef2), [333621f1](https://github.com/mrjackwills/oxker/commit/333621f1a7321c1fdf73fd35dd7f3ab165a9dc64), [3e51889c](https://github.com/mrjackwills/oxker/commit/3e51889cd8a552b1da463ae6a40d5de6eec188f5), [a179bb6f](https://github.com/mrjackwills/oxker/commit/a179bb6f6a7e076269fa830f56c0d4a31cf8488a)
++ file formatting, [eb5e74ae](https://github.com/mrjackwills/oxker/commit/eb5e74ae67d815bf49f241d2baf319e41cf9adf8)
++ Rust 1.75.0 linting, [81be75f2](https://github.com/mrjackwills/oxker/commit/81be75f27fd32a59ebff57e44c5022ff862df84b)
+
+### Docs
++ screenshot updated, [0231d1bd](https://github.com/mrjackwills/oxker/commit/0231d1bdcda304300d289243a95044ab3bdce85c)
++ comment typo, [0ad1ec9d](https://github.com/mrjackwills/oxker/commit/0ad1ec9d85d6f0cac743b4421d0ad03432c9d717)
+
+### Features
++ re-arrange columns, container name is now the first column, added a ContainerName & ContainerImage struct via `string_wrapper` macro, closes [#32](https://github.com/mrjackwills/oxker/issues/32), [e936bb4b](https://github.com/mrjackwills/oxker/commit/e936bb4b78980d0e34a1ef5e9f6f82a9ed0ddc7f)
+
+### Fixes
++ Docker Commands hidden, [4301e470](https://github.com/mrjackwills/oxker/commit/4301e4709f99fc23ee438bf345b0dc698a05dc4e)
++ .gitattributes, [1234ea53](https://github.com/mrjackwills/oxker/commit/1234ea53897b2ed6ada0eb18cd81b8783a5dc5f5)
+
+### Refactors
++ GitHub workflow action improved, [04b66af2](https://github.com/mrjackwills/oxker/commit/04b66af2b60c96cfbece0b13109e30b08ef35cc4)
++ sort_containers, [ccf8b55a](https://github.com/mrjackwills/oxker/commit/ccf8b55a7495982f72b4fb3af6e11a9bd7465216)
++ string_wrapper .get() return `&str`, [a722731c](https://github.com/mrjackwills/oxker/commit/a722731c6a77e00d1fb13967b51400aa34e72213)
+
 # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.4.0'>v0.4.0</a>
 ### 2023-11-21