aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2021-04-26 13:28:07 -0700
committerFuwn <[email protected]>2021-04-26 13:28:07 -0700
commit2bf832ca6015daa7898c2ff587ad3e9850137db2 (patch)
tree90f185839b777b0c4f89dcdc281a0aa84da0f4be
parentfmt: Fix whitespace (diff)
parentfix: License to SPDX format (diff)
downloadwhirl-2bf832ca6015daa7898c2ff587ad3e9850137db2.tar.xz
whirl-2bf832ca6015daa7898c2ff587ad3e9850137db2.zip
Merge branch 'develop' of https://github.com/Whirlsplash/whirl into develop
-rw-r--r--Cargo.toml2
-rw-r--r--Dockerfile7
2 files changed, 7 insertions, 2 deletions
diff --git a/Cargo.toml b/Cargo.toml
index de0fd83..09e8bdd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ documentation = "https://www.whirlsplash.org"
readme = "README.md"
homepage = "https://whirlsplash.org"
repository = "https://github.com/Whirlsplash/whirl"
-license = "GPLv3"
+license = "GPL-3.0-only"
# license-file = "LICENSE"
keywords = ["rust", "worldserver", "whirl", "whirlsplash"]
publish = false
diff --git a/Dockerfile b/Dockerfile
index a3f1595..70d6ac4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,8 @@
+# # NOTICE
+# This Dockerfile is *probably* not stable as of 2021. 04. 25.
+#
+# Can you use it? Yes, but you probably shouldn't.
+
FROM rustlang/rust:nightly-slim AS build
WORKDIR /src/whirl
@@ -10,4 +15,4 @@ FROM ubuntu:18.04
COPY --from=build /src/whirl/target/release/whirl /usr/local/bin/whirl
-CMD ["usr/local/bin/whirl"]
+CMD ["usr/local/bin/whirl", "run"]