Commit Graph

844 Commits

Author SHA1 Message Date
Erik Hollensbe f976514119 remove an unused blank import.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-07-12 20:22:02 -07:00
Victor Vieux 7e7b4bb5ac use an array for verbs
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-11 21:11:36 +00:00
Solomon Hykes 4652b01762 Merge pull request #105 from aaronfeng/dockerclient-create-container 2014-07-02 15:47:27 -07:00
Aaron Feng 0296623083 Merge branch 'master' of github.com:docker/libswarm into dockerclient-create-container
Conflicts:
	backends/dockerclient.go
2014-07-02 02:09:11 -07:00
Solomon Hykes 379c579493 Merge pull request #100 from aanand/port-to-libchan-pt2 2014-07-01 19:00:26 -07:00
Aanand Prasad 3ccf699c3a Rename Obj() to AsClient()
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-01 11:21:41 +01:00
Aanand Prasad fcbf0b1905 Rename Object to Client
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-01 11:21:41 +01:00
Aanand Prasad f2d9a4a270 Rearrange transport code
- Core types/functions moved from 'beam' to 'libswarm' top-level
- Helper types/functions moved from 'beam' to 'util'

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-07-01 11:21:40 +01:00
Solomon Hykes d26dea3b76 Vendor goamz to avoid bzr build dependency
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-07-01 01:10:25 -07:00
Aaron Feng a9d8baf703 go fmt
Docker-DCO-1.1-Signed-off-by: Aaron Feng aaron.feng@gmail.com (github: aaronfeng)
2014-06-30 23:40:17 -07:00
Aaron Feng 0d768de24b Merge branch 'master' of github.com:docker/libswarm
Conflicts:
	backends/backends.go
	backends/dockerserver.go
2014-06-30 23:20:22 -07:00
Aaron Feng c779c2b7b3 convert to the latest interface change
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-06-30 23:15:22 -07:00
John Hopper 62734b842f Fix Debug for Libchan
This includes some minor cleanup among other things needed to make debug work with libchan (correctly).

Signed-off-by: John Hopper john.hopper@jpserver.net
2014-06-30 23:15:22 -07:00
Aanand Prasad 6486d7fc94 Convert aggregate and orchard to new server DSL
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:22 -07:00
Aanand Prasad 97a0b78d35 Implement OnLog and OnError
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:21 -07:00
Aanand Prasad 3ac10e0c92 Implement OnAttach
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:21 -07:00
Aanand Prasad 8e530ead6e Implement OnGet
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:21 -07:00
Aanand Prasad c1a78b28ec Implement OnStart and OnStop
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:21 -07:00
Aanand Prasad 440d0b7d60 Implement OnLs
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:21 -07:00
Aanand Prasad 8fa6e11f73 Implement OnSpawn
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:21 -07:00
Aanand Prasad ab20d526b1 Remove verb-specific handler methods from Server
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:21 -07:00
Aanand Prasad d7aef25298 Test for dockerclient Get
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:21 -07:00
Aanand Prasad bb106470d9 Assert that stubbed requests are actually called in dockerclient test
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:21 -07:00
Sven Dowideit 7c386b09d7 mention the param to dockerserver
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-06-30 23:15:21 -07:00
Aaron Feng 9e35dd1980 go fmt
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)

Conflicts:
	backends/ec2.go
2014-06-30 23:15:20 -07:00
Nathan LeClaire 8483ebf216 Take a whack at installation instructions.
This instructions allowed me to compile swarmd on my box.
2014-06-30 23:15:20 -07:00
Aaron Feng 200867288c Adds support for `docker inspect` to dockerserver
Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)

Conflicts:
	backends/dockerserver.go
2014-06-30 23:15:20 -07:00
Solomon Hykes 75531daa58 Add maintainers for individual backends
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-06-30 23:15:20 -07:00
Solomon Hykes 0949d4cf73 Fix debug after switch to libchan
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-06-30 23:15:20 -07:00
Solomon Hykes 7601d49283 Implement NopSender (removed by switch to libchan)
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-06-30 23:15:20 -07:00
Aanand Prasad 189af64caf Basic tests for Message/Sender/Receiver
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:20 -07:00
Aanand Prasad 1e15a54d0e Port to libchan, pt. 1
This is a minimal effort to get things running. Only the `beam` package
has changed - backend code is untouched.

- The `beam` package is still around, but functions as a
  libswarm-specific wrapper around libchan messages. It'll either be
  renamed or moved to the top-level namespace.

- We have our own Message type which serializes/deserializes to libchan
  messages, and our own versions of Sender and Receiver which speak
  libswarm. WrapSender and WrapReceiver promote libchan objects to
  their libswarm equivalents.

- We also have our own wrappers around libchan utilities: RetPipe,
  Handler, Pipe, Copy.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:20 -07:00
Solomon Hykes fea75e7e4c Move debug.go to a `debug` sub-package
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-06-30 23:15:20 -07:00
John Hopper 1363714195 Cleanup and Enhance Debug
Signed-off-by: John Hopper john.hopper@jpserver.net
2014-06-30 23:15:20 -07:00
Aaron Feng 49129ba27b Refactor Tutum backend to use beam
Docker-DCO-1.1-Signed-off-by: Fernando Mayo <fernando@tutum.co> (github: fermayo)

Conflicts:
	backends/backends.go
2014-06-30 23:15:19 -07:00
fermayo bef2da93ee Update exposed ports mapping
Docker-DCO-1.1-Signed-off-by: Fernando Mayo <fernando@tutum.co> (github: fermayo)
2014-06-30 23:15:19 -07:00
Aaron Feng f795afc4c9 remove unnecessary fn for now
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-06-30 23:15:19 -07:00
Aaron Feng add111b536 add docker stop
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-06-30 23:15:19 -07:00
Aaron Feng d4a1ab2f7f wait for ssh server and docker daemon to be up
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-06-30 23:15:19 -07:00
Aaron Feng 0285605f6a fill in all regions
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-06-30 23:15:19 -07:00
Aaron Feng acf1b88de5 ssh tunnel to docker daemon
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-06-30 23:15:19 -07:00
Aaron Feng d79ce93346 allow more aws options to be configurable
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-06-30 23:15:19 -07:00
Aaron Feng f9f5d4c4a0 remove the heartbeat
- logging clean up

Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-06-30 23:15:19 -07:00
Aaron Feng 11ec16e08d implemented `docker ps`
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-06-30 23:15:19 -07:00
Aaron Feng 7d816e029e don't start ec2 instance if already exists 4 real
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-06-30 23:15:19 -07:00
Ben Firshman 25d1250c2c Add attach to dockerserver
- Move copyOutput helper from dockerclient to beam/stream.go
 - Implement /containers/<id>/attach and /containers/<id>/wait

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-06-30 23:15:18 -07:00
Aanand Prasad f1783fc527 Tests for dockerclient
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2014-06-30 23:15:18 -07:00
Ben Firshman 2324381fa6 Remove dockerclient heartbeat
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-06-30 23:15:18 -07:00
Ben Firshman 175b00f1b0 Rename forward backend to dockerclient
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-06-30 23:15:18 -07:00
Ben Firshman 40eca5b8a6 Remove dockerclient
This is no longer needed now we have dockerserver.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-06-30 23:15:18 -07:00