From c8bc7169b56405e644933e6fa314e486975e40ce Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Wed, 4 Nov 2015 12:12:19 -0300 Subject: [pkg] update supported distros for .deb packages --- docker/debian/apt-bitmask.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'docker') diff --git a/docker/debian/apt-bitmask.sh b/docker/debian/apt-bitmask.sh index 68430aff..59226be1 100755 --- a/docker/debian/apt-bitmask.sh +++ b/docker/debian/apt-bitmask.sh @@ -30,15 +30,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` -- cgit v1.2.3 From b370dfa37265ec7df99c8a85f2b7b7866a9a6b74 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Sat, 7 Nov 2015 15:01:11 +0100 Subject: Debian capitalization Solves https://www.transifex.com/otf/bitmask/translate/#es/$/31977728 --- docker/README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/README.rst b/docker/README.rst index dcad0ac6..70d44809 100644 --- a/docker/README.rst +++ b/docker/README.rst @@ -21,10 +21,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 +32,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. -- cgit v1.2.3 From 2a124d7352518cd2a08b01561eb6621b2bd74748 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Mon, 16 Nov 2015 14:54:20 -0300 Subject: [feat] use bitmask repo instead of leap.se Also map 'sana' (codename for kali linux 2.0) to jessie. --- docker/debian/apt-bitmask.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/debian/apt-bitmask.sh b/docker/debian/apt-bitmask.sh index 59226be1..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 @@ -116,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 -- cgit v1.2.3 From e847bf6a59783611bf14fa7f480fabe58e0b13dd Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Fri, 18 Dec 2015 13:27:18 +0100 Subject: [bug] run make on bitmask_client when updating docker --- docker/leap_bootstrap.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docker') 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}" } -- cgit v1.2.3 From eb55be39cea024b253ee784dc304e72f1af94d7f Mon Sep 17 00:00:00 2001 From: Elijah Sparrow Date: Wed, 13 Jan 2016 15:27:47 -0800 Subject: update docker readme fix docker readme to reflect the proper commands --- docker/README.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'docker') diff --git a/docker/README.rst b/docker/README.rst index 70d44809..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. -- cgit v1.2.3