Merge pull request #7 from datatogether/ipfs_add_collection

Ipfs add collection
datatogether · Jul 14, 2017 · a724f49 · a724f49
2 parents 1454153 + 76f8d37
commit a724f49
Show file tree

Hide file tree

Showing 260 changed files with 80,369 additions and 406 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -45,16 +45,20 @@ jobs:
       - run:
           name: Install Docker client
           command: |
-            set -x
-            VER="17.03.0-ce"
-            curl -L -o /tmp/docker-$VER.tgz https://get.docker.com/builds/Linux/x86_64/docker-$VER.tgz
-            tar -xz -C /tmp -f /tmp/docker-$VER.tgz
-            mv /tmp/docker/* /usr/bin
+            if [ $CIRCLE_BRANCH = 'master' ]; then
+              set -x
+              VER="17.03.0-ce"
+              curl -L -o /tmp/docker-$VER.tgz https://get.docker.com/builds/Linux/x86_64/docker-$VER.tgz
+              tar -xz -C /tmp -f /tmp/docker-$VER.tgz
+              mv /tmp/docker/* /usr/bin
+            fi
       - run:
           name: Publish to Docker Hub
           command: |
-            TAG=0.1.$CIRCLE_BUILD_NUM
-            docker build -t datatogether/task-mgmt:latest -t datatogether/task-mgmt:$TAG .
-            docker login -u $DOCKER_USER -p $DOCKER_PASS
-            docker push datatogether/task-mgmt:$TAG
-            docker push datatogether/task-mgmt:latest
+            if [ $CIRCLE_BRANCH = 'master' ]; then
+              TAG=0.1.$CIRCLE_BUILD_NUM
+              docker build -t datatogether/task-mgmt:latest -t datatogether/task-mgmt:$TAG .
+              docker login -u $DOCKER_USER -p $DOCKER_PASS
+              docker push datatogether/task-mgmt:$TAG
+              docker push datatogether/task-mgmt:latest
+            fi
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/accept_tasks.go b/accept_tasks.go
@@ -11,7 +11,8 @@ import (
 )
 
 func configureTasks() {
-	tasks.RegisterTaskdef("ipfs.add", ipfs.NewTaskAdd)
+	tasks.RegisterTaskdef("ipfs.addurl", ipfs.NewTaskAdd)
+	tasks.RegisterTaskdef("ipfs.addcollection", ipfs.NewAddCollection)
 	tasks.RegisterTaskdef("kiwix.updateSources", kiwix.NewTaskUpdateSources)
 
 	// Must set api server url to make ipfs tasks work

diff --git a/server.go b/server.go
@@ -5,8 +5,8 @@ package main
 import (
 	"database/sql"
 	"fmt"
-	"github.com/archivers-space/sqlutil"
 	"github.com/datatogether/sql_datastore"
+	"github.com/datatogether/sqlutil"
 	"github.com/datatogether/task-mgmt/source"
 	"github.com/datatogether/task-mgmt/tasks"
 	"github.com/sirupsen/logrus"