Merge branch '19-broken-debug' into develop

master
Jef Roosens 2021-04-13 21:57:58 +02:00
commit baca622340
Signed by: Jef Roosens
GPG Key ID: B580B976584B5F30
3 changed files with 6 additions and 4 deletions

View File

@ -4,6 +4,8 @@ FROM alpine:latest AS builder
ENV PATH "$PATH:/root/.cargo/bin"
# Needed for proper compiling of openssl-dev
ENV RUSTFLAGS "-C target-feature=-crt-static"
# Otherwise, the debug build can't be used from the container
ENV ROCKET_ADDRESS "0.0.0.0"
WORKDIR /usr/src/app

View File

@ -1,6 +1,6 @@
FROM chewingbever/fej-builder:latest
ENV RUST_BACKTRACE=1
ENV RUST_BACKTRACE 1
ENTRYPOINT ["cargo"]
CMD ["run"]

View File

@ -15,9 +15,9 @@ pub fn routes() -> Vec<rocket::Route> {
/// # Arguments
///
/// * `search_term` - Search term to use to look for streets
#[get("/search?<search_term>")]
pub fn route_search_streets(search_term: String) -> Result<Json<Vec<Street>>, Status> {
Ok(Json(search_streets(search_term.as_str())?))
#[get("/search?<q>")]
pub fn route_search_streets(q: String) -> Result<Json<Vec<Street>>, Status> {
Ok(Json(search_streets(q.as_str())?))
}
/// Handles returning of pickup times for a specific address. It returns a list