Skip to content

Commit de1e87f

Browse files
committed
Merge tag 'v1.3.1' into develop
AArch64 binary and container image. Changelog for v1.3.1: - AArch64 support (#14) - Use docker buildx bake to build container images (#15)
2 parents 1642e5e + 9fa27eb commit de1e87f

10 files changed

Lines changed: 17 additions & 12 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- run: docker buildx bake --push --set '*.cache-from=type=gha' --set '*.cache-to=type=gha,mode=max'
6565
env:
6666
BIN_DIR: "./dist"
67-
VERSION: "1.3.0"
67+
VERSION: "1.3.1"
6868
release:
6969
name: Release
7070
runs-on: ubuntu-20.04

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ jobs:
7171
run: docker buildx bake --set '*.cache-from=type=gha' --set '*.cache-to=type=gha,mode=max' --set 'base.platform=linux/amd64' example
7272
env:
7373
BIN_DIR: ./dist
74-
VERSION: 1.3.0
74+
VERSION: 1.3.1

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [1.3.1] - 2022-06-19
6+
7+
- AArch64 support ([#14](https://github.com/coord-e/magicpak/pull/14))
8+
- Use docker buildx bake to build container images ([#15](https://github.com/coord-e/magicpak/pull/15))
9+
510
## [1.3.0] - 2022-01-11
611

712
- Fix busybox_jail_path file permissions ([#6](https://github.com/coord-e/magicpak/pull/6))

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "magicpak"
3-
version = "1.3.0"
3+
version = "1.3.1"
44
authors = ["coord_e <me@coord-e.com>"]
55
edition = "2021"
66
license = "MIT OR Apache-2.0"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
```dockerfile
1010
# You prepare /bin/your_executable here...
1111

12-
ADD https://github.com/coord-e/magicpak/releases/download/v1.3.0/magicpak-x86_64-unknown-linux-musl /usr/bin/magicpak
12+
ADD https://github.com/coord-e/magicpak/releases/download/v1.3.1/magicpak-x86_64-unknown-linux-musl /usr/bin/magicpak
1313
RUN chmod +x /usr/bin/magicpak
1414

1515
RUN /usr/bin/magicpak -v /bin/your_executable /bundle
@@ -94,7 +94,7 @@ We provide some base images that contain `magicpak` and its optional dependencie
9494
The following is a dockerfile using `magicpak` for a docker image of [`clang-format`](https://clang.llvm.org/docs/ClangFormat.html), a formatter for C/C++/etc. ([example/clang-format](/example/clang-format))
9595

9696
```dockerfile
97-
FROM magicpak/debian:buster-magicpak1.3.0
97+
FROM magicpak/debian:buster-magicpak1.3.1
9898

9999
RUN apt-get -y update
100100
RUN apt-get -y --no-install-recommends install clang-format

docker-bake.hcl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,20 +237,20 @@ group "example" {
237237
target "example-brittany" {
238238
dockerfile = "example/brittany/Dockerfile"
239239
contexts = {
240-
"magicpak/haskell:8.10.2-magicpak1.3.0" = "target:haskell-8102"
240+
"magicpak/haskell:8.10.2-magicpak1.3.1" = "target:haskell-8102"
241241
}
242242
}
243243

244244
target "example-clang-format" {
245245
dockerfile = "example/clang-format/Dockerfile"
246246
contexts = {
247-
"magicpak/debian:buster-magicpak1.3.0" = "target:debian-buster"
247+
"magicpak/debian:buster-magicpak1.3.1" = "target:debian-buster"
248248
}
249249
}
250250

251251
target "example-patchelf" {
252252
dockerfile = "example/patchelf/Dockerfile"
253253
contexts = {
254-
"magicpak/cc:10-magicpak1.3.0" = "target:cc-10"
254+
"magicpak/cc:10-magicpak1.3.1" = "target:cc-10"
255255
}
256256
}

example/brittany/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM magicpak/haskell:8.10.2-magicpak1.3.0
1+
FROM magicpak/haskell:8.10.2-magicpak1.3.1
22

33
RUN apt-get -y update
44
RUN apt-get -y install unzip libtinfo5

example/clang-format/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM magicpak/debian:buster-magicpak1.3.0
1+
FROM magicpak/debian:buster-magicpak1.3.1
22

33
RUN apt-get -y update
44
RUN apt-get -y --no-install-recommends install clang-format

example/patchelf/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM magicpak/cc:10-magicpak1.3.0
1+
FROM magicpak/cc:10-magicpak1.3.1
22

33
WORKDIR /usr/src/patchelf
44
ADD https://github.com/NixOS/patchelf/archive/0.10.tar.gz patchelf.tar.gz

0 commit comments

Comments
 (0)