Bladeren bron

Put back the github.com path for the import

creack 12 jaren geleden
bovenliggende
commit
453d49573c
13 gewijzigde bestanden met toevoegingen van 18 en 20 verwijderingen
  1. 2 2
      client/client.go
  2. 1 1
      container.go
  3. 1 1
      container_test.go
  4. 1 1
      docker.go
  5. 1 1
      docker/docker.go
  6. 1 1
      docker_test.go
  7. 2 2
      dockerd/dockerd.go
  8. 1 1
      fs/layers.go
  9. 1 1
      fs/layers_test.go
  10. 1 1
      fs/store.go
  11. 1 1
      fs/store_test.go
  12. 4 6
      server/server.go
  13. 1 1
      state.go

+ 2 - 2
client/client.go

@@ -1,8 +1,8 @@
 package client
 package client
 
 
 import (
 import (
-	"../future"
-	"../rcli"
+	"github.com/dotcloud/docker/future"
+	"github.com/dotcloud/docker/rcli"
 	"io"
 	"io"
 	"io/ioutil"
 	"io/ioutil"
 	"log"
 	"log"

+ 1 - 1
container.go

@@ -1,9 +1,9 @@
 package docker
 package docker
 
 
 import (
 import (
-	"./fs"
 	"encoding/json"
 	"encoding/json"
 	"errors"
 	"errors"
+	"github.com/dotcloud/docker/fs"
 	"github.com/kr/pty"
 	"github.com/kr/pty"
 	"io"
 	"io"
 	"io/ioutil"
 	"io/ioutil"

+ 1 - 1
container_test.go

@@ -1,9 +1,9 @@
 package docker
 package docker
 
 
 import (
 import (
-	"./fs"
 	"bufio"
 	"bufio"
 	"fmt"
 	"fmt"
+	"github.com/dotcloud/docker/fs"
 	"io"
 	"io"
 	"io/ioutil"
 	"io/ioutil"
 	"math/rand"
 	"math/rand"

+ 1 - 1
docker.go

@@ -1,9 +1,9 @@
 package docker
 package docker
 
 
 import (
 import (
-	"./fs"
 	"container/list"
 	"container/list"
 	"fmt"
 	"fmt"
+	"github.com/dotcloud/docker/fs"
 	"io/ioutil"
 	"io/ioutil"
 	"log"
 	"log"
 	"os"
 	"os"

+ 1 - 1
docker/docker.go

@@ -1,8 +1,8 @@
 package main
 package main
 
 
 import (
 import (
-	"../client"
 	"flag"
 	"flag"
+	"github.com/dotcloud/docker/client"
 	"log"
 	"log"
 	"os"
 	"os"
 	"path"
 	"path"

+ 1 - 1
docker_test.go

@@ -1,7 +1,7 @@
 package docker
 package docker
 
 
 import (
 import (
-	"./fs"
+	"github.com/dotcloud/docker/fs"
 	"io"
 	"io"
 	"io/ioutil"
 	"io/ioutil"
 	"log"
 	"log"

+ 2 - 2
dockerd/dockerd.go

@@ -1,9 +1,9 @@
 package main
 package main
 
 
 import (
 import (
-	".."
-	"../server"
 	"flag"
 	"flag"
+	"github.com/dotcloud/docker"
+	"github.com/dotcloud/docker/server"
 	"log"
 	"log"
 )
 )
 
 

+ 1 - 1
fs/layers.go

@@ -1,9 +1,9 @@
 package fs
 package fs
 
 
 import (
 import (
-	"../future"
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
+	"github.com/dotcloud/docker/future"
 	"io"
 	"io"
 	"io/ioutil"
 	"io/ioutil"
 	"os"
 	"os"

+ 1 - 1
fs/layers_test.go

@@ -1,7 +1,7 @@
 package fs
 package fs
 
 
 import (
 import (
-	"../fake"
+	"github.com/dotcloud/docker/fake"
 	"io/ioutil"
 	"io/ioutil"
 	"os"
 	"os"
 	"testing"
 	"testing"

+ 1 - 1
fs/store.go

@@ -1,10 +1,10 @@
 package fs
 package fs
 
 
 import (
 import (
-	"../future"
 	"database/sql"
 	"database/sql"
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
+	"github.com/dotcloud/docker/future"
 	_ "github.com/mattn/go-sqlite3"
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/shykes/gorp" //Forked to implement CreateTablesOpts
 	"github.com/shykes/gorp" //Forked to implement CreateTablesOpts
 	"io"
 	"io"

+ 1 - 1
fs/store_test.go

@@ -1,9 +1,9 @@
 package fs
 package fs
 
 
 import (
 import (
-	"../fake"
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
+	"github.com/dotcloud/docker/fake"
 	"io/ioutil"
 	"io/ioutil"
 	"os"
 	"os"
 	"testing"
 	"testing"

+ 4 - 6
server/server.go

@@ -1,15 +1,15 @@
 package server
 package server
 
 
 import (
 import (
-	".."
-	"../fs"
-	"../future"
-	"../rcli"
 	"bufio"
 	"bufio"
 	"bytes"
 	"bytes"
 	"encoding/json"
 	"encoding/json"
 	"errors"
 	"errors"
 	"fmt"
 	"fmt"
+	"github.com/dotcloud/docker"
+	"github.com/dotcloud/docker/fs"
+	"github.com/dotcloud/docker/future"
+	"github.com/dotcloud/docker/rcli"
 	"io"
 	"io"
 	"net/http"
 	"net/http"
 	"net/url"
 	"net/url"
@@ -60,8 +60,6 @@ func (srv *Server) Help() string {
 		{"mirror", "(debug only) (No documentation available)"},
 		{"mirror", "(debug only) (No documentation available)"},
 		{"port", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"},
 		{"port", "Lookup the public-facing port which is NAT-ed to PRIVATE_PORT"},
 		{"ps", "List containers"},
 		{"ps", "List containers"},
-		{"pull", "Download a new image from a remote location"},
-		{"put", "Import a new image from a local archive"},
 		{"reset", "Reset changes to a container's filesystem"},
 		{"reset", "Reset changes to a container's filesystem"},
 		{"restart", "Restart a running container"},
 		{"restart", "Restart a running container"},
 		{"rm", "Remove a container"},
 		{"rm", "Remove a container"},

+ 1 - 1
state.go

@@ -1,8 +1,8 @@
 package docker
 package docker
 
 
 import (
 import (
-	"./future"
 	"fmt"
 	"fmt"
+	"github.com/dotcloud/docker/future"
 	"sync"
 	"sync"
 	"time"
 	"time"
 )
 )