diff --git a/install.sh b/install.sh index ce8dd81..96a6a01 100755 --- a/install.sh +++ b/install.sh @@ -209,10 +209,10 @@ fi if [ $toolsok == 'ok' ];then cp -f $wdir/files/VuetableCssConfig.js $wdir/node_modules/vuetable-2/src/components/VuetableCssConfig.js - cp -f $wdir/files/serve.js $wdir/node_modules/@vue/cli-service/lib/commands/serve.js - cp -f $wdir/files/status.sh $wdir/src-local/hybrid/connect/status.sh + cp -f $wdir/files/serve.js $wdir/node_modules/@vue/cli-service/lib/commands/serve.js + cp -f $wdir/files/status.sh $wdir/src-local/hybrid/connect/status.sh cp -f $wdir/files/get-swarmlab-ca $wdir/src-local/hybrid/connect/get-swarmlab-ca - cp -f $wdir/files/get-base-ca $wdir/src-local/hybrid/connect/get-base-ca + cp -f $wdir/files/get-base-ca $wdir/src-local/hybrid/connect/get-base-ca cat << FOE > $wdir/src-local/ecosystem.config.js module.exports = { diff --git a/install/install-CentOS.sh b/install/install-CentOS.sh new file mode 100644 index 0000000..1231545 --- /dev/null +++ b/install/install-CentOS.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +# ------------------------ +# Not Tested +# ------------------------ + +# ------------------------ +# install wireguard jq +# ------------------------ + +sudo yum install -y yum-utils +sudo yum install elrepo-release epel-release +sudo yum install kmod-wireguard wireguard-tools + + +# ------------------------ +# install node version 15 +# ------------------------ + +curl -sL https://deb.nodesource.com/setup_15.x | sudo -E bash - +yum install -y nodejs + +# ------------------------ +# install docker +# ------------------------ + +sudo yum-config-manager \ + --add-repo \ + https://download.docker.com/linux/centos/docker-ce.repo + +sudo yum install docker-ce docker-ce-cli containerd.io +sudo systemctl start docker + +sudo usermod -aG docker [USERNAME] + +# ------------------------ +# install docker-compose +# ------------------------ + +sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +sudo chmod +x /usr/local/bin/docker-compose +sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose + +# ------------------------ +# install pm2 +# ------------------------ + +sudo npm install -g pm2 + +echo "" +echo "run ./install.sh" diff --git a/install/install-ubuntu.sh b/install/install-ubuntu.sh new file mode 100644 index 0000000..d53ca3b --- /dev/null +++ b/install/install-ubuntu.sh @@ -0,0 +1,44 @@ +#!/bin/bash + + +# ------------------------ +# install wireguard jq +# ------------------------ + +sudo apt update +sudo apt install wireguard jq + + +# ------------------------ +# install node version 15 +# ------------------------ + +curl -sL https://deb.nodesource.com/setup_15.x | sudo -E bash - +sudo apt-get install -y nodejs + +# ------------------------ +# install docker +# ------------------------ + +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - +sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" +sudo apt update +sudo apt install -y docker-ce +sudo usermod -aG docker [USERNAME] + +# ------------------------ +# install docker-compose +# ------------------------ + +sudo curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +sudo chmod +x /usr/local/bin/docker-compose +sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose + +# ------------------------ +# install pm2 +# ------------------------ + +sudo npm install -g pm2 + +echo "" +echo "run ./install.sh" diff --git a/src-local/llo/new.js b/src-local/llo/new.js index 69e3cd4..ffd5c7d 100644 --- a/src-local/llo/new.js +++ b/src-local/llo/new.js @@ -103,11 +103,14 @@ watcher // *************************************************** app.get('/dockerservices', (req, res, next) => { + + var RES = new Object(); + const page = req.query["page"] + const per_page = req.query["per_page"] + RES.sort = req.query["sort"] + RES.filter = req.query["filter"] + RES.type = req.query["type"] -//var showexec = `docker ps --format `docker ps --format '{"ID":"{{ .ID }}", "Image": "{{ .Image }}", "Names":"{{ .Names }}", "Command": "{{ .Command }}", "CreatedAt": "{{ .CreatedAt }}", "Networks": "{{ .Networks }}"}' | jq . -s ` -//var showexec = `docker ps --format '{"ID":"{{ .ID }}", "Image": "{{ .Image }}", "Names":"{{ .Names }}"}' | jq . -s ` - //docker ps --format '{"ID":"{{ .ID }}", "Image": "{{ .Image }}", "Names":"{{ .Names }}", "Command": "{{ .Command }}", "CreatedAt": "{{ .CreatedAt}}", "Networks":"{{ .Networks}}", "Ports": "{{ .Ports}}", "RunningFor": "{{ .RunningFor}}", "Status": "{{ .Status}}" }' -//var showexec = `docker ps --format '{"ID":"{{ .ID }}", "Image": "{{ .Image }}", "Names":"{{ .Names }}", "Ports":"{{.Ports}}", "Networks":"{{.Networks}}", "Status":"{{.Status}}","Command":"{{,Command}}","RunningFor":"{{.RunningFor}}","CreatedAt":"{{.CreatedAt}}"}' | jq . -s ` var showexec = `docker ps --format '{"ID":"{{ .ID }}", "Image": "{{ .Image }}", "Names":"{{ .Names }}", "Ports":"{{.Ports}}", "Networks":"{{.Networks}}", "Status":"{{.Status}}","RunningFor":"{{.RunningFor}}","CreatedAt":"{{.CreatedAt}}"}' | jq . -s ` exec(showexec, (err, stdout, stderr) => { if (err) { @@ -122,12 +125,29 @@ var showexec = `docker ps --format '{"ID":"{{ .ID }}", "Image": "{{ .Image }}", console.log('Number of files ' + stdout); console.log('Number string ' + string); console.log('stringify ' + JSON.stringify(datajson)); - var total = datajson.length - var perpage = 5 - var page = 1 - var lastpage = total/5 - var from = 1 - var to = 5 + var total = datajson.length; + var perpage = per_page + //var page = 1 + var lastpage = Math.trunc(total/5); + + if(lastpage <= 1) { + lastpage=1 + }else{ + lastpage++ + } + + var next=(page+1); + if(next >= lastpage){ + next=lastpage; + } + var prev=(page-1); + if(prev == 0){ + prev=1; + } + var from=((page-1)*perpage)+1; + var to=(perpage*page) + + var myplaybooks = new Object(); var links = ` { @@ -136,15 +156,18 @@ var showexec = `docker ps --format '{"ID":"{{ .ID }}", "Image": "{{ .Image }}", "per_page": ${perpage}, "current_page": ${page}, "last_page": ${lastpage}, - "next_page_url": "?page=$next", - "prev_page_url": "?page=$prev", + "next_page_url": "?page=${next}", + "prev_page_url": "?page=${prev}", "from": ${from}, "to": ${to}, - "frommongo": "frommongo", - "tomongo": "tomongo" + "frommongo": ${from}, + "tomongo": ${to} } } ` + //"next_page_url": "?page="+${next}, + //"prev_page_url": "?page="+${prev}, +//console.log(JSON.stringify(links)) //myplaybooks.links = links myplaybooks.links = JSON.parse(links); myplaybooks.data = datajson; @@ -402,7 +425,7 @@ hybrid=$(hybrid_ifup) if [ $hybrid == 'NotOnline' ]; then echo "Swarmlab hybrid $hybrid" else - ip link set wg0 down + ip link set wg0 down ip link del wg0 sleep 3 hybrid1=$(hybrid_ifup) diff --git a/src/App.vue b/src/App.vue index 89dbc1d..aadd536 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,23 +6,13 @@ Swarmlab.io
+ + + + -
@@ -65,62 +90,210 @@ - + + + +
+ + +
+
+ + + Dashboard + + + Dashoard + + + + + Profile + + + + Settings + + + + + Hybrid + + + Zone + + + + + Container + + + Container + + + + + Private + + + Bootstrap + + + + + + + + + + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + - + + + + +
- - + - - - - + - - +
+ - - - - - diff --git a/src/App.vue.backup b/src/App.vue.backup new file mode 100644 index 0000000..069ed2c --- /dev/null +++ b/src/App.vue.backup @@ -0,0 +1,416 @@ + + + + + diff --git a/src/components/mynetwork/dockerservices.vue b/src/components/mynetwork/dockerservices.vue index a6a7543..63e2353 100644 --- a/src/components/mynetwork/dockerservices.vue +++ b/src/components/mynetwork/dockerservices.vue @@ -1,5 +1,5 @@ +
@@ -92,7 +93,8 @@
- + +