Merge pull request 'Fix license.' (#190) from q-b/conduit-fork:license into master

Reviewed-on: https://git.koesters.xyz/timo/conduit/pulls/190
Reviewed-by: Timo Kösters <timo@koesters.xyz>
This commit is contained in:
Timo Kösters 2020-08-17 14:13:19 +02:00
commit 6191c3bd00
3 changed files with 3 additions and 3 deletions

View file

@ -1 +1 @@
- [ ] I agree to release my code and all other changes of this PR under the AGPL-3.0 license
- [ ] I agree to release my code and all other changes of this PR under the AGPL-3.0-only license

View file

@ -1,7 +1,7 @@
[package]
name = "conduit"
description = "A Matrix homeserver written in Rust"
license = "AGPL-3.0"
license = "AGPL-3.0-only"
authors = ["timokoesters <timo@koesters.xyz>"]
homepage = "https://conduit.rs"
repository = "https://git.koesters.xyz/timo/conduit"

View file

@ -54,7 +54,7 @@ LABEL org.opencontainers.image.created=${CREATED} \
org.opencontainers.image.revision=${GIT_REF} \
org.opencontainers.image.source="https://git.koesters.xyz/timo/conduit.git" \
org.opencontainers.image.documentation.="" \
org.opencontainers.image.licenses="AGPL-3.0" \
org.opencontainers.image.licenses="AGPL-3.0-only" \
org.opencontainers.image.ref.name="" \
org.label-schema.docker.build="docker build . -t conduit_homeserver:latest --build-arg CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml)" \
maintainer="Weasy666"