diff --git a/.github/release-body.md b/.github/release-body.md index f17bc3a..da05c7b 100644 --- a/.github/release-body.md +++ b/.github/release-body.md @@ -1,16 +1,8 @@ ### 2025-08-21 -### Chores -+ Dependencies updated, [ced885e0128b6d5d3a3c7cb97d7e53bc2da64893], [f9b40ea03d0e70e235c28646ff3f9ebb468a904d] -+ Rust 1.89 linting, [79d19ceeb81ae60bc5562683e405d6e74e6f2578] -+ GitHub workflow updated, [08384200558fa1b9d378ea62ea832708caebaa91], [6573af1ed7d382a81c1305397e904066bb8395a8] +### Reverts ++ GitHub workflow reverted, [d1b69858c622636afbc46db7d37cf91e58d61212] -### Features -+ Horizontally scroll across logs. By default use `←` & `→` keys to traverse horizontally across the lines when logs panel selected. Updated `config.toml` with `log_scroll_forward` and `log_scroll_back` [c190f0206cc55b8e45b8373f9be954e828c18b3b], [8939ac0345326633e794cc10a981a1f3c5c07549] -+ Force clear screen & redraw of UI. By default uses `f` key, `config.toml` updated with `force_redraw` [50edbc0cc09db864835fe81a03cba8eadafe548b] -+ Increase scroll speed using the `ctrl` key in conjuction with a scroll key, `config.toml` updated with `scroll_modifier`. The next release will remove `scroll_down_many` & `scroll_down_up` keys, [c5bbffdb5f9e800951e4060aa6aee8e00db589aa] - -### Refactors -+ remove macos cfg none-const functions, Zigbuild now uses Rust 1.87.0, [eb686e2c952e04da74b3e12c0bfa015ec4615e1d] +see [v0.11.0 release notes](https://github.com/mrjackwills/oxker/releases/tag/v0.11.0) for more information about v0.11 release see CHANGELOG.md for more details diff --git a/.github/workflows/create_release_and_build.yml b/.github/workflows/create_release_and_build.yml index 7b03691..bc81a11 100644 --- a/.github/workflows/create_release_and_build.yml +++ b/.github/workflows/create_release_and_build.yml @@ -121,24 +121,26 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Build and push Docker image - uses: docker/build-push-action@v6 + - name: Write release version to env + run: | + CURRENT_SEMVER=${GITHUB_REF_NAME#v} + echo "CURRENT_SEMVER=$CURRENT_SEMVER" >> $GITHUB_ENV + + - uses: docker/setup-buildx-action@v3 + id: buildx with: - context: . - file: ./containerised/Dockerfile - push: true - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/{{ github.event.repository.name }}:latest - ${{ secrets.DOCKERHUB_USERNAME }}/{{ github.event.repository.name }}:${{env.CURRENT_SEMVER}} - ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:latest - ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ env.CURRENT_SEMVER }} - platforms: linux/arm/v6,linux/arm64,linux/amd64 - provenance: false - sbom: false + install: true + - name: Build for Dockerhub & ghcr.io + run: | + docker build --platform linux/arm/v6,linux/arm64,linux/amd64 \ + -t ${{ secrets.DOCKERHUB_USERNAME }}/oxker:latest \ + -t ${{ secrets.DOCKERHUB_USERNAME }}/oxker:${{env.CURRENT_SEMVER}} \ + -t ghcr.io/${{ github.repository_owner }}/${{ github.ref_name }}:latest \ + -t ghcr.io/${{ github.repository_owner }}/${{ github.ref_name }}:${{env.CURRENT_SEMVER}} \ + --provenance=false --sbom=false \ + --push \ + -f containerised/Dockerfile . ######################## # Publish to crates.io # diff --git a/CHANGELOG.md b/CHANGELOG.md index d17d0fe..6a77596 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v0.11.1 +### 2025-08-21 + +### Reverts ++ GitHub workflow reverted, [d1b69858](https://github.com/mrjackwills/oxker/commit/d1b69858c622636afbc46db7d37cf91e58d61212) + +see [v0.11.0 release notes](https://github.com/mrjackwills/oxker/releases/tag/v0.11.0) for more information about v0.11 release + # v0.11.0 ### 2025-08-21 diff --git a/Cargo.lock b/Cargo.lock index 7d2cf58..32bb4de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1193,7 +1193,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "oxker" -version = "0.11.0" +version = "0.11.1" dependencies = [ "anyhow", "bollard", diff --git a/Cargo.toml b/Cargo.toml index 83e4ff0..e86ae27 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxker" -version = "0.11.0" +version = "0.11.1" edition = "2024" authors = ["Jack Wills "] description = "A simple tui to view & control docker containers" diff --git a/README.md b/README.md index 1c85e30..78ec7b6 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ In application controls, these, amongst many other settings, can be customized w | ```( tab )``` or ```( shift+tab )``` | Change panel, clicking on a panel also changes the selected panel.| | ```( ↑ ↓ )``` or ```( j k )``` or ```( PgUp PgDown )``` or ```( Home End )```| Scroll line in selected panel - mouse wheel will also scroll.| | ```( ← → )``` | When logs panel selected, scroll horizontally across the text of the logs.| -| ```( ctrl )``` | Increase scroll speed, used in conjuction scroll keys.| +| ```( ctrl )``` | Increase scroll speed, used in conjuction with scroll keys.| | ```( enter )```| Run selected docker command.| | ```( 1-9 )``` | Sort containers by heading, clicking on headings also sorts the selected column. | | ```( 0 )``` | Stop sorting.|