From 2d99712ac3d6f2ebbc933579bee66a6c5b9ce4fa Mon Sep 17 00:00:00 2001 From: nnao45 Date: Thu, 11 Jul 2019 14:32:28 +0900 Subject: [PATCH 1/2] imple , --- Cargo.lock | 2 +- Cargo.toml | 2 +- Dockerfile | 21 +++++++++------------ src/dntker/dntker.rs | 1 + src/dntker/tests.rs | 1 + src/dntker/util/consts.rs | 1 + 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d14179..84bed47 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -85,7 +85,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "dntk" -version = "2.1.16" +version = "2.1.17" dependencies = [ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index dd1bfd5..98fc5c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dntk" -version = "2.1.16" +version = "2.1.17" authors = ["nnao45 "] edition = "2018" license = "MIT" diff --git a/Dockerfile b/Dockerfile index 8ccca8d..7275a98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,17 +3,14 @@ FROM ekidd/rust-musl-builder:nightly-2019-04-25 as builder ENV LINUX_TERM_LIB linux_musl.rs ## Build Cache Dependency Library -RUN mkdir /tmp/dntk -RUN sudo chown -R rust:rust . -WORKDIR /tmp/dntk -COPY Cargo.toml Cargo.lock ./ -RUN mkdir -p src/ && \ - touch src/lib.rs -RUN cargo build --release -## Build Base Library -COPY ./src/ ./src/ -RUN sudo chown -R rust:rust . -RUN cargo build --release +RUN mkdir /app +WORKDIR /app +COPY . . +RUN --mount=type=cache,target=/root/.cargo \ + --mount=type=cache,target=/app/target \ + --mount=type=cache,target=/usr/local/cargo/git \ + --mount=type=cache,target=/usr/local/cargo/registry \ + cargo build --release -Z unstable-options --out-dir /output # Setup Running Container FROM alpine:3.9 @@ -24,7 +21,7 @@ RUN adduser --uid 1000 -D nnao45 ## Install Dependency Module RUN apk add --update --no-cache bc ## Copy The App -COPY --from=builder /tmp/dntk/target/x86_64-unknown-linux-musl/release/dntk /home/nnao45 +COPY --from=builder /output/dntk /home/nnao45 ## Setup The Using App User USER 1000:1000 ## Run diff --git a/src/dntker/dntker.rs b/src/dntker/dntker.rs index 5f7bb0c..49d5c72 100644 --- a/src/dntker/dntker.rs +++ b/src/dntker/dntker.rs @@ -142,6 +142,7 @@ impl Dntker { util::ASCII_CODE_HAT => FilterResult::Calculatable(util::ASCII_CODE_HAT ), // ^ util::ASCII_CODE_PERCENT => FilterResult::Calculatable(util::ASCII_CODE_PERCENT ), // % util::ASCII_CODE_DOT => FilterResult::Calculatable(util::ASCII_CODE_DOT ), // . + util::ASCII_CODE_COMMA => FilterResult::Calculatable(util::ASCII_CODE_COMMA ), // , util::ASCII_CODE_BIKKURI => FilterResult::Calculatable(util::ASCII_CODE_BIKKURI ), // ! util::ASCII_CODE_EQUAL => FilterResult::Calculatable(util::ASCII_CODE_EQUAL ), // = util::ASCII_CODE_PIPE => FilterResult::Calculatable(util::ASCII_CODE_PIPE ), // | diff --git a/src/dntker/tests.rs b/src/dntker/tests.rs index 413774b..287e347 100644 --- a/src/dntker/tests.rs +++ b/src/dntker/tests.rs @@ -36,6 +36,7 @@ mod dntker_tests { assert_eq!(d.filter_char(util::ASCII_CODE_HAT ), FilterResult::Calculatable(util::ASCII_CODE_HAT )); assert_eq!(d.filter_char(util::ASCII_CODE_PERCENT ), FilterResult::Calculatable(util::ASCII_CODE_PERCENT )); assert_eq!(d.filter_char(util::ASCII_CODE_DOT ), FilterResult::Calculatable(util::ASCII_CODE_DOT )); + assert_eq!(d.filter_char(util::ASCII_CODE_COMMA ), FilterResult::Calculatable(util::ASCII_CODE_COMMA )); assert_eq!(d.filter_char(util::ASCII_CODE_BIKKURI ), FilterResult::Calculatable(util::ASCII_CODE_BIKKURI )); assert_eq!(d.filter_char(util::ASCII_CODE_EQUAL ), FilterResult::Calculatable(util::ASCII_CODE_EQUAL )); assert_eq!(d.filter_char(util::ASCII_CODE_PIPE ), FilterResult::Calculatable(util::ASCII_CODE_PIPE )); diff --git a/src/dntker/util/consts.rs b/src/dntker/util/consts.rs index e9ef47b..9607bf3 100644 --- a/src/dntker/util/consts.rs +++ b/src/dntker/util/consts.rs @@ -35,6 +35,7 @@ pub const ASCII_CODE_SLUSH : u8 = 0x2f; // / pub const ASCII_CODE_HAT : u8 = 0x5e; // ^ pub const ASCII_CODE_PERCENT : u8 = 0x25; // % pub const ASCII_CODE_DOT : u8 = 0x2e; // . +pub const ASCII_CODE_COMMA : u8 = 0x2c; // , pub const ASCII_CODE_BIKKURI : u8 = 0x21; // ! pub const ASCII_CODE_EQUAL : u8 = 0x3d; // = pub const ASCII_CODE_PIPE : u8 = 0x7c; // | From 9b4cda84cd960fdd88b04c83339c4fc13018be02 Mon Sep 17 00:00:00 2001 From: nnao45 Date: Thu, 11 Jul 2019 17:53:38 +0900 Subject: [PATCH 2/2] refix --- Dockerfile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7275a98..8ccca8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,14 +3,17 @@ FROM ekidd/rust-musl-builder:nightly-2019-04-25 as builder ENV LINUX_TERM_LIB linux_musl.rs ## Build Cache Dependency Library -RUN mkdir /app -WORKDIR /app -COPY . . -RUN --mount=type=cache,target=/root/.cargo \ - --mount=type=cache,target=/app/target \ - --mount=type=cache,target=/usr/local/cargo/git \ - --mount=type=cache,target=/usr/local/cargo/registry \ - cargo build --release -Z unstable-options --out-dir /output +RUN mkdir /tmp/dntk +RUN sudo chown -R rust:rust . +WORKDIR /tmp/dntk +COPY Cargo.toml Cargo.lock ./ +RUN mkdir -p src/ && \ + touch src/lib.rs +RUN cargo build --release +## Build Base Library +COPY ./src/ ./src/ +RUN sudo chown -R rust:rust . +RUN cargo build --release # Setup Running Container FROM alpine:3.9 @@ -21,7 +24,7 @@ RUN adduser --uid 1000 -D nnao45 ## Install Dependency Module RUN apk add --update --no-cache bc ## Copy The App -COPY --from=builder /output/dntk /home/nnao45 +COPY --from=builder /tmp/dntk/target/x86_64-unknown-linux-musl/release/dntk /home/nnao45 ## Setup The Using App User USER 1000:1000 ## Run