From 77f8dc9675495ccb5e85715ad9c6be10aa64cfbc Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 20 Mar 2021 14:49:07 -0400 Subject: [PATCH 1/4] Fixing docker deploy script. Fixes #1507 --- docker/prod/deploy.sh | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh index c54e4ac6b..bd99fdb09 100755 --- a/docker/prod/deploy.sh +++ b/docker/prod/deploy.sh @@ -4,29 +4,33 @@ set -e # Creating the new tag new_tag="$1" -#third_semver=$(echo $new_tag | cut -d "." -f 3) +third_semver=$(echo $new_tag | cut -d "." -f 3) -# Setting the version on the front end -cd ../../ # Setting the version on the backend +pushd ../../ echo "pub const VERSION: &str = \"$new_tag\";" > "crates/utils/src/version.rs" git add "crates/utils/src/version.rs" -# Setting the version for Ansible -echo $new_tag > "ansible/VERSION" -git add "ansible/VERSION" - -cd docker/prod || exit +popd # Changing various references to the Lemmy version sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../dev/docker-compose.yml sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../federation/docker-compose.yml -sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../prod/docker-compose.yml -sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml - git add ../dev/docker-compose.yml -git add ../prod/docker-compose.yml git add ../federation/docker-compose.yml +# The ansible and docker installs should only update for non release-candidates +# IE, when the third semver is a number, not '2-rc' +if [ ! -z "${third_semver##*[!0-9]*}" ]; then + sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml + git add ../prod/docker-compose.yml + + # Setting the version for Ansible + pushd ../../ + echo $new_tag > "ansible/VERSION" + git add "ansible/VERSION" + popd +fi + # The commit git commit -m"Version $new_tag" git tag $new_tag @@ -34,21 +38,6 @@ git tag $new_tag # export COMPOSE_DOCKER_CLI_BUILD=1 # export DOCKER_BUILDKIT=1 -# # Rebuilding docker -# if [ $third_semver -eq 0 ]; then -# # TODO get linux/arm/v7 build working -# # Build for Raspberry Pi / other archs too -# docker buildx build --platform linux/amd64,linux/arm64 ../../ \ -# --file Dockerfile \ -# --tag dessalines/lemmy:$new_tag \ -# --push -# else -# docker buildx build --platform linux/amd64 ../../ \ -# --file Dockerfile \ -# --tag dessalines/lemmy:$new_tag \ -# --push -# fi - # Push git push origin $new_tag git push From c14a50545616460e28b701aa33912df9f515726e Mon Sep 17 00:00:00 2001 From: Grishka Date: Sun, 21 Mar 2021 04:00:32 +0300 Subject: [PATCH 2/4] Fix JSON-LD contexts --- crates/apub/src/extensions/context.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/apub/src/extensions/context.rs b/crates/apub/src/extensions/context.rs index b670e60d8..b89fdb8f9 100644 --- a/crates/apub/src/extensions/context.rs +++ b/crates/apub/src/extensions/context.rs @@ -8,10 +8,11 @@ pub(crate) fn lemmy_context() -> Result, LemmyError> { "sc": "http://schema.org#", "sensitive": "as:sensitive", "stickied": "as:stickied", + "pt": "https://join.lemmy.ml#" "comments_enabled": { - "kind": "sc:Boolean", + "type": "sc:Boolean", "id": "pt:commentsEnabled" } }))?; - Ok(vec![AnyBase::from(context()), context_ext]) + Ok(vec![AnyBase::from(context()), context_ext, "https://w3id.org/security/v1"]) } From 115b986edccfbe5694ccb1a42779734d0cb8fdb2 Mon Sep 17 00:00:00 2001 From: Grishka Date: Sun, 21 Mar 2021 04:03:53 +0300 Subject: [PATCH 3/4] uh --- crates/apub/src/extensions/context.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/apub/src/extensions/context.rs b/crates/apub/src/extensions/context.rs index b89fdb8f9..e20141edb 100644 --- a/crates/apub/src/extensions/context.rs +++ b/crates/apub/src/extensions/context.rs @@ -8,7 +8,7 @@ pub(crate) fn lemmy_context() -> Result, LemmyError> { "sc": "http://schema.org#", "sensitive": "as:sensitive", "stickied": "as:stickied", - "pt": "https://join.lemmy.ml#" + "pt": "https://join.lemmy.ml#", "comments_enabled": { "type": "sc:Boolean", "id": "pt:commentsEnabled" From 459b95bc7ee58282275f341e14c19f562ada42ac Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Mon, 22 Mar 2021 13:11:32 +0100 Subject: [PATCH 4/4] Make previous commit compile --- crates/apub/src/extensions/context.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crates/apub/src/extensions/context.rs b/crates/apub/src/extensions/context.rs index e20141edb..bfae2935b 100644 --- a/crates/apub/src/extensions/context.rs +++ b/crates/apub/src/extensions/context.rs @@ -1,6 +1,7 @@ use activitystreams::{base::AnyBase, context}; use lemmy_utils::LemmyError; use serde_json::json; +use url::Url; pub(crate) fn lemmy_context() -> Result, LemmyError> { let context_ext = AnyBase::from_arbitrary_json(json!( @@ -14,5 +15,9 @@ pub(crate) fn lemmy_context() -> Result, LemmyError> { "id": "pt:commentsEnabled" } }))?; - Ok(vec![AnyBase::from(context()), context_ext, "https://w3id.org/security/v1"]) + Ok(vec![ + AnyBase::from(context()), + context_ext, + AnyBase::from(Url::parse("https://w3id.org/security/v1")?), + ]) }