docker
/
dockercraft
зеркало из https://github.com/docker/dockercraft.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
187 коммитов 1 ветка 0 Теги 59 MiB
Граф коммитов

187 Коммитов

Автор SHA1 Сообщение Дата
Dave Tucker 8d6dd76c98 Make Makefile more Docker for Mac friendly 
Signed-off-by: Dave Tucker <dt@docker.com>
 2017-03-01 13:20:34 +00:00
Dave Tucker 499bb4ad78 Update README with customizations! 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-12-08 20:52:44 +00:00
Dave Tucker 7b1752f811 Format Lua code 
The lua code was a mess of mixed indentation and trailing spaces.
Using ZeroBraneStudio correct indentation and vim, this is now fixed.
We should aspire to keep it tidier

Signed-off-by: Dave Tucker <dt@docker.com>
 2016-12-08 20:29:30 +00:00
Dave Tucker 6b4c8651df Fix update sequencing issues 
I noticed some weird things happening after I'd changed to using a newly
generated world. Namely, the WorldStarted hook was being triggered
*after* the updates for other containers had already been queued!

To fix this I:
- Made all ground drawing happen in addGround
- Changed the update queue to be a more traditional strict queue
  - This has the added benefit that we can check the length easily
- Removed unused hooks - WorldStarted and OnChunkGenerated

Signed-off-by: Dave Tucker <dt@docker.com>
 2016-12-08 20:05:59 +00:00
Dave Tucker 7d4fae4948 Remove checked in 'dockercraft' binary 
This should never have been checked in

Signed-off-by: Dave Tucker <dt@docker.com>
 2016-12-08 18:07:58 +00:00
Dave Tucker cfdc9d1ad1 Add support for Docker RC's 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-12-08 18:07:57 +00:00
Dave Tucker bc175789f8 Remove remains of vendored Cuberite 
- Keep only the server.ini, world.ini and motd.txt files
- Make generators in world.ini configurable
- Pin Cuberite version in Dockerfile to latest (630)
- Rearrange Dockerfile to bust the cache less often

Fixes: #71, #54

Signed-off-by: Dave Tucker <dt@docker.com>
 2016-12-08 18:05:08 +00:00
Adrien Duermael cfdaa2df77 Merge pull request #42 from aduermael/cnetwork 
Using TCP connection and simple JSON protocol instead of HTML
 2016-09-27 17:59:07 -07:00
Adrien Duermael 4c0b567249 moved go files back to root 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-27 17:54:48 -07:00
Adrien Duermael 931058ef39 retry tcp connect when failing 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-27 15:15:05 -07:00
Adrien Duermael 6f5f9157e9 fixed destroy event handling + added debug logs 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-27 14:56:27 -07:00
Adrien Duermael 4d64c8dd3e fixes 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-27 14:33:06 -07:00
Adrien Duermael 389217ebb3 manual merge for go code… 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-27 13:51:19 -07:00
Adrien Duermael 4afc43eda0 updated fsouza docker client 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-27 13:01:37 -07:00
Adrien Duermael 1ba5051d01 moved some files to different locations 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-27 12:49:31 -07:00
Adrien Duermael b6f80144dd fixed docker.lua after merge 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-27 12:33:33 -07:00
Adrien Duermael 0a0fbe356e Vendored github.com/fsouza/go-dockerclient 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:18:07 -07:00
Adrien Duermael 788a9b4459 Fixes based on @madmaxoft recommandations 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:18:07 -07:00
Adrien Duermael ef341f2ee8 Added recepies and prefabs to get rid of errors in the logs 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:18:03 -07:00
Adrien Duermael 55c41343d8 disabled webadmin 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:17:29 -07:00
Adrien Duermael 421d1301da bringing back ranks and webadmin to avoid errors 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:17:09 -07:00
Adrien Duermael 5365f368c1 List container as soon as tcp conn is established 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:16:46 -07:00
Adrien Duermael 8fc2ad98e6 Removed unnecessary files from world directory 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:16:41 -07:00
Adrien Duermael 5db3f7ece3 fixes and logs 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:16:12 -07:00
Adrien Duermael 5c36f2560d Comments + identified possible cNetwork issue 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:16:05 -07:00
Adrien Duermael 8c2f0006c1 Send all messages from goproxy to Lua over TCP 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:16:00 -07:00
Adrien Duermael 54a7e8696b Send all messages to goproxy over TCP 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:15:55 -07:00
Adrien Duermael 6918d61cfc send json stringified Lua objects over tcp conn 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:15:43 -07:00
Adrien Duermael bb714ca2d4 listen for TCP conn on port 25566 & read messages 
Signed-off-by: Adrien Duermael <adrien@docker.com>
 2016-09-27 12:15:37 -07:00
Adrien Duermael ed650c68e6 Merge pull request #68 from aduermael/readme-absolute-image-urls 
absolute image urls in README
 2016-09-26 17:31:47 -07:00
Adrien Duermael 11786db012 absolute image urls in README 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-26 17:29:46 -07:00
Adrien Duermael 9b6cd3055e Merge pull request #64 from JBYoshi/expose 
Add EXPOSE command to Dockerfile.
 2016-09-26 17:25:30 -07:00
JBYoshi e03eed1dc9
Merge branch 'master' into expose 2016-09-26 18:59:19 -05:00
Adrien Duermael 5cb3ab8154 Merge pull request #67 from aduermael/cuberite-and-docker-update 
Cuberite and Docker updates
 2016-09-26 15:43:00 -07:00
Dave Tucker cab4fbdba9 Fix concurrency issue with cpu stats 
Signed-off-by: Dave Tucker <dt@docker.com>
 2016-09-25 20:25:28 +01:00
Adrien Duermael 1313164e19 Updated Cuberite webadmin, plugins and other files 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-25 11:13:01 -07:00
Adrien Duermael 9a674a3e8d updated Docker version to latest (1.12.1) 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-09-25 11:00:04 -07:00
Dave Tucker 1099dad3e8 Merge pull request #59 from dave-tucker/infra 
Refactor to single Go daemon and add some infrastructure
 2016-08-16 23:49:33 +01:00
Gaetan de Villele 001a38a92b report changes from PR #65 and clean them a bit 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
(cherry picked from commit 4e81969a3e37b63ce6b84a0f0d9acca913045094)
 2016-08-16 23:44:21 +01:00
Dave Tucker 4f4f7a8937 Refactor to single Go daemon 
- Refactor proxy and setup to single `dockercraft` daemon
- Automatically download the latest Docker release, remove the Docker
  binary from the repo
- Use Golang 1.6
- Update to Docker 1.11.1 in the Dockerfile
- Dockerize all the testing
- Add test targets for checking our golang code
- Build and Serve targets for testing changes
- Address comments from go fmt and go lint
- Add simple circle.yml for CircleCI

Signed-off-by: Dave Tucker <dt@docker.com>
 2016-08-16 23:44:19 +01:00
Gaetan ad46f8fb20 Merge pull request #65 from aranaea/Issue-44 
Fix Issue 44 - Get the docker client from the tgz file
 2016-07-06 20:25:01 -07:00
Peter Cornelius 2f1227afa0 Formatting... 2016-06-29 21:02:36 -07:00
Peter Cornelius ebd6a48829 Add support for 'tgz' or 'oldstyle' docker client urls 2016-06-29 20:58:11 -07:00
Peter Cornelius 65f18a4857 Run 'go fmt' to clean up formatting 2016-06-29 20:41:18 -07:00
Peter Cornelius 3073e7562a Get the docker client from the tgz file 2016-06-26 14:13:46 -07:00
JBYoshi c5e82ab427
Add EXPOSE command to Dockerfile. 
Signed-off-by: JBYoshi <jbyoshi@users.noreply.github.com>
 2016-05-20 14:50:19 -05:00
Dave Tucker a8583e32ba Merge pull request #57 from leonhartX/fix-typo 
fix typo: OnAllChunksAvaliable=>OnAllChunksAvailable
 2016-05-03 13:53:07 +01:00
Ke Xu 3815e15583 fix typo: OnAllChunksAvaliable=>OnAllChunksAvailable 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-04-22 15:10:50 +09:00
Gaetan 6c083ddb18 Merge pull request #51 from gdevillele/PR_new_logo 
update dockercraft logo
 2016-03-03 16:16:43 -08:00
Gaetan de Villele f658009b77 update dockercraft logo 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-03-03 13:42:27 -08:00