Skip to content

Commit 001e485

Browse files
committed
Merge tag 'v1.3.0' into develop
Bug fixes and dependency updates. Changelog for v1.3.0: - Fix busybox_jail_path file permissions ([#6](#6)) - Update and renew dependencies ([#7](#7)) - Fix usage of ExitStatus::from_raw and remove Error::DynamicSignaled ([#9](#9)) - Several CI fixes ([#8](#8), [#10](#10)) - This changed how `busybox` installed in the container images
2 parents 397cd7c + 93f4461 commit 001e485

File tree

8 files changed

+16
-8
lines changed

8 files changed

+16
-8
lines changed

CHANGELOG.md

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

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

5+
## [1.3.0] - 2022-01-11
6+
7+
- Fix busybox_jail_path file permissions ([#6](https://github.com/coord-e/magicpak/pull/6))
8+
- Update and renew dependencies ([#7](https://github.com/coord-e/magicpak/pull/7))
9+
- Fix usage of ExitStatus::from_raw and remove Error::DynamicSignaled ([#9](https://github.com/coord-e/magicpak/pull/9))
10+
- Several CI fixes ([#8](https://github.com/coord-e/magicpak/pull/8), [#10](https://github.com/coord-e/magicpak/pull/10))
11+
- This changed how `busybox` installed in the container images
12+
513
## [1.2.0] - 2021-01-11
614

715
- Fixed infinite recursion caused by mutually dependent shared libraries. (#[3](https://github.com/coord-e/magicpak/pulls/3))

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.2.0"
3+
version = "1.3.0"
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.2.0/magicpak-x86_64-unknown-linux-musl /usr/bin/magicpak
12+
ADD https://github.com/coord-e/magicpak/releases/download/v1.3.0/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.2.0
97+
FROM magicpak/debian:buster-magicpak1.3.0
9898

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

dockerfile/images.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.2.0",
2+
"version": "1.3.0",
33
"images": {
44
"haskell": {
55
"base": "debian",

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.2.0
1+
FROM magicpak/haskell:8.10.2-magicpak1.3.0
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.2.0
1+
FROM magicpak/debian:buster-magicpak1.3.0
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.2.0
1+
FROM magicpak/cc:10-magicpak1.3.0
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)