From 0514978eeed0e4db41fe13b3352ab55ccf299ef1 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Fri, 22 Jul 2016 20:14:26 +0200
Subject: [test] fail gracefully on cert delete

---
 scripts/docker/files/bin/setup-test-env.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'scripts/docker')

diff --git a/scripts/docker/files/bin/setup-test-env.py b/scripts/docker/files/bin/setup-test-env.py
index 0f3ea6f4..c0487e8f 100755
--- a/scripts/docker/files/bin/setup-test-env.py
+++ b/scripts/docker/files/bin/setup-test-env.py
@@ -389,8 +389,11 @@ def cert_create(args):
 def cert_delete(args):
     private_key = os.path.join(args.basedir, args.private_key)
     cert_key = os.path.join(args.basedir, args.cert_key)
-    os.unlink(private_key)
-    os.unlink(cert_key)
+    try:
+        os.unlink(private_key)
+        os.unlink(cert_key)
+    except OSError:
+        pass
 
 
 #
-- 
cgit v1.2.3


From c2849c2f13adfc7c1388de50f41cd234868113ec Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Fri, 22 Jul 2016 20:15:35 +0200
Subject: [test] update docker readme and todo

---
 scripts/docker/README.md | 9 +++++++++
 scripts/docker/TODO      | 4 ++++
 2 files changed, 13 insertions(+)

(limited to 'scripts/docker')

diff --git a/scripts/docker/README.md b/scripts/docker/README.md
index c4d7ac94..fda1c04a 100644
--- a/scripts/docker/README.md
+++ b/scripts/docker/README.md
@@ -14,6 +14,15 @@ Check the `Makefile` for the rules for running containers.
 Check the `helper/` directory for scripts that help running tests.
 
 
+Installation
+------------
+
+0. update and install 
+1. Install docker for your system: https://docs.docker.com/
+2. Build the image by running `make`
+3. Use one of the scripts in the `helper/` directory
+
+
 Environment variables for docker containers
 -------------------------------------------
 
diff --git a/scripts/docker/TODO b/scripts/docker/TODO
index 5185d754..90597637 100644
--- a/scripts/docker/TODO
+++ b/scripts/docker/TODO
@@ -1 +1,5 @@
 - limit resources of containers (mem and cpu)
+- allow running couchdb on another container
+- use a config file to get defaults for running tests
+- use the /builds directory as base of git repo
+- save the test state to a directory to make it reproducible
-- 
cgit v1.2.3


From 23fe0be50c7c9408eab47e8286e19b16a77f66ad Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 25 Jul 2016 08:06:39 -0300
Subject: [test] remove ddocs param from docker setup script

---
 scripts/docker/files/bin/setup-test-env.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'scripts/docker')

diff --git a/scripts/docker/files/bin/setup-test-env.py b/scripts/docker/files/bin/setup-test-env.py
index c0487e8f..4868fd56 100755
--- a/scripts/docker/files/bin/setup-test-env.py
+++ b/scripts/docker/files/bin/setup-test-env.py
@@ -194,12 +194,12 @@ def user_db_create(args):
     url = 'http://localhost:%d/user-%s' % (args.port, args.uuid)
     try:
         CouchDatabase.open_database(
-            url=url, create=False, replica_uid=None, ensure_ddocs=True)
+            url=url, create=False, replica_uid=None)
         print '[*] error: database "user-%s" already exists' % args.uuid
         exit(1)
     except DatabaseDoesNotExist:
         CouchDatabase.open_database(
-            url=url, create=True, replica_uid=None, ensure_ddocs=True)
+            url=url, create=True, replica_uid=None)
         print '[+] database created: user-%s' % args.uuid
 
 
@@ -372,7 +372,10 @@ CERT_CONFIG_FILE = os.path.join(
 def cert_create(args):
     private_key = os.path.join(args.basedir, args.private_key)
     cert_key = os.path.join(args.basedir, args.cert_key)
-    os.mkdir(args.basedir)
+    try:
+        os.mkdir(args.basedir)
+    except OSError:
+        pass
     call([
         'openssl',
         'req',
-- 
cgit v1.2.3


From bf9355077c2f190c82d660ad9b7059a1c3f32a8d Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 25 Jul 2016 11:37:47 -0300
Subject: [test] use tox to create docker image

---
 scripts/docker/Dockerfile | 46 ++++++++++------------------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

(limited to 'scripts/docker')

diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 915508ea..2ec310a9 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -1,51 +1,25 @@
 # start with a fresh debian image
 FROM debian
 
-# expose soledad server port in case we want to run a server container
-EXPOSE 2424
-
-# install dependencies from debian repos
-COPY files/apt/leap.list /etc/apt/sources.list.d/
-
-RUN apt-get update
-RUN apt-get -y --force-yes install leap-archive-keyring
-
 RUN apt-get update
 
 RUN apt-get -y install git
-RUN apt-get -y install vim
-RUN apt-get -y install python-ipdb
-
-# install python deps
+# needed to build python twisted module
 RUN apt-get -y install libpython2.7-dev
-RUN apt-get -y install libffi-dev
+# needed to build python cryptography module
 RUN apt-get -y install libssl-dev
-RUN apt-get -y install libzmq3-dev
-RUN apt-get -y install python-pip
-RUN apt-get -y install couchdb
-RUN apt-get -y install python-srp
-RUN apt-get -y install python-scrypt
-RUN apt-get -y install leap-keymanager
-RUN apt-get -y install python-tz
 
+# install pip and tox
+RUN apt-get -y install python-pip
 RUN pip install -U pip
-RUN pip install psutil
-
-# install soledad-perf deps
-RUN pip install klein
-RUN apt-get -y install curl
-RUN apt-get -y install httperf
+RUN pip install tox
 
 # clone repositories
-ENV BASEURL "https://github.com/leapcode"
-ENV VARDIR "/var/local"
-ENV REPOS "soledad leap_pycommon soledad-perf"
-RUN for repo in ${REPOS}; do git clone ${BASEURL}/${repo}.git /var/local/${repo}; done
+RUN mkdir -p /builds/leap
+RUN git clone -b develop https://0xacab.org/leap/soledad.git /builds/leap/soledad
 
-# copy over files to help setup the environment and run soledad
-RUN mkdir -p /usr/local/soledad
-
-COPY files/build/install-deps-from-repos.sh /usr/local/soledad/
-RUN /usr/local/soledad/install-deps-from-repos.sh
+# use tox to install everything needed to run tests
+RUN cd /builds/leap/soledad/testing && tox -v -r --notest
 
+RUN mkdir -p /usr/local/soledad
 COPY files/bin/ /usr/local/soledad/
-- 
cgit v1.2.3


From 8d08016b6e5985569ca5d04ef3e2690e78809f54 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 25 Jul 2016 11:38:19 -0300
Subject: [test] use tox and couchdb image to run tests

---
 scripts/docker/Makefile             | 17 +++++++++++------
 scripts/docker/files/bin/run-tox.sh | 14 ++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100755 scripts/docker/files/bin/run-tox.sh

(limited to 'scripts/docker')

diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 4fa2e264..6f30a341 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -27,11 +27,14 @@ MEMORY               ?= 512m
 # Docker image generation (main make target) #
 ##############################################
 
-all: image
+all: soledad-image couchdb-image
 
-image:
+soledad-image:
 	docker build -t $(IMAGE_NAME) .
 
+couchdb-image:
+	docker pull couchdb
+
 ##################################################
 # Run a Soledad Server inside a docker container #
 ##################################################
@@ -69,16 +72,18 @@ run-client-bootstrap:
 	  /usr/local/soledad/run-client-bootstrap.sh
 
 #################################################
-# Run all trial tests inside a docker container #
+# Run all tests inside a docker container       #
 #################################################
 
-run-trial:
+run-tox:
+	docker run -d --name couchdb couchdb
 	docker run -t -i \
 	  --memory="$(MEMORY)" \
 	  --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \
 	  --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \
+	  --link couchdb \
 	  $(IMAGE_NAME) \
-	  /usr/local/soledad/run-trial.sh
+	  /usr/local/soledad/run-tox.sh
 
 ############################################
 # Performance tests and graphic generation #
@@ -123,7 +128,7 @@ cp-perf-result:
 # Other helper targets #
 ########################
 
-run-shell: image
+run-shell: soledad-image
 	docker run -t -i \
 	  --memory="$(MEMORY)" \
 	  $(IMAGE_NAME) \
diff --git a/scripts/docker/files/bin/run-tox.sh b/scripts/docker/files/bin/run-tox.sh
new file mode 100755
index 00000000..793ce6e1
--- /dev/null
+++ b/scripts/docker/files/bin/run-tox.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+REPO=/builds/leap/soledad/testing
+
+if [ ! -z "${SOLEDAD_REMOTE}" ]; then
+  git -C ${REPO} remote set-url origin ${SOLEDAD_REMOTE}
+  git -C ${REPO} fetch origin
+fi
+
+if [ ! -z "${SOLEDAD_BRANCH}" ]; then
+  git -C ${REPO} checkout ${SOLEDAD_BRANCH}
+fi
+
+(cd ${REPO}; tox -- -v --durations 0 --couch-url http://couchdb:5984)
-- 
cgit v1.2.3


From 1a8ea1fde14eb5b2d2c4d4165c4bc21031512d06 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 25 Jul 2016 11:39:38 -0300
Subject: [test] use docker image with couchdb service to run tests

---
 scripts/docker/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'scripts/docker')

diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 2ec310a9..1e46fda3 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -4,13 +4,16 @@ FROM debian
 RUN apt-get update
 
 RUN apt-get -y install git
+
 # needed to build python twisted module
 RUN apt-get -y install libpython2.7-dev
 # needed to build python cryptography module
 RUN apt-get -y install libssl-dev
+RUN apt-get -y install libffi-dev
 
 # install pip and tox
 RUN apt-get -y install python-pip
+
 RUN pip install -U pip
 RUN pip install tox
 
-- 
cgit v1.2.3


From 92813593b93d9788fd978acdeeba59d32c311d48 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 25 Jul 2016 21:25:46 -0300
Subject: [test] use pip download cache for tests and docker image

---
 scripts/docker/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

(limited to 'scripts/docker')

diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 1e46fda3..8c6bfdb3 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -13,7 +13,6 @@ RUN apt-get -y install libffi-dev
 
 # install pip and tox
 RUN apt-get -y install python-pip
-
 RUN pip install -U pip
 RUN pip install tox
 
-- 
cgit v1.2.3


From 6f98a8d61c33a4fc3619f998eeea0075d51c739b Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 25 Jul 2016 21:31:46 -0300
Subject: [test] add rules to run perf test on docker with separate couchdb
 server container

---
 scripts/docker/Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'scripts/docker')

diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 6f30a341..6ad4cced 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -89,8 +89,15 @@ run-tox:
 # Performance tests and graphic generation #
 ############################################
 
-run-perf-test:
-	helper/run-test.sh perf
+run-perf:
+	docker run -d --name couchdb couchdb
+	docker run -t -i \
+	  --memory="$(MEMORY)" \
+	  --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \
+	  --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \
+	  --link couchdb \
+	  $(IMAGE_NAME) \
+	  /usr/local/soledad/run-tox-perf.sh
 
 run-client-perf:
 	@if [ -z "$(CONTAINER_ID_FILE)" ]; then \
-- 
cgit v1.2.3


From 76acb8f39a32b6b61f00af571bae9bd48c0a5d62 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 25 Jul 2016 21:51:45 -0300
Subject: [test] use random name for couchdb container in docker perf test

---
 scripts/docker/Makefile              | 15 ++++++++++-----
 scripts/docker/files/bin/run-perf.sh | 20 ++++++++++++++++++++
 scripts/docker/files/bin/run-tox.sh  |  5 ++++-
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100755 scripts/docker/files/bin/run-perf.sh

(limited to 'scripts/docker')

diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 6ad4cced..4b4d4496 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -76,12 +76,14 @@ run-client-bootstrap:
 #################################################
 
 run-tox:
-	docker run -d --name couchdb couchdb
+	name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \
+	docker run -d --name $${name} couchdb; \
 	docker run -t -i \
 	  --memory="$(MEMORY)" \
 	  --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \
 	  --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \
-	  --link couchdb \
+	  --env="COUCH_URL=http://$${name}:5984" \
+	  --link $${name} \
 	  $(IMAGE_NAME) \
 	  /usr/local/soledad/run-tox.sh
 
@@ -90,14 +92,17 @@ run-tox:
 ############################################
 
 run-perf:
-	docker run -d --name couchdb couchdb
+	name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \
+	docker run -d --name $${name} couchdb; \
 	docker run -t -i \
 	  --memory="$(MEMORY)" \
 	  --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \
 	  --env="SOLEDAD_BRANCH=$(SOLEDAD_BRANCH)" \
-	  --link couchdb \
+	  --env="SOLEDAD_PRELOAD_NUM=$(SOLEDAD_PRELOAD_NUM)" \
+	  --env="COUCH_URL=http://$${name}:5984" \
+	  --link $${name} \
 	  $(IMAGE_NAME) \
-	  /usr/local/soledad/run-tox-perf.sh
+	  /usr/local/soledad/run-perf.sh
 
 run-client-perf:
 	@if [ -z "$(CONTAINER_ID_FILE)" ]; then \
diff --git a/scripts/docker/files/bin/run-perf.sh b/scripts/docker/files/bin/run-perf.sh
new file mode 100755
index 00000000..35c7f006
--- /dev/null
+++ b/scripts/docker/files/bin/run-perf.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+REPO=/builds/leap/soledad/testing
+COUCH_URL="${COUCH_URL:-http://127.0.0.1:5984}"
+
+if [ ! -z "${SOLEDAD_REMOTE}" ]; then
+  git -C ${REPO} remote set-url origin ${SOLEDAD_REMOTE}
+  git -C ${REPO} fetch origin
+fi
+
+if [ ! -z "${SOLEDAD_BRANCH}" ]; then
+  git -C ${REPO} checkout ${SOLEDAD_BRANCH}
+fi
+
+cd ${REPO}
+
+tox perf -- \
+	--durations 0 \
+	--couch-url ${COUCH_URL} \
+	--twisted
diff --git a/scripts/docker/files/bin/run-tox.sh b/scripts/docker/files/bin/run-tox.sh
index 793ce6e1..74fde182 100755
--- a/scripts/docker/files/bin/run-tox.sh
+++ b/scripts/docker/files/bin/run-tox.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 REPO=/builds/leap/soledad/testing
+COUCH_URL="${COUCH_URL:-http://127.0.0.1:5984}"
 
 if [ ! -z "${SOLEDAD_REMOTE}" ]; then
   git -C ${REPO} remote set-url origin ${SOLEDAD_REMOTE}
@@ -11,4 +12,6 @@ if [ ! -z "${SOLEDAD_BRANCH}" ]; then
   git -C ${REPO} checkout ${SOLEDAD_BRANCH}
 fi
 
-(cd ${REPO}; tox -- -v --durations 0 --couch-url http://couchdb:5984)
+cd ${REPO}
+
+tox -- --couch-url ${COUCH_URL}
-- 
cgit v1.2.3


From de5cd462cc3f04275e22d9267ecb8e6c2b23dfda Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 25 Jul 2016 21:34:23 -0300
Subject: [test] allow passing number of docs on command line on perf tests

---
 scripts/docker/files/bin/run-perf.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/docker')

diff --git a/scripts/docker/files/bin/run-perf.sh b/scripts/docker/files/bin/run-perf.sh
index 35c7f006..72060230 100755
--- a/scripts/docker/files/bin/run-perf.sh
+++ b/scripts/docker/files/bin/run-perf.sh
@@ -2,6 +2,7 @@
 
 REPO=/builds/leap/soledad/testing
 COUCH_URL="${COUCH_URL:-http://127.0.0.1:5984}"
+SOLEDAD_PRELOAD_NUM="${SOLEDAD_PRELOAD_NUM:-100}"
 
 if [ ! -z "${SOLEDAD_REMOTE}" ]; then
   git -C ${REPO} remote set-url origin ${SOLEDAD_REMOTE}
@@ -17,4 +18,5 @@ cd ${REPO}
 tox perf -- \
 	--durations 0 \
 	--couch-url ${COUCH_URL} \
-	--twisted
+	--twisted \
+	--num-docs ${SOLEDAD_PRELOAD_NUM}
-- 
cgit v1.2.3


From 682aab0b30e479ea4e826f0636340bb100b36c0a Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 26 Jul 2016 13:44:50 -0300
Subject: [test] add custom couchdb docker image

---
 scripts/docker/Makefile           |  6 +++---
 scripts/docker/README.md          | 14 +++++++++-----
 scripts/docker/couchdb/Dockerfile |  3 +++
 scripts/docker/couchdb/Makefile   |  4 ++++
 scripts/docker/couchdb/README.rst | 12 ++++++++++++
 scripts/docker/couchdb/local.ini  |  2 ++
 6 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 scripts/docker/couchdb/Dockerfile
 create mode 100644 scripts/docker/couchdb/Makefile
 create mode 100644 scripts/docker/couchdb/README.rst
 create mode 100644 scripts/docker/couchdb/local.ini

(limited to 'scripts/docker')

diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 4b4d4496..1bb57757 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -33,7 +33,7 @@ soledad-image:
 	docker build -t $(IMAGE_NAME) .
 
 couchdb-image:
-	docker pull couchdb
+	(cd couchdb/ && make)
 
 ##################################################
 # Run a Soledad Server inside a docker container #
@@ -77,7 +77,7 @@ run-client-bootstrap:
 
 run-tox:
 	name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \
-	docker run -d --name $${name} couchdb; \
+	docker run -d --name $${name} leap/couchdb; \
 	docker run -t -i \
 	  --memory="$(MEMORY)" \
 	  --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \
@@ -93,7 +93,7 @@ run-tox:
 
 run-perf:
 	name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \
-	docker run -d --name $${name} couchdb; \
+	docker run -d --name $${name} leap/couchdb; \
 	docker run -t -i \
 	  --memory="$(MEMORY)" \
 	  --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \
diff --git a/scripts/docker/README.md b/scripts/docker/README.md
index fda1c04a..97b39f87 100644
--- a/scripts/docker/README.md
+++ b/scripts/docker/README.md
@@ -11,16 +11,20 @@ Check the `Dockerfile` for the steps for creating the docker image.
 
 Check the `Makefile` for the rules for running containers.
 
-Check the `helper/` directory for scripts that help running tests.
-
 
 Installation
 ------------
 
-0. update and install 
 1. Install docker for your system: https://docs.docker.com/
-2. Build the image by running `make`
-3. Use one of the scripts in the `helper/` directory
+2. Build images by running `make`
+3. Execute `make run-tox` and `make run-perf` to run tox tests and perf tests,
+   respectivelly.
+4. You may want to pass some variables to the `make` command to control
+   parameters of execution, for example:
+
+      make run-perf SOLEDAD_PRELOAD_NUM=500
+
+   See more variables below.
 
 
 Environment variables for docker containers
diff --git a/scripts/docker/couchdb/Dockerfile b/scripts/docker/couchdb/Dockerfile
new file mode 100644
index 00000000..03448da5
--- /dev/null
+++ b/scripts/docker/couchdb/Dockerfile
@@ -0,0 +1,3 @@
+FROM couchdb:latest
+
+COPY local.ini /usr/local/etc/couchdb/
diff --git a/scripts/docker/couchdb/Makefile b/scripts/docker/couchdb/Makefile
new file mode 100644
index 00000000..cf3ac966
--- /dev/null
+++ b/scripts/docker/couchdb/Makefile
@@ -0,0 +1,4 @@
+IMAGE_NAME ?= leap/couchdb
+
+image:
+	docker build -t $(IMAGE_NAME) .
diff --git a/scripts/docker/couchdb/README.rst b/scripts/docker/couchdb/README.rst
new file mode 100644
index 00000000..31a791a8
--- /dev/null
+++ b/scripts/docker/couchdb/README.rst
@@ -0,0 +1,12 @@
+Couchdb Docker image
+====================
+
+This directory contains rules to build a custom couchdb docker image to be
+provided as backend to soledad server.
+
+Type `make` to build the image.
+
+Differences between this image and the official one:
+
+  - add the "nodelay" socket option on the httpd section of the config file
+    (see: https://leap.se/code/issues/8264).
diff --git a/scripts/docker/couchdb/local.ini b/scripts/docker/couchdb/local.ini
new file mode 100644
index 00000000..3650e0ed
--- /dev/null
+++ b/scripts/docker/couchdb/local.ini
@@ -0,0 +1,2 @@
+[httpd]
+socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
-- 
cgit v1.2.3


From 6fd0062c4c2199e610d7832bbfbd57a07abab9e1 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Tue, 9 Aug 2016 15:38:39 -0300
Subject: [test] use "leapcode" in docker image name

"leapcode" is the LEAP docker hub organisation varac could squat
(https://hub.docker.com/r/leap/ was already taken).
---
 scripts/docker/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/docker')

diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 1bb57757..0fdc93fa 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -16,7 +16,7 @@
 # Some configurations you might override when calling this makefile #
 #####################################################################
 
-IMAGE_NAME           ?= leap/soledad:1.0
+IMAGE_NAME           ?= leapcode/soledad:1.0
 SOLEDAD_REMOTE       ?= https://0xacab.org/leap/soledad.git
 SOLEDAD_BRANCH       ?= develop
 SOLEDAD_PRELOAD_NUM  ?= 100
-- 
cgit v1.2.3


From c326dae7b824366208220da94ca730788bb50a18 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor.shyba@gmail.com>
Date: Wed, 5 Oct 2016 01:15:50 -0300
Subject: [bug] adds libsqlcipher to docker

Current docker image is broken due missing libsqlcipher. This commit
adds it and jessie-backports due package needs.

Resolves: #8508
---
 scripts/docker/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/docker')

diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 8c6bfdb3..26d5f782 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -1,5 +1,5 @@
 # start with a fresh debian image
-FROM debian
+FROM debian:jessie-backports
 
 RUN apt-get update
 
@@ -10,6 +10,8 @@ RUN apt-get -y install libpython2.7-dev
 # needed to build python cryptography module
 RUN apt-get -y install libssl-dev
 RUN apt-get -y install libffi-dev
+# needed to build pysqlcipher
+RUN apt-get -y install libsqlcipher-dev
 
 # install pip and tox
 RUN apt-get -y install python-pip
-- 
cgit v1.2.3


From 308384eba7da58fbfdc17ead35a98216880206b5 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor.shyba@gmail.com>
Date: Wed, 5 Oct 2016 01:19:51 -0300
Subject: [feature] use latest image

Instead of hardcoding a version. This should give us the flexibility of
changing images without changing code.
---
 scripts/docker/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/docker')

diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 0fdc93fa..7050526a 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -16,7 +16,7 @@
 # Some configurations you might override when calling this makefile #
 #####################################################################
 
-IMAGE_NAME           ?= leapcode/soledad:1.0
+IMAGE_NAME           ?= leapcode/soledad:latest
 SOLEDAD_REMOTE       ?= https://0xacab.org/leap/soledad.git
 SOLEDAD_BRANCH       ?= develop
 SOLEDAD_PRELOAD_NUM  ?= 100
-- 
cgit v1.2.3


From e121a92161d3a18cebc8796d43b98c05b6916088 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor.shyba@gmail.com>
Date: Thu, 6 Oct 2016 18:56:25 -0300
Subject: [feature] adds libsqlite3-dev on docker image

This is necessary for keymanager and this image is shared, thus adding
here with a comment explaining why. Also explained why using
jessie-backports.
---
 scripts/docker/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'scripts/docker')

diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index 26d5f782..21764d84 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -1,4 +1,5 @@
 # start with a fresh debian image
+# we use backports because of libsqlcipher-dev
 FROM debian:jessie-backports
 
 RUN apt-get update
@@ -12,6 +13,8 @@ RUN apt-get -y install libssl-dev
 RUN apt-get -y install libffi-dev
 # needed to build pysqlcipher
 RUN apt-get -y install libsqlcipher-dev
+# needed to support keymanager
+RUN apt-get -y install libsqlite3-dev
 
 # install pip and tox
 RUN apt-get -y install python-pip
-- 
cgit v1.2.3