From e4737fe15bd3f1940c6f1acb5e68dfef8a5113f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Charri=C3=A8re?= Date: Sat, 3 Sep 2022 12:00:18 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=A6=20release=200.1.8=20in=20progress?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- capsule-launcher/go.mod | 4 +- capsule-launcher/go.sum | 3 + capsulemodule/go.mod | 2 +- capsulemodule/go.sum | 2 + capsulemodule/refresh_package.sh | 9 +-- commons/package.sh | 3 - commons/refresh_package.sh | 4 ++ commons/version.go | 2 +- install-all-capsule-elements.sh | 64 +++++++++++++------ install-capsule-ctl.sh | 46 ++++++++++++- install-capsule-launcher.sh | 46 ++++++++++++- install-capsule-registry.sh | 46 ++++++++++++- install-capsule-reverse-proxy.sh | 46 ++++++++++++- install-capsule-worker.sh | 46 ++++++++++++- wasm_modules/capsule-redis-keys/go.mod | 4 +- wasm_modules/capsule-redis-keys/go.sum | 2 + .../capsule-redis-keys/refresh_package.sh | 4 ++ 18 files changed, 288 insertions(+), 47 deletions(-) delete mode 100755 commons/package.sh create mode 100755 commons/refresh_package.sh create mode 100755 wasm_modules/capsule-redis-keys/refresh_package.sh diff --git a/README.md b/README.md index cf0005b..e4456ad 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ What is **Capsule**? > 🖐 **The functions are developed with GoLang and compiled to wasm with TinyGo** -📦 Before executing or running a function, you need to download the last release of **Capsule**: https://github.com/bots-garden/capsule/releases/tag/0.1.7 (`v0.1.7 🦑[squid]`) +📦 Before executing or running a function, you need to download the last release of **Capsule**: https://github.com/bots-garden/capsule/releases/tag/0.1.8 (`v0.1.8 🐙[octopus]`) > - **Capsule** is developed with GoLang and thanks to the 💜 **[Wazero](https://github.com/tetratelabs/wazero)** project > - The wasm modules are developed in GoLang and compiled with TinyGo (with the WASI specification) diff --git a/capsule-launcher/go.mod b/capsule-launcher/go.mod index 863fae8..b6a3d01 100644 --- a/capsule-launcher/go.mod +++ b/capsule-launcher/go.mod @@ -5,12 +5,12 @@ go 1.18 replace github.com/bots-garden/capsule/commons => ../commons require ( - github.com/bots-garden/capsule/commons v0.0.0-20220830110544-64220191babb + github.com/bots-garden/capsule/commons v0.0.0-20220903062354-1c48dd250b77 github.com/couchbase/gocb/v2 v2.5.2 github.com/gin-gonic/gin v1.8.1 github.com/go-redis/redis/v9 v9.0.0-beta.2 github.com/go-resty/resty/v2 v2.7.0 - github.com/shirou/gopsutil/v3 v3.22.7 + github.com/shirou/gopsutil/v3 v3.22.8 github.com/tetratelabs/wazero v1.0.0-pre.1 ) diff --git a/capsule-launcher/go.sum b/capsule-launcher/go.sum index 52b82f4..1d59042 100644 --- a/capsule-launcher/go.sum +++ b/capsule-launcher/go.sum @@ -81,6 +81,8 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/shirou/gopsutil/v3 v3.22.7 h1:flKnuCMfUUrO+oAvwAd6GKZgnPzr098VA/UJ14nhJd4= github.com/shirou/gopsutil/v3 v3.22.7/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI= +github.com/shirou/gopsutil/v3 v3.22.8 h1:a4s3hXogo5mE2PfdfJIonDbstO/P+9JszdfhAHSzD9Y= +github.com/shirou/gopsutil/v3 v3.22.8/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= @@ -95,6 +97,7 @@ github.com/tetratelabs/wazero v1.0.0-pre.1 h1:bUZ4vf21c36RmgA3enNOlLgPElEVDYoRJJ github.com/tetratelabs/wazero v1.0.0-pre.1/go.mod h1:M8UDNECGm/HVjOfq0EOe4QfCY9Les1eq54IChMLETbc= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= diff --git a/capsulemodule/go.mod b/capsulemodule/go.mod index e6b9df4..b4d1c3c 100644 --- a/capsulemodule/go.mod +++ b/capsulemodule/go.mod @@ -2,4 +2,4 @@ module github.com/bots-garden/capsule/capsulemodule go 1.18 -require github.com/bots-garden/capsule/commons v0.0.0-20220821060842-d1dc9f030021 +require github.com/bots-garden/capsule/commons v0.0.0-20220903062354-1c48dd250b77 diff --git a/capsulemodule/go.sum b/capsulemodule/go.sum index e9694fc..5b468d2 100644 --- a/capsulemodule/go.sum +++ b/capsulemodule/go.sum @@ -1,2 +1,4 @@ github.com/bots-garden/capsule/commons v0.0.0-20220821060842-d1dc9f030021 h1:cBeILASaSUdrsImLP6wR6a747SHYBJqIwuADm2BMDO4= github.com/bots-garden/capsule/commons v0.0.0-20220821060842-d1dc9f030021/go.mod h1:5ctHSZAwy3GEi4tR9YKFTfWtBUXDcOMFHNiJYXbV61c= +github.com/bots-garden/capsule/commons v0.0.0-20220903062354-1c48dd250b77 h1:CyywCzVyAuT7fHf5iHgjx0IqUvEVevtbVMwbSkS2VnA= +github.com/bots-garden/capsule/commons v0.0.0-20220903062354-1c48dd250b77/go.mod h1:5ctHSZAwy3GEi4tR9YKFTfWtBUXDcOMFHNiJYXbV61c= diff --git a/capsulemodule/refresh_package.sh b/capsulemodule/refresh_package.sh index 4bb8ebd..11eca85 100755 --- a/capsulemodule/refresh_package.sh +++ b/capsulemodule/refresh_package.sh @@ -1,11 +1,4 @@ #!/bin/bash -rm ./go.sum -rm ./go.mod - -echo "module github.com/bots-garden/capsule/capsulemodule" > go.mod -echo "" >> go.mod -echo "go 1.18" >> go.mod - -go mod tidy +go get -u ./... diff --git a/commons/package.sh b/commons/package.sh deleted file mode 100755 index 7b870e5..0000000 --- a/commons/package.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -go mod init github.com/bots-garden/capsule/commons - diff --git a/commons/refresh_package.sh b/commons/refresh_package.sh new file mode 100755 index 0000000..11eca85 --- /dev/null +++ b/commons/refresh_package.sh @@ -0,0 +1,4 @@ +#!/bin/bash +go get -u ./... + + diff --git a/commons/version.go b/commons/version.go index 8b5b1c2..4cb23fe 100644 --- a/commons/version.go +++ b/commons/version.go @@ -1,5 +1,5 @@ package commons func CapsuleVersion() string { - return "v0.1.7 🦑[squid](dev)" + return "v0.1.8 🐙[octopus]" } diff --git a/install-all-capsule-elements.sh b/install-all-capsule-elements.sh index 686ec6d..9af0893 100755 --- a/install-all-capsule-elements.sh +++ b/install-all-capsule-elements.sh @@ -1,51 +1,77 @@ #!/bin/bash -CAPSULE_VERSION="0.1.7" +LAST_CAPSULE_VERSION="0.1.8" +echo "System: ${OSTYPE} $(uname -m)" -if [[ "$OSTYPE" == "linux-gnu"* ]]; then - CAPSULE_OS="linux" -elif [[ "$OSTYPE" == "darwin"* ]]; then - CAPSULE_OS="darwin" -else - CAPSULE_OS="linux" +if [[ $1 = "help" ]] +then + echo "usage: $0" + echo "The script will detect the OS & ARCH and use the last version of capsule (${LAST_CAPSULE_VERSION})" + echo "You can force the values by setting these environment variables:" + echo "- CAPSULE_OS (linux, darwin)" + echo "- CAPSULE_ARCH (amd64, arm64)" + echo "- CAPSULE_VERSION" + exit 0 fi -if [[ "$(uname -m)" == "x86_64" ]]; then - CAPSULE_ARCH="amd64" -elif [[ "$OSTYPE" == "arm64" ]]; then - CAPSULE_ARCH="arm64" -else - CAPSULE_ARCH="amd64" +if [ -z "$CAPSULE_VERSION" ] +then + CAPSULE_VERSION=$LAST_CAPSULE_VERSION fi -CAPSULE_ARCH=$(uname -m) +if [ -z "$CAPSULE_OS" ] +then + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + CAPSULE_OS="linux" + elif [[ "$OSTYPE" == "darwin"* ]]; then + CAPSULE_OS="darwin" + else + CAPSULE_OS="linux" + fi +fi + +if [ -z "$CAPSULE_ARCH" ] +then + if [[ "$(uname -m)" == "x86_64" ]]; then + CAPSULE_ARCH="amd64" + elif [[ "$(uname -m)" == "arm64" ]]; then + CAPSULE_ARCH="arm64" + elif [[ $(uname -m) == "aarch64" ]]; then + CAPSULE_ARCH="arm64" + else + CAPSULE_ARCH="amd64" + fi +fi + + +echo "Installing capsule elements [${CAPSULE_VERSION}] ${CAPSULE_OS} ${CAPSULE_ARCH}" CAPSULE_MODULE="caps" -echo "💊 Installing ${CAPSULE_MODULE}..." +echo "Installing ${CAPSULE_MODULE}..." wget https://github.com/bots-garden/capsule/releases/download/${CAPSULE_VERSION}/${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz sudo tar -zxf ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz --directory /usr/local/bin rm ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz CAPSULE_MODULE="capsule" -echo "💊 Installing ${CAPSULE_MODULE}..." +echo "Installing ${CAPSULE_MODULE}..." wget https://github.com/bots-garden/capsule/releases/download/${CAPSULE_VERSION}/${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz sudo tar -zxf ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz --directory /usr/local/bin rm ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz CAPSULE_MODULE="capsule-registry" -echo "💊 Installing ${CAPSULE_MODULE}..." +echo "Installing ${CAPSULE_MODULE}..." wget https://github.com/bots-garden/capsule/releases/download/${CAPSULE_VERSION}/${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz sudo tar -zxf ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz --directory /usr/local/bin rm ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz CAPSULE_MODULE="capsule-reverse-proxy" -echo "💊 Installing ${CAPSULE_MODULE}..." +echo "Installing ${CAPSULE_MODULE}..." wget https://github.com/bots-garden/capsule/releases/download/${CAPSULE_VERSION}/${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz sudo tar -zxf ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz --directory /usr/local/bin rm ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz CAPSULE_MODULE="capsule-worker" -echo "💊 Installing ${CAPSULE_MODULE}..." +echo "Installing ${CAPSULE_MODULE}..." wget https://github.com/bots-garden/capsule/releases/download/${CAPSULE_VERSION}/${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz sudo tar -zxf ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz --directory /usr/local/bin rm ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz diff --git a/install-capsule-ctl.sh b/install-capsule-ctl.sh index 09fa602..da1c198 100755 --- a/install-capsule-ctl.sh +++ b/install-capsule-ctl.sh @@ -1,5 +1,47 @@ #!/bin/bash -CAPSULE_VERSION="0.1.7" +LAST_CAPSULE_VERSION="0.1.8" +echo "System: ${OSTYPE} $(uname -m)" + +if [[ $1 = "help" ]] +then + echo "usage: $0" + echo "The script will detect the OS & ARCH and use the last version of capsule (${LAST_CAPSULE_VERSION})" + echo "You can force the values by setting these environment variables:" + echo "- CAPSULE_OS (linux, darwin)" + echo "- CAPSULE_ARCH (amd64, arm64)" + echo "- CAPSULE_VERSION" + exit 0 +fi + +if [ -z "$CAPSULE_VERSION" ] +then + CAPSULE_VERSION=$LAST_CAPSULE_VERSION +fi + +if [ -z "$CAPSULE_OS" ] +then + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + CAPSULE_OS="linux" + elif [[ "$OSTYPE" == "darwin"* ]]; then + CAPSULE_OS="darwin" + else + CAPSULE_OS="linux" + fi +fi + +if [ -z "$CAPSULE_ARCH" ] +then + if [[ "$(uname -m)" == "x86_64" ]]; then + CAPSULE_ARCH="amd64" + elif [[ "$(uname -m)" == "arm64" ]]; then + CAPSULE_ARCH="arm64" + elif [[ $(uname -m) == "aarch64" ]]; then + CAPSULE_ARCH="arm64" + else + CAPSULE_ARCH="amd64" + fi +fi + CAPSULE_MODULE="caps" if [[ "$OSTYPE" == "linux-gnu"* ]]; then @@ -20,7 +62,7 @@ fi CAPSULE_ARCH=$(uname -m) -echo "💊 Installing ${CAPSULE_MODULE}..." +echo "Installing ${CAPSULE_MODULE}..." wget https://github.com/bots-garden/capsule/releases/download/${CAPSULE_VERSION}/${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz sudo tar -zxf ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz --directory /usr/local/bin rm ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz diff --git a/install-capsule-launcher.sh b/install-capsule-launcher.sh index 3e2e8b1..5ad0262 100755 --- a/install-capsule-launcher.sh +++ b/install-capsule-launcher.sh @@ -1,5 +1,47 @@ #!/bin/bash -CAPSULE_VERSION="0.1.7" +LAST_CAPSULE_VERSION="0.1.8" +echo "System: ${OSTYPE} $(uname -m)" + +if [[ $1 = "help" ]] +then + echo "usage: $0" + echo "The script will detect the OS & ARCH and use the last version of capsule (${LAST_CAPSULE_VERSION})" + echo "You can force the values by setting these environment variables:" + echo "- CAPSULE_OS (linux, darwin)" + echo "- CAPSULE_ARCH (amd64, arm64)" + echo "- CAPSULE_VERSION" + exit 0 +fi + +if [ -z "$CAPSULE_VERSION" ] +then + CAPSULE_VERSION=$LAST_CAPSULE_VERSION +fi + +if [ -z "$CAPSULE_OS" ] +then + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + CAPSULE_OS="linux" + elif [[ "$OSTYPE" == "darwin"* ]]; then + CAPSULE_OS="darwin" + else + CAPSULE_OS="linux" + fi +fi + +if [ -z "$CAPSULE_ARCH" ] +then + if [[ "$(uname -m)" == "x86_64" ]]; then + CAPSULE_ARCH="amd64" + elif [[ "$(uname -m)" == "arm64" ]]; then + CAPSULE_ARCH="arm64" + elif [[ $(uname -m) == "aarch64" ]]; then + CAPSULE_ARCH="arm64" + else + CAPSULE_ARCH="amd64" + fi +fi + CAPSULE_MODULE="capsule" if [[ "$OSTYPE" == "linux-gnu"* ]]; then @@ -20,7 +62,7 @@ fi CAPSULE_ARCH=$(uname -m) -echo "💊 Installing ${CAPSULE_MODULE}..." +echo "Installing ${CAPSULE_MODULE}..." wget https://github.com/bots-garden/capsule/releases/download/${CAPSULE_VERSION}/${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz sudo tar -zxf ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz --directory /usr/local/bin rm ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz diff --git a/install-capsule-registry.sh b/install-capsule-registry.sh index 8fbcf7f..5856c28 100755 --- a/install-capsule-registry.sh +++ b/install-capsule-registry.sh @@ -1,5 +1,47 @@ #!/bin/bash -CAPSULE_VERSION="0.1.7" +LAST_CAPSULE_VERSION="0.1.8" +echo "System: ${OSTYPE} $(uname -m)" + +if [[ $1 = "help" ]] +then + echo "usage: $0" + echo "The script will detect the OS & ARCH and use the last version of capsule (${LAST_CAPSULE_VERSION})" + echo "You can force the values by setting these environment variables:" + echo "- CAPSULE_OS (linux, darwin)" + echo "- CAPSULE_ARCH (amd64, arm64)" + echo "- CAPSULE_VERSION" + exit 0 +fi + +if [ -z "$CAPSULE_VERSION" ] +then + CAPSULE_VERSION=$LAST_CAPSULE_VERSION +fi + +if [ -z "$CAPSULE_OS" ] +then + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + CAPSULE_OS="linux" + elif [[ "$OSTYPE" == "darwin"* ]]; then + CAPSULE_OS="darwin" + else + CAPSULE_OS="linux" + fi +fi + +if [ -z "$CAPSULE_ARCH" ] +then + if [[ "$(uname -m)" == "x86_64" ]]; then + CAPSULE_ARCH="amd64" + elif [[ "$(uname -m)" == "arm64" ]]; then + CAPSULE_ARCH="arm64" + elif [[ $(uname -m) == "aarch64" ]]; then + CAPSULE_ARCH="arm64" + else + CAPSULE_ARCH="amd64" + fi +fi + CAPSULE_MODULE="capsule-registry" if [[ "$OSTYPE" == "linux-gnu"* ]]; then @@ -20,7 +62,7 @@ fi CAPSULE_ARCH=$(uname -m) -echo "💊 Installing ${CAPSULE_MODULE}..." +echo "Installing ${CAPSULE_MODULE}..." wget https://github.com/bots-garden/capsule/releases/download/${CAPSULE_VERSION}/${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz sudo tar -zxf ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz --directory /usr/local/bin rm ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz diff --git a/install-capsule-reverse-proxy.sh b/install-capsule-reverse-proxy.sh index 9afe971..2706d0c 100755 --- a/install-capsule-reverse-proxy.sh +++ b/install-capsule-reverse-proxy.sh @@ -1,5 +1,47 @@ #!/bin/bash -CAPSULE_VERSION="0.1.7" +LAST_CAPSULE_VERSION="0.1.8" +echo "System: ${OSTYPE} $(uname -m)" + +if [[ $1 = "help" ]] +then + echo "usage: $0" + echo "The script will detect the OS & ARCH and use the last version of capsule (${LAST_CAPSULE_VERSION})" + echo "You can force the values by setting these environment variables:" + echo "- CAPSULE_OS (linux, darwin)" + echo "- CAPSULE_ARCH (amd64, arm64)" + echo "- CAPSULE_VERSION" + exit 0 +fi + +if [ -z "$CAPSULE_VERSION" ] +then + CAPSULE_VERSION=$LAST_CAPSULE_VERSION +fi + +if [ -z "$CAPSULE_OS" ] +then + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + CAPSULE_OS="linux" + elif [[ "$OSTYPE" == "darwin"* ]]; then + CAPSULE_OS="darwin" + else + CAPSULE_OS="linux" + fi +fi + +if [ -z "$CAPSULE_ARCH" ] +then + if [[ "$(uname -m)" == "x86_64" ]]; then + CAPSULE_ARCH="amd64" + elif [[ "$(uname -m)" == "arm64" ]]; then + CAPSULE_ARCH="arm64" + elif [[ $(uname -m) == "aarch64" ]]; then + CAPSULE_ARCH="arm64" + else + CAPSULE_ARCH="amd64" + fi +fi + CAPSULE_MODULE="capsule-reverse-proxy" if [[ "$OSTYPE" == "linux-gnu"* ]]; then @@ -20,7 +62,7 @@ fi CAPSULE_ARCH=$(uname -m) -echo "💊 Installing ${CAPSULE_MODULE}..." +echo "Installing ${CAPSULE_MODULE}..." wget https://github.com/bots-garden/capsule/releases/download/${CAPSULE_VERSION}/${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz sudo tar -zxf ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz --directory /usr/local/bin rm ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz diff --git a/install-capsule-worker.sh b/install-capsule-worker.sh index 00febaa..093c120 100755 --- a/install-capsule-worker.sh +++ b/install-capsule-worker.sh @@ -1,5 +1,47 @@ #!/bin/bash -CAPSULE_VERSION="0.1.7" +LAST_CAPSULE_VERSION="0.1.8" +echo "System: ${OSTYPE} $(uname -m)" + +if [[ $1 = "help" ]] +then + echo "usage: $0" + echo "The script will detect the OS & ARCH and use the last version of capsule (${LAST_CAPSULE_VERSION})" + echo "You can force the values by setting these environment variables:" + echo "- CAPSULE_OS (linux, darwin)" + echo "- CAPSULE_ARCH (amd64, arm64)" + echo "- CAPSULE_VERSION" + exit 0 +fi + +if [ -z "$CAPSULE_VERSION" ] +then + CAPSULE_VERSION=$LAST_CAPSULE_VERSION +fi + +if [ -z "$CAPSULE_OS" ] +then + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + CAPSULE_OS="linux" + elif [[ "$OSTYPE" == "darwin"* ]]; then + CAPSULE_OS="darwin" + else + CAPSULE_OS="linux" + fi +fi + +if [ -z "$CAPSULE_ARCH" ] +then + if [[ "$(uname -m)" == "x86_64" ]]; then + CAPSULE_ARCH="amd64" + elif [[ "$(uname -m)" == "arm64" ]]; then + CAPSULE_ARCH="arm64" + elif [[ $(uname -m) == "aarch64" ]]; then + CAPSULE_ARCH="arm64" + else + CAPSULE_ARCH="amd64" + fi +fi + CAPSULE_MODULE="capsule-worker" if [[ "$OSTYPE" == "linux-gnu"* ]]; then @@ -20,7 +62,7 @@ fi CAPSULE_ARCH=$(uname -m) -echo "💊 Installing ${CAPSULE_MODULE}..." +echo "Installing ${CAPSULE_MODULE}..." wget https://github.com/bots-garden/capsule/releases/download/${CAPSULE_VERSION}/${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz sudo tar -zxf ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz --directory /usr/local/bin rm ${CAPSULE_MODULE}-${CAPSULE_VERSION}-${CAPSULE_OS}-${CAPSULE_ARCH}.tar.gz diff --git a/wasm_modules/capsule-redis-keys/go.mod b/wasm_modules/capsule-redis-keys/go.mod index ef0702d..e388795 100644 --- a/wasm_modules/capsule-redis-keys/go.mod +++ b/wasm_modules/capsule-redis-keys/go.mod @@ -4,6 +4,6 @@ go 1.18 replace github.com/bots-garden/capsule/capsulemodule => ../../capsulemodule -require github.com/bots-garden/capsule/capsulemodule v0.0.0-20220815084835-9a0b98b22e4a +require github.com/bots-garden/capsule/capsulemodule v0.0.0-20220903064205-4016b87e763b -require github.com/bots-garden/capsule/commons v0.0.0-20220821060842-d1dc9f030021 // indirect +require github.com/bots-garden/capsule/commons v0.0.0-20220903062354-1c48dd250b77 // indirect diff --git a/wasm_modules/capsule-redis-keys/go.sum b/wasm_modules/capsule-redis-keys/go.sum index d5efca3..edad091 100644 --- a/wasm_modules/capsule-redis-keys/go.sum +++ b/wasm_modules/capsule-redis-keys/go.sum @@ -4,3 +4,5 @@ github.com/bots-garden/capsule/capsulemodule v0.0.0-20220815084835-9a0b98b22e4a github.com/bots-garden/capsule/capsulemodule v0.0.0-20220815084835-9a0b98b22e4a/go.mod h1:tu9DYBPXGSfiDaCN1opAFZZ3FFt3TVFH5jkYnPypY64= github.com/bots-garden/capsule/commons v0.0.0-20220821060842-d1dc9f030021 h1:cBeILASaSUdrsImLP6wR6a747SHYBJqIwuADm2BMDO4= github.com/bots-garden/capsule/commons v0.0.0-20220821060842-d1dc9f030021/go.mod h1:5ctHSZAwy3GEi4tR9YKFTfWtBUXDcOMFHNiJYXbV61c= +github.com/bots-garden/capsule/commons v0.0.0-20220903062354-1c48dd250b77 h1:CyywCzVyAuT7fHf5iHgjx0IqUvEVevtbVMwbSkS2VnA= +github.com/bots-garden/capsule/commons v0.0.0-20220903062354-1c48dd250b77/go.mod h1:5ctHSZAwy3GEi4tR9YKFTfWtBUXDcOMFHNiJYXbV61c= diff --git a/wasm_modules/capsule-redis-keys/refresh_package.sh b/wasm_modules/capsule-redis-keys/refresh_package.sh new file mode 100755 index 0000000..11eca85 --- /dev/null +++ b/wasm_modules/capsule-redis-keys/refresh_package.sh @@ -0,0 +1,4 @@ +#!/bin/bash +go get -u ./... + +