Merge branch 'develop' of git.roosens.me:Chewing_Bever/fej into develop

pull/59/head
Jef Roosens 2021-05-01 19:12:35 +02:00
commit bef7505631
Signed by: Jef Roosens
GPG Key ID: B580B976584B5F30
3 changed files with 10 additions and 10 deletions

16
Cargo.lock generated
View File

@ -58,9 +58,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
version = "0.7.15"
version = "0.7.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
dependencies = [
"memchr",
]
@ -861,9 +861,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
[[package]]
name = "memchr"
version = "2.3.4"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
[[package]]
name = "migrations_internals"
@ -1342,9 +1342,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.4.6"
version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
checksum = "1efb2352a0f4d4b128f734b5c44c79ff80117351138733f12f982fe3e2b13343"
dependencies = [
"aho-corasick",
"memchr",
@ -1353,9 +1353,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.6.23"
version = "0.6.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
checksum = "00efb87459ba4f6fb2169d20f68565555688e1250ee6825cdf6254f8b48fafb2"
[[package]]
name = "remove_dir_all"

View File

@ -37,7 +37,7 @@ rocket = "0.4.7"
serde = "1.0.125"
chrono = "0.4.19"
chrono-tz = "0.5.3"
regex = "1.4.6"
regex = "1.5.2"
reqwest = { version = "0.11.3", features = ["blocking", "json", "cookies"] }
diesel = { version = "1.4.6", features = ["postgres"] }
diesel_migrations = "1.4.0"

View File

@ -23,7 +23,7 @@ RUN cargo install \
--features frontend
FROM node:15-alpine3.13 AS frontend-builder
FROM node:16-alpine3.13 AS frontend-builder
COPY ./web /app
WORKDIR /app