Skip to content

Commit

Permalink
Merge branch 'release/0.5.13'
Browse files Browse the repository at this point in the history
  • Loading branch information
s3rius committed Nov 1, 2022
2 parents 7b59298 + 8099604 commit cdf7786
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 40 deletions.
49 changes: 20 additions & 29 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rustus"
version = "0.5.12"
version = "0.5.13"
edition = "2021"
description = "TUS protocol implementation written in Rust."
keywords = [
Expand Down Expand Up @@ -33,7 +33,7 @@ actix-web-prom = "^0.6.0"
dyn-clone = "^1.0.5"
actix-cors = "0.6.1"
wildmatch = "2.1.0"
snmalloc-rs = "~0.3.0"
mimalloc = { version = "~0.1.30", default-features = false }

[dependencies.digest]
version = "0.10.3"
Expand Down
6 changes: 0 additions & 6 deletions deploy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM rust:1.64.0-bullseye AS builder

RUN apt-get update -yqq && apt-get install -yqq cmake g++

WORKDIR /app
COPY Cargo.toml Cargo.lock ./
COPY src ./src
Expand All @@ -10,10 +8,6 @@ RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --bin rustus --featur

FROM debian:bullseye-20211201-slim AS base

RUN apt-get update -yqq \
&& apt-get install -yqq libatomic1 \
&& rm -rf /var/lib/apt/lists/*

COPY --from=builder /app/target/release/rustus /usr/local/bin/

ENTRYPOINT ["/usr/local/bin/rustus"]
Expand Down
1 change: 0 additions & 1 deletion deploy/alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ ADD "https://github.com/s3rius/rustus/releases/download/${app_version}/rustus-${
RUN tar xvf *.tar.gz
RUN rm *.tar.gz
RUN mv rustus /bin
RUN apk add --no-cache libatomic

ENTRYPOINT ["/bin/rustus"]

Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ version: 0.2.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.5.12"
appVersion: "0.5.13"


dependencies:
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![cfg_attr(coverage, feature(no_coverage))]

#[global_allocator]
static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;

use std::{collections::HashMap, str::FromStr};

Expand Down

0 comments on commit cdf7786

Please sign in to comment.