Skip to content

Commit

Permalink
Adjust the Dockerfile to be more sane
Browse files Browse the repository at this point in the history
  • Loading branch information
bruceadams committed Jan 18, 2019
1 parent fa695c7 commit 59f3d06
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "yj"
version = "0.7.16"
version = "0.7.17"
authors = ["Bruce Adams <[email protected]>"]

categories = ["command-line-utilities"]
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM scratch

COPY target/yj.linux /yj
COPY target/x86_64-unknown-linux-musl/release/yj /

ENTRYPOINT [ "/yj" ]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Simple command line tool to convert a YAML input file into a JSON output file.

```bash
$ yj --help
yj 0.7.16
yj 0.7.17
Bruce Adams <[email protected]>
Read YAML, write JSON

Expand Down
8 changes: 4 additions & 4 deletions release-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
export CXX=clang++
rustup target add x86_64-unknown-linux-musl
cargo build --release --target x86_64-unknown-linux-musl
mv -f "target/x86_64-unknown-linux-musl/release/$BINARY" "target/$BINARY.linux"
cp -fp "target/x86_64-unknown-linux-musl/release/$BINARY" "target/$BINARY.linux"
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
cargo build --release
mv -f "target/release/$BINARY" "target/$BINARY.macos"
cp -fp "target/release/$BINARY" "target/$BINARY.macos"
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
cargo build --release
mv -f "target/release/$BINARY.exe" "target"
cp -fp "target/release/$BINARY.exe" "target"
else
cargo build --release
mv -f "target/release/$BINARY" "target/$BINARY.$TRAVIS_OS_NAME"
cp -fp "target/release/$BINARY" "target/$BINARY.$TRAVIS_OS_NAME"
fi

0 comments on commit 59f3d06

Please sign in to comment.