diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/README.rst | 14 | ||||
| -rwxr-xr-x | docker/debian/apt-bitmask.sh | 17 | ||||
| -rwxr-xr-x | docker/leap_bootstrap.sh | 4 |
3 files changed, 19 insertions, 16 deletions
diff --git a/docker/README.rst b/docker/README.rst index dcad0ac6..4a2d08e7 100644 --- a/docker/README.rst +++ b/docker/README.rst @@ -6,11 +6,9 @@ Here we have several tools that leverages docker to ease Bitmask testing. ``bitmask-docker.sh`` is a helper script to ``build`` and ``run`` the bitmask app, here is an example usage:: - $ ./bitmask-docker build # build docker image - $ ./bitmask-docker init ro bitmask-nightly.json # initialize all the stuff needed - # .... - $ ./bitmask-docker.sh run - + $ ./bitmask-docker.sh build # build docker image + $ ./bitmask-docker.sh init bitmask-nightly.json # initialize (takes time) + $ ./bitmask-docker.sh run # run bitmask in docker ``bitmask-nightly.json`` is the version specifier for each bitmask component that will be used to run bitmask. @@ -21,10 +19,10 @@ will be used to run bitmask. python dependencies, running bitmask, etc. -debian/ +Debian/ ------- -``apt-bitmask.sh`` script that installs bitmask from the debian packages. +``apt-bitmask.sh`` script that installs bitmask from the Debian packages. ``bitmask-on-docker.sh`` installs bitmask and runs it in a dummy X server, waits a little and takes a screenshot. @@ -32,7 +30,7 @@ waits a little and takes a screenshot. ``leap-experimental.key`` is needed by ``apt-bitmask.sh`` to ``apt-key add`` and verify apt sources. -``run-docker-for-bitmask.sh`` is a helper script that runs an ubuntu/debian +``run-docker-for-bitmask.sh`` is a helper script that runs an Ubuntu/Debian container ready to run the ``apt-bitmask.sh`` command, it does (among other stuff) X11 forwarding to display Bitmask UI on the host linux. diff --git a/docker/debian/apt-bitmask.sh b/docker/debian/apt-bitmask.sh index 68430aff..99c5f07e 100755 --- a/docker/debian/apt-bitmask.sh +++ b/docker/debian/apt-bitmask.sh @@ -20,6 +20,7 @@ distro(){ ['qiana']='trusty' ['rebecca']='trusty' ['rafaela']='trusty' + ['sana']='jessie' ) # if name is in the above list -> replace @@ -30,15 +31,16 @@ distro(){ is_supported(){ distros=( - 'wheezy' # Debian 7 - stable + # 'wheezy' # Debian 7 - stable 'jessie' # Debian 8 - testing 'sid' # Debian unstable - 'quantal' # Ubuntu 12.10 - 'raring' # Ubuntu 13.04 - 'saucy' # Ubuntu 13.10 - 'trusty' # Ubuntu 14.04 - 'utopic' # Ubuntu 14.10 + # 'quantal' # Ubuntu 12.10 + # 'raring' # Ubuntu 13.04 + # 'saucy' # Ubuntu 13.10 + # 'trusty' # Ubuntu 14.04 + # 'utopic' # Ubuntu 14.10 'vivid' # Ubuntu 15.04 + 'wily' # Ubuntu 15.10 ) my_distro=`distro` @@ -115,8 +117,7 @@ else # $REPO == 'experimental' apt-key add leap-experimental.key fi -echo "deb http://deb.leap.se/$REPO $DISTRO main" > /etc/apt/sources.list.d/bitmask.list -echo "deb-src http://deb.leap.se/$REPO $DISTRO main" >> /etc/apt/sources.list.d/bitmask.list +echo "deb http://deb.bitmask.net/$REPO $DISTRO main" > /etc/apt/sources.list.d/bitmask.list apt-get update apt-get install -y bitmask diff --git a/docker/leap_bootstrap.sh b/docker/leap_bootstrap.sh index 4f553ee7..a717ab6d 100755 --- a/docker/leap_bootstrap.sh +++ b/docker/leap_bootstrap.sh @@ -271,6 +271,10 @@ EOF install_dependencies setup_develop + cd $REPOS_ROOT/bitmask_client/ + make + cd - + set +x echo "${cc_green}Status: $status done!${cc_normal}" } |