Next tide release and bump of rust runtime (#835)

Co-authored-by: Kamran Shamsi <[email protected]>
appsody · Jun 23, 2020 · 9cff0b9 · 9cff0b9
1 parent fe8e2b8
commit 9cff0b9
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/experimental/rust-tide/README.md b/experimental/rust-tide/README.md
@@ -4,7 +4,7 @@ The Rust Tide stack provides a consistent way of developing [tide](https://githu
 
 Designed to be used with [Appsody](https://appsody.dev/) an [open source](https://github.com/appsody/) development and operations accelerator for containers.
 
-This stack is based on the `Rust 1.43.1` runtime.
+This stack is based on the `Rust 1.44.0-buster` runtime release.
 
 ## Templates
 

diff --git a/experimental/rust-tide/image/Dockerfile-stack b/experimental/rust-tide/image/Dockerfile-stack
@@ -1,4 +1,4 @@
-FROM rust:1.43.1-buster
+FROM rust:1.44.0-buster
 
 RUN apt-get update && apt-get install -y gdbserver 
 
@@ -17,6 +17,7 @@ ENV APPSODY_RUN_KILL=true
 ENV APPSODY_DEBUG="cargo build --manifest-path ../server/bin/Cargo.toml && gdbserver localhost:1234 /project/server/bin/target/debug/rust-tide-server"
 ENV APPSODY_DEBUG_ON_CHANGE="$APPSODY_DEBUG"
 ENV APPSODY_DEBUG_KILL=true
+ENV APPSODY_DEBUG_PORT=1234
 
 ENV APPSODY_TEST="/project/test-stack.sh"
 ENV APPSODY_TEST_ON_CHANGE=$APPSODY_TEST
@@ -32,5 +33,4 @@ WORKDIR /project/user-app
 ENV PORT=8000
 
 EXPOSE 8000
-EXPOSE 1234
-EXPOSE 5000
+EXPOSE 1234
diff --git a/experimental/rust-tide/image/project/Dockerfile b/experimental/rust-tide/image/project/Dockerfile
@@ -1,6 +1,6 @@
-FROM docker.io/number9/rust-tide-base:0.2.0 as server
+FROM docker.io/number9/rust-tide-base:0.3.0 as server
 
-FROM rust:1.43.1-buster as builder
+FROM rust:1.44.0-buster as builder
 
 COPY --from=server /project/server /project/server
 

diff --git a/experimental/rust-tide/image/project/server/bin/Cargo.toml b/experimental/rust-tide/image/project/server/bin/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tide = { version = "0.10" }
+tide = { version = "0.11" }
 async-std = { version = "1" }
 application = { package = "rust-tide-default", path = "/project/user-app"}
diff --git a/experimental/rust-tide/image/project/server/bin/Dockerfile b/experimental/rust-tide/image/project/server/bin/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.43.1-buster
+FROM rust:1.44.0-buster
 # This file is used to publish the server as a base image.
 # docker build -t docker.io/number9/rust-tide-base:v1.0.0 .
 # docker push docker.io/number9/rust-tide-base:v1.0.0 .

diff --git a/experimental/rust-tide/stack.yaml b/experimental/rust-tide/stack.yaml
@@ -1,5 +1,5 @@
 name: Rust Tide
-version: 0.2.0
+version: 0.3.0
 description: Tide web framework for Rust
 license: Apache-2.0
 language: rust

diff --git a/experimental/rust-tide/templates/default/Cargo.toml b/experimental/rust-tide/templates/default/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tide = { version = "0.10" }
+tide = { version = "0.11" }
 http-types = "2.0.1"
 async-std = { version = "1" }
 surf = { version = "2.0.0-alpha.3", default-features = false, features = ["h1-client"] }
diff --git a/experimental/rust-tide/templates/default/src/lib.rs b/experimental/rust-tide/templates/default/src/lib.rs
@@ -1,5 +1,5 @@
 pub fn app() -> tide::Server<()> {    
     let mut api = tide::new();
-    api.at("/").get(|_| async move { Ok("Hello, world!") });
+    api.at("/").get(|_| async { Ok("Hello, world!") });
     api
 }