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

Commit cfdaa2d

Browse files
author
Adrien Duermael
authored
Merge pull request #42 from aduermael/cnetwork
Using TCP connection and simple JSON protocol instead of HTML
2 parents ed650c6 + 4c0b567 commit cfdaa2d

File tree

5,527 files changed

+1173093
-613
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,527 files changed

+1173093
-613
lines changed

Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.6
1+
FROM golang:1.7.1
22

33
ENV DOCKER_VERSION 1.12.1
44

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

24+
EXPOSE 25565
25+
2426
COPY ./start.sh start.sh
27+
2528
CMD ["/bin/sh", "/srv/start.sh"]
26-
EXPOSE 25565
29+

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
REPO_NAME = dockercraft
44
REPO_OWNER = docker
55
PKG_NAME = github.com/${REPO_OWNER}/${REPO_NAME}
6-
IMAGE = golang:1.6
6+
IMAGE = golang:1.7.1
77
IMAGE_NAME = dockercraft-dev
88
CONTAINER_NAME = dockercraft-dev-container
99

0 commit comments

Comments
 (0)