You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2016/07/12 17:25:18 UTC
[3/7] fauxton commit: updated refs/heads/master to ced196a
move docker install into own file
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/5f983920
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/5f983920
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/5f983920
Branch: refs/heads/master
Commit: 5f983920603cc6cee4c3cc9ee4c6b677a8395a87
Parents: 62c83b5
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Jul 5 10:16:56 2016 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Tue Jul 12 19:24:44 2016 +0200
----------------------------------------------------------------------
.travis.yml | 12 +-----------
bin/install-docker-travis.sh | 10 ++++++++++
package.json | 2 ++
3 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5f983920/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index d2419a7..92c19dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,18 +10,8 @@ git:
env:
DOCKER_COMPOSE_VERSION: 1.8.0-rc1
-before_install:
- - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-precise main" > /etc/apt/sources.list.d/docker.list'
- - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
- - sudo apt-get update
- - sudo apt-key update
- - sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=1.11.1-0~precise
- - sudo rm /usr/local/bin/docker-compose
- - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- - chmod +x docker-compose
- - sudo mv docker-compose /usr/local/bin
-
before_script:
+ - ./bin/install-docker-travis.sh
- npm run docker:up
- npm install
- docker logs couchdb
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5f983920/bin/install-docker-travis.sh
----------------------------------------------------------------------
diff --git a/bin/install-docker-travis.sh b/bin/install-docker-travis.sh
new file mode 100755
index 0000000..846428f
--- /dev/null
+++ b/bin/install-docker-travis.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-precise main" > /etc/apt/sources.list.d/docker.list'
+sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+sudo apt-get update
+sudo apt-key update
+sudo apt-get -qqy -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install docker-engine=1.11.1-0~precise
+sudo rm /usr/local/bin/docker-compose
+curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+chmod +x docker-compose
+sudo mv docker-compose /usr/local/bin
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/5f983920/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index db388e4..2371498 100644
--- a/package.json
+++ b/package.json
@@ -111,6 +111,8 @@
"preversion": "node version-check.js && grunt release",
"create:animaldb": "./bin/create-animal-db",
"docker:couchdb-up": "docker-compose -f ./docker/dc.selenium.yml up -d couchdb",
+ "docker:selenium-up": "docker-compose -f ./docker/dc.selenium.yml up -d selenium",
+ "docker:selenium-debug-up": "docker-compose -f ./docker/dc.selenium.yml -f ./docker/dc.selenium-debug.yml up -d selenium",
"docker:reset": "npm run docker:down && npm run docker:up",
"docker:logs": "docker logs couchdb",
"docker:up": "docker-compose -f ./docker/dc.selenium.yml up -d",