This is an automated email from the ASF dual-hosted git repository. msciabarra pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openserverless-task.git
commit a07feb0726cb71d70c014235b37525f29c4d7742 Author: Michele Sciabarra <[email protected]> AuthorDate: Tue Jun 24 13:11:44 2025 +0200 miniops final tweaks --- opsroot.json | 2 +- setup/docopts.md | 2 + setup/nuvolaris/opsfile.yml | 6 +- setup/opsfile.yml | 37 ++++++-- setup/web/TODO | 7 ++ setup/web/discord.png | Bin 0 -> 67337 bytes setup/web/index.html | 129 +++++++++++++++++++++++++++ setup/web/linkedin.png | Bin 0 -> 47217 bytes setup/web/os-logo-full-vertical-bg-white.png | Bin 0 -> 145557 bytes 9 files changed, 172 insertions(+), 11 deletions(-) diff --git a/opsroot.json b/opsroot.json index a9b8731..ceed2c1 100644 --- a/opsroot.json +++ b/opsroot.json @@ -5,7 +5,7 @@ "coreutils": "arch b2sum b3sum base32 basename basenc cat chgrp chmod chown chroot cksum comm cp csplit cut date dd df dir dircolors dirname du env expand expr factor fmt fold groups hashsum head hostid hostname id install join kill link ln logname ls md5sum mkdir mkfifo mknod mktemp more mv nice nl nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd readlink realpath rm rmdir seq sha1sum sha224sum sha256sum sha3-224sum sha3-256sum sha3-384sum sha3-512sum sha384sum [...] }, "images": { - "operator": "apache/openserverless-operator:0.1.0-incubating.2506232348", + "operator": "apache/openserverless-operator:0.1.0-incubating.2506240723", "controller": "ghcr.io/nuvolaris/openwhisk-controller:3.1.0-mastrogpt.2402101445", "invoker": "ghcr.io/nuvolaris/openwhisk-invoker:3.1.0-mastrogpt.2402101445" } diff --git a/setup/docopts.md b/setup/docopts.md index 297cbe2..0f5e37d 100644 --- a/setup/docopts.md +++ b/setup/docopts.md @@ -24,6 +24,7 @@ Manage installation ```text Usage: + setup mini setup devcluster [--uninstall|--status|--skip-check-ports] setup cluster [<context>] [--uninstall|--status] setup server <server> [<user>] [--uninstall|--status] @@ -35,6 +36,7 @@ Usage: ## Commands ``` + setup mini deploy mini Apache OpenServerless, slim local installation available as http://devel.miniops.me setup cluster deploy Apache OpenServerless in the Kubernetes cluster using the <context>, default the current setup devcluster deploy Apache OpenServerless in a devcluster created locally you need Docker Desktop available with at least 6G of memory assigned diff --git a/setup/nuvolaris/opsfile.yml b/setup/nuvolaris/opsfile.yml index 2b512f6..60d91bc 100644 --- a/setup/nuvolaris/opsfile.yml +++ b/setup/nuvolaris/opsfile.yml @@ -249,7 +249,7 @@ tasks: cmds: #- test ! -e ~/.ops/{{.USR}}.password || die "User {{.USR}} already exists - check .ops/{{.USR}}.password in your home for password" - | - if kubectl -n nuvolaris get wsku/{{.USR}} >/dev/null + if kubectl -n nuvolaris get wsku/{{.USR}} 2>/dev/null then die "User {{.USR}} already exists - check ~/.ops/{{.USR}}.password in your home for password" fi - echo "Creating user {{.USR}} in $APIHOST" @@ -260,7 +260,3 @@ tasks: export OPS_PASSWORD="{{.PSW}}" retry ops ide login {{.USR}} "$APIHOST" - echo "{{.PSW}}" > ~/.ops/{{.USR}}.password - - echo "=========================================" - - echo "Login with:" ops ide login {{.USR}} $APIHOST - - echo "Password is saved in:" ~/.ops/{{.USR}}.password - - echo "Web URL is:" "$HOST" diff --git a/setup/opsfile.yml b/setup/opsfile.yml index 53dfa1d..1cbd087 100644 --- a/setup/opsfile.yml +++ b/setup/opsfile.yml @@ -81,6 +81,38 @@ tasks: cmds: - exit 0 + + mini: + silent: true + desc: install miniops + cmds: + - which docker || die "Docker is not installed. Please install Docker Desktop first." + - | + if curl -s http://miniops.me >/dev/null + then + echo "Apache OpenServerless mini is already installed." + echo "Login with: ops ide login devel http://miniops.me"; + echo "You can find the password in .ops/devel.password in your home directory" + echo "Uninstall it with ops setup devcluster --uninstall" + false + fi + - $OPS config slim + - $OPS config apihost miniops.me --protocol=http + - $OPS setup devcluster + - $OPS setup nuvolaris add-user + - | + export OPS_PASSWORD="$(cat ~/.ops/devel.password)" + ops ide login devel http://miniops.me + ops util upload $(realpath web) + - | + $OPS setup nuvolaris add-user + export OPS_PASSWORD="$(cat ~/.ops/devel.password)" + $OPS ide login devel http://miniops.me + $OPS util upload "$(realpath web)" + - echo "Login with:" ops ide login devel https://miniops.me + - echo "Password is saved in:" ~/.ops/devel.password + - echo "Web URL is:" "http://devel.miniops.me"; + devcluster: vars: PORTS: '9010/tcp 9080/tcp 30379/tcp 32817/tcp 3232/tcp 3233/tcp 9644/tcp 7896/tcp 5984/tcp 9092/tcp 9000/tcp 9090/tcp 19530/tcp 9091/tcp, 27017/tcp 80/tcp 443/tcp 57817/tcp' @@ -92,10 +124,6 @@ tasks: elif {{.__uninstall}} then {{.RUN}} $OPS setup docker delete else - if test -z "$CONFIGURED" - then $OPS config slim - $OPS config apihost miniops.me --protocol=http - fi if test -z {{.__skip_check_ports}} then task check-ports PORTS="{{ .PORTS }}" @@ -103,7 +131,6 @@ tasks: {{.RUN}} $OPS setup docker create {{.RUN}} $OPS setup kubernetes create {{.RUN}} $OPS setup nuvolaris login - {{.RUN}} $OPS setup nuvolaris add-user config STATUS_LAST=devcluster fi diff --git a/setup/web/TODO b/setup/web/TODO new file mode 100644 index 0000000..6fa2cb2 --- /dev/null +++ b/setup/web/TODO @@ -0,0 +1,7 @@ +Welcome to Apache OpenServerless + +Join Us on Discord + +Share on Linkedin + +Install with diff --git a/setup/web/discord.png b/setup/web/discord.png new file mode 100644 index 0000000..d74a406 Binary files /dev/null and b/setup/web/discord.png differ diff --git a/setup/web/index.html b/setup/web/index.html new file mode 100644 index 0000000..7a1fdc6 --- /dev/null +++ b/setup/web/index.html @@ -0,0 +1,129 @@ +<!DOCTYPE html> +<html lang="en"> + +<head> + <meta charset="UTF-8" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> + <title>OpenServerless Landing</title> + <style> + body { + margin: 0; + padding: 40px 20px; + font-family: Arial, sans-serif; + background-color: white; + text-align: center; + } + + img { + max-width: 300px; + } + + .button-row { + display: flex; + justify-content: center; + gap: 20px; + margin-bottom: 40px; + flex-wrap: wrap; + } + + .button { + display: flex; + align-items: center; + justify-content: center; + gap: 10px; + padding: 12px 20px; + border: none; + border-radius: 5px; + font-size: 16px; + color: white; + text-decoration: none; + font-weight: bold; + cursor: pointer; + } + + .linkedin { + background-color: #0077b5; + } + + .discord { + background-color: #5865f2; + } + + .button img { + width: 20px; + height: 20px; + } + + .textarea-row { + display: flex; + justify-content: center; + gap: 20px; + flex-wrap: wrap; + } + + .install-box { + width: 40%; + display: flex; + flex-direction: column; + align-items: center; + } + + .install-box label { + font-weight: bold; + margin-bottom: 8px; + } + + textarea { + width: 90%; + height: 60px; + font-family: monospace; + font-size: 14px; + padding: 10px; + border: 1px solid #ccc; + border-radius: 4px; + resize: none; + } + </style> +</head> + +<body> + + <img src="os-logo-full-vertical-bg-white.png" alt="OpenServerless Logo" /> + + <div class="button-row"> + + <img width="50" height="50" src="linkedin.png" alt="LinkedIn Icon" /> + <a class="button linkedin" href="https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fopenserverless.apache.org%2F"; + target="_blank"> + Share on LinkedIn + </a> + <img width="50" height="50" src="discord.png" alt="Discord Icon" /> + <a class="button discord" href="https://bit.ly/openserverless-discord"; target="_blank"> + Join Us on Discord + </a> + </div> + + <div class="textarea-row"> + + <div class="install-box"> + <label>Install on Windows</label> + <textarea readonly>powershell -c "irm bit.ly/get-ops-exe | iex" +ops setup mini</textarea> + <span> + You need Docker Desktop for <a href="https://docs.docker.com/desktop/setup/install/windows-install/";>Windows</a> installed. + </span> + </div> + + <div class="install-box"> + <label>Install on Mac/Linux</label> + <textarea readonly>curl -sL bit.ly/get-ops | bash +ops setup mini</textarea> + <span> + You need Docker Dektop for <a href="https://docs.docker.com/desktop/setup/install/mac-install/";>Mac</a> or <a href="https://docs.docker.com/desktop/setup/install/linux/";>Linux</a> installed. + </span> + </div> + </div> + +</body> + +</html> \ No newline at end of file diff --git a/setup/web/linkedin.png b/setup/web/linkedin.png new file mode 100644 index 0000000..532021a Binary files /dev/null and b/setup/web/linkedin.png differ diff --git a/setup/web/os-logo-full-vertical-bg-white.png b/setup/web/os-logo-full-vertical-bg-white.png new file mode 100644 index 0000000..a225734 Binary files /dev/null and b/setup/web/os-logo-full-vertical-bg-white.png differ
