diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f03adac..03b3fe2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,8 +74,8 @@ build-arm-bin: - build-ui stage: build image: 'rust:latest' - # rules: - # - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH script: - rustup target add armv7-unknown-linux-gnueabihf - apt update @@ -95,8 +95,8 @@ build-win-bin: stage: build tags: - windows - # rules: - # - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH script: - cargo build --release artifacts: diff --git a/Cargo.lock b/Cargo.lock index 388a062..aab47cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1042,6 +1042,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + [[package]] name = "fuchsia-zircon" version = "0.3.3" @@ -1386,6 +1392,27 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +[[package]] +name = "jemalloc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + +[[package]] +name = "jemallocator" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69" +dependencies = [ + "jemalloc-sys", + "libc", +] + [[package]] name = "jobserver" version = "0.1.24" @@ -3135,6 +3162,7 @@ dependencies = [ "base64", "bcrypt", "chrono", + "jemallocator", "jsonwebtoken", "mime_guess", "rand 0.8.4", diff --git a/Dockerfile b/Dockerfile index f794244..fef5097 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM SCRATCH +FROM scratch COPY target/x84-64-unknown-linux-musl/release/vade /app/vade EXPOSE 8080 WORKDIR app