1
0
Fork 0

Compare commits

...

3 Commits

Author SHA1 Message Date
Ambrose Chua ed19c269c4
Run rustfmt
continuous-integration/drone/push Build is failing Details
2019-08-04 05:19:20 +08:00
Ambrose Chua 282d58bf7b
Cleanup 2019-08-04 05:14:39 +08:00
Ambrose Chua a1a8dc173f
Add libssl 2019-08-04 05:06:37 +08:00
2 changed files with 23 additions and 11 deletions

View File

@ -23,6 +23,9 @@ LABEL org.label-schema.schema-version="1.0"
# copy binary and ca certs
COPY --from=build /paste /paste
RUN apt-get update
&& apt-get install -y libssl-dev
&& rm -rf /var/lib/apt/lists
COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
EXPOSE 8000

View File

@ -1,8 +1,9 @@
#![feature(proc_macro_hygiene, decl_macro)]
#[macro_use] extern crate rocket;
use rocket::State;
#[macro_use]
extern crate rocket;
use rocket::response::content;
use rocket::State;
use core::time::Duration;
use futures::future::Future;
@ -10,12 +11,9 @@ use futures::future::Future;
use cuid::slug;
use rusoto_core::region::Region;
use rusoto_credential::AwsCredentials;
use rusoto_credential::EnvironmentProvider;
use rusoto_credential::ProvideAwsCredentials;
use rusoto_credential::{AwsCredentials, EnvironmentProvider, ProvideAwsCredentials};
use rusoto_s3::util::{PreSignedRequest, PreSignedRequestOption};
use rusoto_s3::PutObjectRequest;
use rusoto_s3::util::PreSignedRequestOption;
use rusoto_s3::util::PreSignedRequest;
#[get("/")]
fn index() -> content::Html<&'static str> {
@ -92,7 +90,10 @@ fn upload(api: State<Api>) -> String {
}
fn main() {
rocket::ignite().manage(Api::new()).mount("/", routes![index, upload]).launch();
rocket::ignite()
.manage(Api::new())
.mount("/", routes![index, upload])
.launch();
}
struct Api {
@ -131,10 +132,15 @@ impl Api {
slug().unwrap()
}
fn read_region() -> String {
std::env::var("AWS_DEFAULT_REGION").or_else(|_| std::env::var("AWS_REGION")).map_err(|_| RegionError::new("No AWS_DEFAULT_REGION in environment")).unwrap()
std::env::var("AWS_DEFAULT_REGION")
.or_else(|_| std::env::var("AWS_REGION"))
.map_err(|_| RegionError::new("No AWS_DEFAULT_REGION in environment"))
.unwrap()
}
fn read_region_endpoint() -> String {
std::env::var("AWS_BASE_URL").map_err(|_| RegionError::new("No AWS_BASE_URL in environment")).unwrap()
std::env::var("AWS_BASE_URL")
.map_err(|_| RegionError::new("No AWS_BASE_URL in environment"))
.unwrap()
}
}
@ -144,7 +150,10 @@ struct RegionError {
}
impl RegionError {
pub fn new<S>(message: S) -> Self where S: ToString {
pub fn new<S>(message: S) -> Self
where
S: ToString,
{
RegionError {
message: message.to_string(),
}