Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Using TCP connection and simple JSON protocol instead of HTML #42

Merged
merged 21 commits into from
Sep 28, 2016
Merged

Using TCP connection and simple JSON protocol instead of HTML #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bb714ca
listen for TCP conn on port 25566 & read messages
Nov 23, 2015
6918d61
send json stringified Lua objects over tcp conn
Nov 23, 2015
54a7e86
Send all messages to goproxy over TCP
Nov 23, 2015
8c2f000
Send all messages from goproxy to Lua over TCP
Nov 24, 2015
5c36f25
Comments + identified possible cNetwork issue
Nov 24, 2015
5db3f7e
fixes and logs
Nov 24, 2015
8fc2ad9
Removed unnecessary files from world directory
Nov 26, 2015
5365f36
List container as soon as tcp conn is established
Nov 26, 2015
421d130
bringing back ranks and webadmin to avoid errors
Nov 26, 2015
55c4134
disabled webadmin
Nov 26, 2015
ef341f2
Added recepies and prefabs to get rid of errors in the logs
Nov 26, 2015
788a9b4
Fixes based on @madmaxoft recommandations
Nov 26, 2015
0a0fbe3
Vendored github.com/fsouza/go-dockerclient
Dec 1, 2015
b6f8014
fixed docker.lua after merge
aduermael Sep 27, 2016
1ba5051
moved some files to different locations
aduermael Sep 27, 2016
4afc43e
updated fsouza docker client
aduermael Sep 27, 2016
389217e
manual merge for go code…
aduermael Sep 27, 2016
4d64c8d
fixes
aduermael Sep 27, 2016
6f5f915
fixed destroy event handling + added debug logs
aduermael Sep 27, 2016
931058e
retry tcp connect when failing
aduermael Sep 27, 2016
4c0b567
moved go files back to root
aduermael Sep 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 5 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.6
FROM golang:1.7.1

ENV DOCKER_VERSION 1.12.1

Expand All @@ -21,6 +21,9 @@ RUN ln -s /srv/cuberite_server/Cuberite /usr/bin/cuberite
COPY ./world world
COPY ./docs/img/logo64x64.png logo.png

EXPOSE 25565

COPY ./start.sh start.sh

CMD ["/bin/sh", "/srv/start.sh"]
EXPOSE 25565

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
REPO_NAME = dockercraft
REPO_OWNER = docker
PKG_NAME = github.com/${REPO_OWNER}/${REPO_NAME}
IMAGE = golang:1.6
IMAGE = golang:1.7.1
IMAGE_NAME = dockercraft-dev
CONTAINER_NAME = dockercraft-dev-container

Expand Down
Loading