Merge branch 'master' into rocket-0.4

# Conflicts:
#	src/api/core/mod.rs
This commit is contained in:
Daniel García committed 2018-11-09 16:06:24 +01:00
commit 4638786507
3 files changed
+24 -16

No files matched your search

+1 -1
View File
@@ -79,7 +79,7 @@ RUN cargo build --release --target=aarch64-unknown-linux-gnu -v
######################## RUNTIME IMAGE ########################
# Create a new stage with a minimal image
# because we already have a binary built
FROM resin/aarch64-debian:stretch
FROM balenalib/aarch64-debian:stretch
ENV ROCKET_ENV "staging"
ENV ROCKET_PORT=80