From fbbba72d8ac7f0385ba9b4ab788376767f9039f7 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Sat, 6 May 2023 18:59:30 +0100 Subject: [PATCH] link to newly created pekko samples (#299) --- docs/src/main/paradox/additional/deploying.md | 7 +- docs/src/main/paradox/project/examples.md | 7 +- project/Paradox.scala | 1 - scripts/publish_samples.sh | 96 ------------------- 4 files changed, 8 insertions(+), 103 deletions(-) delete mode 100755 scripts/publish_samples.sh diff --git a/docs/src/main/paradox/additional/deploying.md b/docs/src/main/paradox/additional/deploying.md index a50ff312f1..6ec847c13f 100644 --- a/docs/src/main/paradox/additional/deploying.md +++ b/docs/src/main/paradox/additional/deploying.md @@ -14,7 +14,8 @@ To take advantage of running inside Kubernetes while forming a cluster, with the Kubernetes API or Kubernetes via DNS. You can look at the -@extref[Cluster with Kubernetes example project](akka-samples:akka-sample-cluster-kubernetes-java) +@java[[Cluster with Kubernetes example project](https://github.com/apache/incubator-pekko-samples/tree/main/pekko-sample-cluster-kubernetes-java)] +@scala[[Cluster with Kubernetes example project](https://github.com/apache/incubator-pekko-samples/tree/main/pekko-sample-cluster-kubernetes-scala)] to see what this looks like in practice. ### Resource limits @@ -28,8 +29,8 @@ that you will need to take special care with the network configuration when usin described here: @ref:[Pekko behind NAT or in a Docker container](../remoting-artery.md#remote-configuration-nat-artery) You can look at the -@java[@extref[Cluster with docker-compse example project](akka-samples:akka-sample-cluster-docker-compose-java)] -@scala[@extref[Cluster with docker-compose example project](akka-samples:akka-sample-cluster-docker-compose-scala)] +@java[[Cluster with docker-compse example project](https://github.com/apache/incubator-pekko-samples/tree/main/pekko-sample-cluster-docker-compose-java)] +@scala[[Cluster with docker-compose example project](https://github.com/apache/incubator-pekko-samples/tree/main/pekko-sample-cluster-docker-compose-scala)] to see what this looks like in practice. For the JVM to run well in a Docker container, there are some general (not Pekko specific) parameters that might need tuning: diff --git a/docs/src/main/paradox/project/examples.md b/docs/src/main/paradox/project/examples.md index d94fe1c5db..846ec67238 100644 --- a/docs/src/main/paradox/project/examples.md +++ b/docs/src/main/paradox/project/examples.md @@ -60,14 +60,15 @@ active-active persistent entities across data centers. ## Cluster with Docker -@java[@extref[Cluster with docker-compose example project](akka-samples:akka-sample-cluster-docker-compose-java)] -@scala[@extref[Cluster with docker-compose example project](akka-samples:akka-sample-cluster-docker-compose-scala)] +@java[[Cluster with docker-compose example project](https://github.com/apache/incubator-pekko-samples/tree/main/pekko-sample-cluster-docker-compose-java)] +@scala[[Cluster with docker-compose example project](https://github.com/apache/incubator-pekko-samples/tree/main/pekko-sample-cluster-docker-compose-scala)] Illustrates how to use Pekko Cluster with Docker compose. ## Cluster with Kubernetes -@extref[Cluster with Kubernetes example project](akka-samples:akka-sample-cluster-kubernetes-java) +@java[[Cluster with Kubernetes example project](https://github.com/apache/incubator-pekko-samples/tree/main/pekko-sample-cluster-kubernetes-java)] +@scala[[Cluster with Kubernetes example project](https://github.com/apache/incubator-pekko-samples/tree/main/pekko-sample-cluster-kubernetes-scala)] This sample illustrates how to form a Pekko Cluster with Pekko Bootstrap when running in Kubernetes. diff --git a/project/Paradox.scala b/project/Paradox.scala index 7aa5067693..8b86e40296 100644 --- a/project/Paradox.scala +++ b/project/Paradox.scala @@ -36,7 +36,6 @@ object Paradox { "extref.wikipedia.base_url" -> "https://en.wikipedia.org/wiki/%s", "extref.github.base_url" -> (GitHub.url(version.value) + "/%s"), // for links to our sources "extref.samples.base_url" -> s"$pekkoBaseURL/docs/pekko-samples/current/%s", - "extref.akka-samples.base_url" -> "https://developer.lightbend.com/start/?group=akka&project=%s", "pekko.doc.dns" -> s"$pekkoBaseURL", "scaladoc.pekko.base_url" -> s"$pekkoBaseURL/api/pekko/current/org/apache", "scaladoc.pekko.http.base_url" -> s"$pekkoBaseURL/api/pekko-http/current/org/apache", diff --git a/scripts/publish_samples.sh b/scripts/publish_samples.sh deleted file mode 100755 index e5572428c1..0000000000 --- a/scripts/publish_samples.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env bash -# -# Publishes released sample zip files to Lightbend Activator. -# The zip files must have been uploaded to -# http://downloads.typesafe.com/akka/ before using this script. -# That is done by the release script. -# - -# get the source location for this script; handles symlinks -function get_script_path { - local source="${BASH_SOURCE[0]}" - while [ -h "${source}" ] ; do - source="$(readlink "${source}")"; - done - echo ${source} -} - -# path, name, and dir for this script -declare -r script_path=$(get_script_path) -declare -r script_name=$(basename "${script_path}") -declare -r script_dir="$(cd -P "$(dirname "${script_path}")" && pwd)" - -# echo a log message -function echolog { - echo "[${script_name}] $@" -} - -# echo an error message -function echoerr { - echo "[${script_name}] $@" 1>&2 -} - -# fail the script with an error message -function fail { - echoerr "$@" - exit 1 -} - -# extract uuid property from json and show url of the status page -function logStatusUrl { - local prop="uuid" - local temp=`echo $json | sed 's/\\\\\//\//g' | sed 's/[{}]//g' | awk -v k="text" '{n=split($0,a,","); for (i=1; i<=n; i++) print a[i]}' | sed 's/\"\:\"/\|/g' | sed 's/[\,]/ /g' | sed 's/\"//g' | grep -w $prop` - echolog "Check status of $name at: https://www.lightbend.com/activator/template/status/${temp##*|}" -} - -# print usage info -function usage { - cat < /dev/null || fail "curl command not found" - - -names=`find akka-samples -name "activator.properties" -depth 2 | awk -F"/" '{printf "%s\n",$2}'` - -for name in $names; do - echolog "Publishing $name" - json=$(curl --data-urlencode "url=http://downloads.lightbend.com/akka/$name-$version.zip" --user "$user:$pwd" --progress-bar https://www.lightbend.com/activator/template/publish) - logStatusUrl -done - - -