Updated docker file

This commit is contained in:
Joe Bellus 2022-02-11 01:07:01 -05:00
parent 76090f31fc
commit c1c7734d4a
3 changed files with 33 additions and 5 deletions

View File

@ -74,8 +74,8 @@ build-arm-bin:
- build-ui - build-ui
stage: build stage: build
image: 'rust:latest' image: 'rust:latest'
# rules: rules:
# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
script: script:
- rustup target add armv7-unknown-linux-gnueabihf - rustup target add armv7-unknown-linux-gnueabihf
- apt update - apt update
@ -95,8 +95,8 @@ build-win-bin:
stage: build stage: build
tags: tags:
- windows - windows
# rules: rules:
# - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
script: script:
- cargo build --release - cargo build --release
artifacts: artifacts:

28
Cargo.lock generated
View File

@ -1042,6 +1042,12 @@ dependencies = [
"percent-encoding", "percent-encoding",
] ]
[[package]]
name = "fs_extra"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
[[package]] [[package]]
name = "fuchsia-zircon" name = "fuchsia-zircon"
version = "0.3.3" version = "0.3.3"
@ -1386,6 +1392,27 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" 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]] [[package]]
name = "jobserver" name = "jobserver"
version = "0.1.24" version = "0.1.24"
@ -3135,6 +3162,7 @@ dependencies = [
"base64", "base64",
"bcrypt", "bcrypt",
"chrono", "chrono",
"jemallocator",
"jsonwebtoken", "jsonwebtoken",
"mime_guess", "mime_guess",
"rand 0.8.4", "rand 0.8.4",

View File

@ -1,4 +1,4 @@
FROM SCRATCH FROM scratch
COPY target/x84-64-unknown-linux-musl/release/vade /app/vade COPY target/x84-64-unknown-linux-musl/release/vade /app/vade
EXPOSE 8080 EXPOSE 8080
WORKDIR app WORKDIR app