diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..eb5a316 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +target diff --git a/Cargo.lock b/Cargo.lock index 5df7241..a20a9b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -506,7 +506,7 @@ dependencies = [ "num-integer", "num-rational", "once_cell", - "paste 1.0.5", + "paste", "pretty-hex", "thiserror", ] @@ -575,29 +575,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", -] - [[package]] name = "input_buffer" version = "0.4.0" @@ -701,17 +678,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "lib-gst-meet-py" -version = "0.1.0" -dependencies = [ - "anyhow", - "glib", - "lib-gst-meet", - "pyo3", - "tokio", -] - [[package]] name = "libc" version = "0.2.99" @@ -940,31 +906,12 @@ dependencies = [ "winapi", ] -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - [[package]] name = "paste" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", -] - [[package]] name = "pem" version = "0.8.3" @@ -1066,12 +1013,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "1.0.28" @@ -1081,54 +1022,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "pyo3" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af205762ba65eec9f27a2fa1a57a40644e8e3368784b8c8b2f2de48f6e8ddd96" -dependencies = [ - "cfg-if", - "indoc", - "libc", - "parking_lot", - "paste 0.1.18", - "pyo3-build-config", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755944027ce803c7238e59c5a18e59c1d0a4553db50b23e9ba209a568353028d" -dependencies = [ - "once_cell", -] - -[[package]] -name = "pyo3-macros" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd31b36bccfd902c78804bd96c28ea93eac6fa0ca311f9d21ef2230b6665b29a" -dependencies = [ - "pyo3-macros-backend", - "quote", - "syn", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c21c59ba36db9c823e931c662766b0dd01a030b1d96585b67d8857a96a56b972" -dependencies = [ - "proc-macro2", - "pyo3-build-config", - "quote", - "syn", -] - [[package]] name = "quick-xml" version = "0.20.0" @@ -1703,12 +1596,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -[[package]] -name = "unindent" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" - [[package]] name = "untrusted" version = "0.7.1" diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b8f50bd --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM docker.io/rust:1.54-alpine3.14 AS builder +RUN apk --update --no-cache add build-base pkgconf glib-dev gstreamer-dev libnice-dev +COPY . . +RUN cargo build --release -p gst-meet + +FROM docker.io/alpine:3.14 +RUN apk --update --no-cache add glib gstreamer libnice +COPY --from=builder target/release/gst-meet /usr/local/bin +ENTRYPOINT ["/usr/local/bin/gst-meet"] \ No newline at end of file diff --git a/nice-gst-meet/src/candidate.rs b/nice-gst-meet/src/candidate.rs index 9e88b37..3e368ad 100644 --- a/nice-gst-meet/src/candidate.rs +++ b/nice-gst-meet/src/candidate.rs @@ -141,7 +141,7 @@ impl Candidate { .as_bytes() .iter() .take(32) - .map(|c| *c as i8) + .map(|c| *c as c_char) .collect(); bytes.resize(33, 0); self.0.foundation.copy_from_slice(&bytes);