niko/oxkerclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: merge release-v0.2.3 into main

Browse Source
This commit is contained in:
Jack Wills
2023-02-04 04:27:51 +00:00
parent f920fd0a4a 17cbee0ebc
commit 14f544480d
6 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/release-body.md
+2 -12
View File
@@ -1,17 +1,7 @@
### 2023-02-04
### Chores
+ devcontainer.json updated, typos-cli installed, temporary(?) buildkit fix, [3c6a8db6ef74d499b49fabe8912785cac16d9c4b]
+ create_release.sh check for typos, [310a63f4cabaa374797a7e4ed0d7fd1f5e79c8fe]
### Docs
+ AUR install instructions, thanks [orhun](https://github.com/orhun), [c5aa346bca139cc5ece1f4127293977924d16fca]
+ typos fixes, thanks [kianmeng](https://github.com/kianmeng), [5052d7ab0a156c43cadbd922c0019b284f24943a]
+ Readme.md styling tweak, [310a63f4cabaa374797a7e4ed0d7fd1f5e79c8fe]
+ Contributing guide, [5aaa00d6a3c58d98cb250b7b14584238df02961c], [a44b15f76088561a0e272d4e7456197c2aaabdb4]
### Features
+ Use a scratch container for the docker image, should reduce image size by around 60%. This checks for the ENV `OXKER_RUNTIME=container`, which is automatically set by the docker image, [17b71b6b41f6a98a0f92277f40a88f4b1b8a1328]
### Fixes
+ Container runner `FROM scratch` (missing from v0.2.2 D'oh), this now should actually reduce Docker image size by ~60%, [0bd317b7ce6f9f42a614c488099b5fc7a14d91c7]
see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
CHANGELOG.md
+6
View File
@@ -1,3 +1,9 @@
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.2.3'>v0.2.3</a>
### 2023-02-04
### Fixes
+ Container runner `FROM scratch` (missing from v0.2.2 D'oh), this now should actually reduce Docker image size by ~60%, [0bd317b7](https://github.com/mrjackwills/oxker/commit/0bd317b7ce6f9f42a614c488099b5fc7a14d91c7)
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.2.2'>v0.2.2</a>
### 2023-02-04
CONTRIBUTING.md
+1 -1
View File
@@ -11,4 +11,4 @@ Don't hesitate to submit any issues or pull requests, regardless of size.
## Conduct
oxker follow the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct)
oxker follows the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct)
Cargo.lock
Generated
+1 -1
View File
@@ -696,7 +696,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "oxker"
version = "0.2.2"
version = "0.2.3"
dependencies = [
"anyhow",
"bollard",
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "oxker"
version = "0.2.2"
version = "0.2.3"
edition = "2021"
authors = ["Jack Wills <email@mrjackwills.com>"]
description = "A simple tui to view & control docker containers"
containerised/Dockerfile
+3 -3
View File
@@ -2,7 +2,7 @@
## Builder ##
#############
FROM --platform=linux/amd64 rust:slim as builder
FROM --platform=linux/amd64 rust:slim as BUILDER
ARG TARGETARCH
@@ -49,13 +49,13 @@ RUN cp /usr/src/oxker/target/$(cat /.platform)/release/oxker /
## Runtime ##
#############
FROM alpine:latest AS runtime
FROM scratch AS RUNTIME
# Set an ENV that we're running in a container, so that the application can sleep for 250ms at start
ENV OXKER_RUNTIME=container
# Copy application binary from builder image
COPY --from=builder /oxker /usr/local/bin
COPY --from=BUILDER /oxker /app/
# Run the application
# this is used in the application itself, to stop itself show when running from a docker container, so DO NOT EDIT