Merge remote-tracking branch 'origin/master'

pydio · Jul 3, 2018 · bc7de7b · bc7de7b
2 parents 2dcac28 + a18433f
commit bc7de7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/idm/workspace/rest/rest.go b/idm/workspace/rest/rest.go
@@ -200,6 +200,7 @@ func (h *WorkspaceHandler) SearchWorkspaces(req *restful.Request, rsp *restful.R
 		}
 		resp.Workspace.PoliciesContextEditable = h.IsContextEditable(ctx, resp.Workspace.UUID, resp.Workspace.Policies)
 		collection.Workspaces = append(collection.Workspaces, resp.Workspace)
+		collection.Total++
 	}
 	rsp.WriteEntity(collection)
 

diff --git a/tools/docker/cells/dockerfile b/tools/docker/cells/dockerfile
@@ -6,14 +6,20 @@ ENV CELLS_VERSION ${version}
 WORKDIR /cells
 
 RUN wget "https://download.pydio.com/pub/cells/release/${CELLS_VERSION}/linux-amd64/cells"
+RUN wget "https://download.pydio.com/pub/cells/release/${CELLS_VERSION}/linux-amd64/cells-ctl"
+RUN wget "https://download.pydio.com/pub/cells-sdk-go/nightly/latest/linux-amd64/cells-sdk-go"
 
 COPY docker-entrypoint.sh /cells/docker-entrypoint.sh
 COPY libdl.so.2 /cells/libdl.so.2
 
 RUN chmod +x /cells/cells
+RUN chmod +x /cells/cells-ctl
+RUN chmod +x /cells/cells-sdk-go
 RUN chmod +x /cells/docker-entrypoint.sh
 
 RUN ln -s /cells/cells /bin/cells
+RUN ln -s /cells/cells-ctl /bin/cells-ctl
+RUN ln -s /cells/cells-sdk-go /bin/cells-sdk-go
 RUN ln -s /cells/libdl.so.2 /lib64/libdl.so.2
 RUN ln -s /cells/docker-entrypoint.sh /bin/docker-entrypoint.sh