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

Cargo.lock

@@ -1342,9 +1342,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.4.5"
+version = "1.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
+checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
 dependencies = [
  "aho-corasick",
  "memchr",

Cargo.toml

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

docker/Dockerfile.rel

@@ -23,7 +23,7 @@ RUN cargo install \
 
 
 # Now, we create the actual image
-FROM alpine:3.12.5
+FROM alpine:3.13.5
 COPY ./docker/crontab /var/spool/cron/crontabs/fej
 
 # Install some dynamic libraries needed for everything to work