Merge pull request #44 from hilbert/feature/hilbert_cli_tools

Adding Server- & Client-side CLI Hilbert tools

.gitattributes

@@ -1,4 +1,4 @@
-config/hilbert_cli_config.py ident
+hilbert_config/hilbert_cli_config.py ident
 tools/hilbert.py ident
 tools/hilbert-station ident
 

.gitignore

@@ -9,3 +9,5 @@ __pycache__
 .tox/
 .cache/
 MANIFEST
+dist/
+.legacy/

station/compose.cfg → .legacy/station/compose.cfg

@@ -8,12 +8,16 @@ export PULSE_COOKIE=${PULSE_COOKIE:-${HOME}/.config/pulse/cookie}
 
 if [ -z "${DISPLAY}" ]; then
   if [ -r "/tmp/x.id" ]; then
-    N=$(cat /tmp/x.id | grep 'DISPLAY_NUM:' | tail -n 1 | sed s@DISPLAY_NUM:@@g)  
+    N=$(cat /tmp/x.id | grep 'DISPLAY_NUM:' | tail -n 1 | sed s@DISPLAY_NUM:@@g)
+  fi
 
-    if [ -f "/tmp/.X${N}-lock" ]; then
-      export DISPLAY="unix:${N}"
+  if [ -f "/tmp/.X${N}-lock" ]; then
+      export DISPLAY=":${N}"
       # TODO: make sure we can use it!
-    fi    
+  else
+    # TODO: FIXME: Quick and dirty hack for now... 
+    export DISPLAY=:0
+    export XAUTHORITY=/run/user/${UID}/gdm/Xauthority
   fi
 fi
 
@@ -25,7 +29,7 @@ do
 #    for ((;;N++)); do
         if [ -f "/tmp/.X${N}-lock" ]; then
             # TODO: make sure we can use it!
-            export DISPLAY="unix:${N}"
+            export DISPLAY=":${N}"
             break;
         fi;
         N=$((N+1))
@@ -43,41 +47,43 @@ if [ -n "${DISPLAY}" ]; then
 fi
 
 #unset XAUTHORITY
-
+
+export HILBERT_OMD_PATH="${HILBERT_OMD_PATH:-${HOME}/.config/hilbert-omd/}" # persistent storage for OMD
+
+export HILBERT_CONSUL_DATA="${HILBERT_CONSUL_DATA:-${PWD}/KV}"
+export HILBERT_REGISTRY_BASEDIR="${HILBERT_REGISTRY_BASEDIR:-${PWD}/REG}"
 
 export HB_PORT="${HB_PORT:-8888}"
 export HB_HOST="${HB_HOST:-127.0.0.1}"
 ## station_id??
 
-HB_DEFAULT_URL="http://${HB_HOST}:${HB_PORT}"
-export HB_URL=${HB_URL:-$HB_DEFAULT_URL}
+export HB_URL="${HB_URL:-${HILBERT_HEARTBEAT_URL:-http://${HB_HOST}:${HB_PORT}}}"
 
 export HB_INIT_TIMEOUT=3
 
-### For now...
-export station_public_ip=""
-export management_server=''
-export management_server_ip=""
-
-#### ip ro ### | awk '/^default/{print $3}'
+## inherited settings from prototype main interactive script:
+export CUPS_SERVER="${CUPS_SERVER:-${HILBERT_CUPS_SERVER}}"
+export MOUSE_CURSOR="${MOUSE_CURSOR:-${HILBERT_HIDE_MOUSE_CURSOR:-on}}"
+export CUSTOMIZATION="${CUSTOMIZATION:-${HILBERT_CUSTOMIZATIONS:-alsa nv vb}}"
+export ALSA_CARD="${ALSA_CARD:-${HILBERT_ALSA_CARD}}"
+export LANGUAGE="${LANGUAGE:-${HILBERT_PREFERRED_LANGUAGE:-en}}"
 
+## export MENU_TRY="gui"
+export VNC_PASSWD=""
 
-export qrs_screenshot_message="Bild gespeichert.\n\nImage saved."
-export qr_uploadlocs="/tmp/"
+export WEBGL_APPS="${WEBGL_APPS:-${HILBERT_WEBGL_APPS:-http://127.0.0.1:8080}}"
 
 # QR device ID (according to xinput):
-
 export QR_DEVICE_ID="keyboard:AT Translated Set 2 keyboard"
 ## export QR_DEVICE_ID="keyboard:Mitsumi Electric Apple Extended USB Keyboard"
 # export QR_DEVICE_ID="13"
 
-## inherited settings from prototype main interactive script:
-export CUPS_SERVER=""
-export MOUSE_CURSOR="on"
-export CUSTOMIZATION="alsa nv vb"
-export ALSA_CARD="1"
-export LANGUAGE="en"
-## export MENU_TRY="gui"
-export VNC_PASSWD=""
+export qrs_screenshot_message="Bild gespeichert.\n\nImage saved."
+export qr_uploadlocs="/tmp/"
 
-export WEBGL_APPS="${WEBGL_APPS:-http://supernova.mfo.de:7070}"
+
+
+##################### For now ... ############################### 
+export station_public_ip=""
+export management_server=''
+export management_server_ip=""

station/default.sh → .legacy/station/default.sh

@@ -1,16 +1,25 @@
-#!/bin/sh
+#! /usr/bin/env bash
 
 SELFDIR=`dirname "$0"`
 SELFDIR=`cd "$SELFDIR" && pwd`
 cd "${SELFDIR}/"
 
-### set -e
-## unset DISPLAY
-
 #! NOTE: cleanup all previously started containers:
 # docker ps -aq | xargs --no-run-if-empty docker rm -fv
 # docker images -q -a | xargs --no-run-if-empty docker rmi
 
+
+if [ ! -f /tmp/OGL.tgz ]; then
+  if [ -f ./OGL.tgz ]; then
+    cp -fp ./OGL.tgz /tmp/ || sudo -n -P cp -fp ./OGL.tgz /tmp/
+  fi
+fi
+
+if [ ! -f /tmp/OGL.tgz ]; then
+  echo "WARNING: Missing 'OGL.tgz'! Please regenerate and place to '${SELFDIR}/' or '/tmp/'!"
+fi
+
+
 if [ -r "./station.cfg" ]; then
     . "./station.cfg"
 fi

station/finishall.sh → .legacy/station/finishall.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /usr/bin/env bash
 
 SELFDIR=`dirname "$0"`
 SELFDIR=`cd "$SELFDIR" && pwd`

station/luncher.sh → .legacy/station/luncher.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /usr/bin/env bash
 
 #
 # Run docker-compose within 'ddd'

station/prepare.sh → .legacy/station/prepare.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 
 ### Preparation for actual docker-framework
 

station/topswitch.sh → .legacy/station/topswitch.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /usr/bin/env bash
 
 SELFDIR=`dirname "$0"`
 SELFDIR=`cd "$SELFDIR" && pwd`

.travis.yml

@@ -1,6 +1,8 @@
 language: python
 sudo: false
 
+before_cache:
+  - rm -rf $HOME/.cache/pip/log
 cache:
   directories:
     - $HOME/.cache/pip
@@ -13,11 +15,12 @@ matrix:
       env: TOXENV=py34
 
 install:
-  - ./.travis/install.sh
+  - pip install --upgrade tox
+  - "TOX_ENV=${TRAVIS_PYTHON_VERSION/[0-9].[0-9]/py${TRAVIS_PYTHON_VERSION/.}}"
 
+#  - source ~/.venv/bin/activate
 script:
-  - source ~/.venv/bin/activate
-  - tox
+  - tox -e $TOX_ENV
 
 notifications:
   email:

CHANGELOG.md

@@ -7,13 +7,15 @@
 - Changelog according to (http://keepachangelog.com/)
 - License: Apache v2
 - Git branching model
+- Server-side Hilbert CLI (python) tool: `tools/hilbert` (low-level management using Hilbert YAML Configuration)
+- Client-side Hilbert CLI (bash) tool: `tools/hilbert-station` (low-level wrapper around docker/docker-compose and run remote actions for the server-side tool)
 
 ### Changed
-- Restructurization/migration of older `malex984/dockapp` to `hilbert/hilbert-*`
+- Restructurization/migration of older `malex984/dockapp` into sparate repos: `hilbert/hilbert-cli`, `hilbert/hilbert-heartbeat`, `hilbert/hilbert-docker-images`
 - Migration of high-level scripts from Dashboard to `hilbert/hilbert-cli`
 
 ### Security 
-- Starting to remove `sudo` and `privileged` requirements 
+- Starting to remove `sudo` and `privileged` requirements (and pid=host)
 
 ## [0.1.0] - 2016-09-02
 ### Added

Makefile

@@ -12,8 +12,8 @@ usage: # Print Targets
 	@grep '^[^#[:space:]].*:' Makefile
 
 check: # Run the tests
-	/bin/bash -c 'py.test -v -l --tb=auto --full-trace --color=auto tests/test_*.py'
-	/bin/bash -c 'py.test-3 -v -l --tb=auto --full-trace --color=auto tests/test_*.py'
+	/bin/bash -c 'py.test -vv -l --tb=auto --full-trace --color=auto tests/test_*.py'
+	/bin/bash -c 'py.test-3 -vv -l --tb=auto --full-trace --color=auto tests/test_*.py'
 
 tox: tox.ini setup.py # Run clean testing via tox
 	tox

NOTICE

@@ -13,3 +13,7 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+-  `station/docker-gc` is our modification of [docker-gc](https://github.com/spotify/docker-gc.git)
+   Copyright (c) 2014 Spotify AB.
+   Licensed under the Apache License, Version 2.0