Skip to content

Commit

Permalink
Merge pull request #120 from bots-garden/119-prepare-018
Browse files Browse the repository at this point in the history
📦 release 0.1.8 in progress
  • Loading branch information
k33g authored Sep 3, 2022
2 parents 4016b87 + e4737fe commit e833f3d
Show file tree
Hide file tree
Showing 18 changed files with 288 additions and 47 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions capsule-launcher/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
3 changes: 3 additions & 0 deletions capsule-launcher/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand All @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion capsulemodule/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions capsulemodule/go.sum
Original file line number Diff line number Diff line change
@@ -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=
9 changes: 1 addition & 8 deletions capsulemodule/refresh_package.sh
Original file line number Diff line number Diff line change
@@ -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 ./...


3 changes: 0 additions & 3 deletions commons/package.sh

This file was deleted.

4 changes: 4 additions & 0 deletions commons/refresh_package.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
go get -u ./...


2 changes: 1 addition & 1 deletion commons/version.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package commons

func CapsuleVersion() string {
return "v0.1.7 🦑[squid](dev)"
return "v0.1.8 🐙[octopus]"
}
64 changes: 45 additions & 19 deletions install-all-capsule-elements.sh
Original file line number Diff line number Diff line change
@@ -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
46 changes: 44 additions & 2 deletions install-capsule-ctl.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
46 changes: 44 additions & 2 deletions install-capsule-launcher.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
46 changes: 44 additions & 2 deletions install-capsule-registry.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Loading

0 comments on commit e833f3d

Please sign in to comment.