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

208 Коммитов

Автор SHA1 Сообщение Дата
Dave Tucker 4be6b595d2
Merge pull request #86 from lolPants/master 
Fix all the things
 2018-06-18 05:15:20 -07:00
Jack Baron cbba5c57d8 Fix new containers causing all other containers to dissappear 2017-10-15 04:47:27 +01:00
Jack Baron 8982938b87 Consistend EOF newlines 2017-10-15 03:41:48 +01:00
Jack Baron 6d33802159 Update Dependencies 
- Go 1.8 --> 1.9
- Cuberite 630 --> 905 (MC 1.12)
- Debian CA Certs oneliner
 2017-10-15 03:40:06 +01:00
Jack Baron 1dad7f36fd Re-add Authentication Requirements 2017-10-10 17:29:59 +01:00
Jack Baron f0d83347f9 Revert "Add Webadmin" 
This reverts commit 6c786ed398.
 2017-10-10 17:29:31 +01:00
Jack Baron 6c786ed398 Add Webadmin 2017-10-10 16:58:07 +01:00
Jack Baron 8211c713ca Fix for new download URL 2017-10-10 16:01:27 +01:00
Dave Tucker ff568715cd Merge pull request #83 from vieux/dockerfile 
update Dockerfile to use multi-stage build
 2017-08-31 11:26:29 +01:00
Victor Vieux 6b1c8c88c7 update Dockerfile to use multi-stage build 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-08-30 11:14:26 -07:00
Dave Tucker fee8bbd1df Merge pull request #85 from blepmaster/patch-1 
Fixed a link
 2017-07-28 09:41:49 +01:00
cpdev 510cc26c71 Update README.md 2017-07-27 21:43:05 -05:00
Dave Tucker f061123edc Merge pull request #84 from dave-tucker/dckr-api 
Use the official docker api library
 2017-05-23 20:04:37 +01:00
Dave Tucker 44ad82ad74 Use the official docker/client library 
Signed-off-by: Dave Tucker <dt@docker.com>
 2017-04-18 14:55:24 +01:00
Dave Tucker 3fc776105f Bump Go 1.8 and Docker 17.04.0-CE 
Signed-off-by: Dave Tucker <dt@docker.com>
 2017-04-18 14:55:06 +01:00
Dave Tucker 212d171e01 Update vendoring. Use vndr 
This is the tool being used in other docker repos these days.

Signed-off-by: Dave Tucker <dt@docker.com>
 2017-04-18 12:19:20 +01:00
Dave Tucker 0035987d0d Merge pull request #70 from ricardotk/typos 
Fix typos
 2017-03-07 10:34:01 +00:00
Ricardo de Almeida Gonzaga 86f6ca0ed2 Fix typos 2017-03-06 18:18:39 -08:00
Dave Tucker 8d1259f68a Merge pull request #74 from dave-tucker/clean-cuberite 
Cleaner Cuberite integration and world customizations
 2017-03-01 13:22:15 +00:00
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
Adrien Duermael c81a14eeab Merge pull request #79 from thaJeztah/update-maintainers-list 
Update maintainers list
 2017-02-07 20:37:11 -08:00
Sebastiaan van Stijn 42205a9ebb
Update maintainers list 
Dave's name and e-mail was written different
in other repo's, resulting him to be listed
_twice_ in the global maintainers list :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-02-07 18:57:38 -08: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