Merge pull request #40 from Hugo-C/feature/GH-39

GH-39 # Switch to rocket 0.5rc and rust stable

Cargo.toml

@@ -1,25 +1,21 @@
 [package]
 name = "jarm_online"
-version = "0.2.0"
+version = "0.2.2"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rocket = "0.4"
+rocket = { version = "=0.5.0-rc.3", features = ["json"] }
 rust_jarm = "0.3"
 serde = { version = "1.0", features = ["derive"] }
 lazy_static = "1.4"
 regex = "1.7"
-csv = "1.2"
+csv = "1.3"
 openssl = { version = "~0.10.55", features = ["vendored"] }  # Required for sentry
 sentry = "0.31"
-rocket-sentry = "0.7"  # 0.8 require rocket 0.5
+rocket-sentry = { git = "https://github.com/Hugo-C/rocket-sentry", branch = "master" }
 
-[dependencies.rocket_contrib]
-version = "0.4"
-default-features = false
-features = ["json"]
 
 [dev-dependencies]
-rstest = "0.18"
+rstest = "0.18"

Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.72 as build-stage
+FROM rust:1.73 as build-stage
 
 ARG BUILD_TARGET="x86_64-unknown-linux-musl"
 ARG BUILD_OPTIONS="--release  --target $BUILD_TARGET"

Rocket.toml

@@ -1,19 +1,12 @@
-[development]
-address = "localhost"
+[debug]
+address = "127.0.0.1"
 port = 8000
 workers = 2
-keep_alive = 5
-read_timeout = 5
-write_timeout = 5
-log = "normal"
+log_level = "normal"
 limits = { forms = 32768 }
 
-[production]
+[release]
 address = "127.0.0.1"
 port = 8000
-workers = 2
-keep_alive = 5
-read_timeout = 5
-write_timeout = 5
-log = "normal"
+log_level = "normal"
 limits = { forms = 32768 }

docker-compose.yml

@@ -16,9 +16,8 @@ services:
     build: .
     image: jarm_online_api
     container_name: jarm_online_api_container
-    stop_signal: SIGKILL  # SIGTERM is allowed in config starting with rocket.rs 0.5
     environment:
-      - ROCKET_ENV=production
+      - ROCKET_PROFILE=release
       - ROCKET_SENTRY_DSN=${ROCKET_SENTRY_DSN:-https://[email protected]/123}
     ports:
       - "8000:8000"

docker-compose.yml.prod

@@ -19,8 +19,7 @@ services:
   jarm_online_api:
     image: hugocker/jarm_online_api
     container_name: jarm_online_api_container
-    stop_signal: SIGKILL  # SIGTERM is allowed in config starting with rocket.rs 0.5
     environment:
-      - ROCKET_ENV=production
+      - ROCKET_PROFILE=release
       - ROCKET_SENTRY_DSN=${ROCKET_SENTRY_DSN}
     restart: unless-stopped