Merge branch 'master' into expose

Author: JBYoshi

Dockerfile

@@ -1,21 +1,26 @@
-FROM golang:1.5.1
+FROM golang:1.6
+
+ENV DOCKER_VERSION 1.12.1
 
 # Copy latest docker client(s)
-COPY ./docker/docker-1.9.1 /bin/docker-1.9.1
-RUN chmod +x /bin/docker-*
+RUN curl -sSL -o docker.tgz https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz &&\
+	tar -xvf docker.tgz --strip-components=1 -C /bin && rm docker.tgz &&\
+	chmod +x /bin/docker-* &&\
+	ln -s /bin/docker /bin/docker-${DOCKER_VERSION}
 
 # Copy Go code and install applications
-COPY ./go /go
-RUN cd /go/src/goproxy; go install
-RUN cd /go/src/gosetup; go install
+WORKDIR /go/src/github.com/docker/dockercraft
+COPY . .
+RUN go install
 
 # Download Cuberite server (Minecraft C++ server)
 # and load up a special empty world for Dockercraft
 WORKDIR /srv
 RUN sh -c "$(wget -qO - https://raw.githubusercontent.com/cuberite/cuberite/master/easyinstall.sh)" && mv Server cuberite_server
+RUN ln -s /srv/cuberite_server/Cuberite /usr/bin/cuberite
 COPY ./world world
 COPY ./docs/img/logo64x64.png logo.png
 
 COPY ./start.sh start.sh
-CMD ["/bin/bash","/srv/start.sh"]
+CMD ["/bin/sh", "/srv/start.sh"]
 EXPOSE 25565

Makefile

@@ -0,0 +1,44 @@
+.PHONY: all test test-local install-deps lint fmt vet build serve
+
+REPO_NAME = dockercraft
+REPO_OWNER = docker
+PKG_NAME = github.com/${REPO_OWNER}/${REPO_NAME}
+IMAGE = golang:1.6
+IMAGE_NAME = dockercraft-dev
+CONTAINER_NAME = dockercraft-dev-container
+
+all: test
+
+test-local: install-deps fmt lint vet
+	@echo "+ $@"
+	@go test -v .
+
+test:
+	@docker run -v ${shell pwd}:/go/src/${PKG_NAME} -w /go/src/${PKG_NAME} ${IMAGE} make test-local
+
+install-deps:
+	@echo "+ $@"
+	@go get -u github.com/golang/lint/golint
+
+lint:
+	@echo "+ $@"
+	@test -z "$$(golint ./... | grep -v vendor/ | tee /dev/stderr)"
+
+fmt:
+	@echo "+ $@"
+	@test -z "$$(gofmt -s -l . | grep -v vendor/ | tee /dev/stderr)"
+
+vet:
+	@echo "+ $@"
+	@go vet .
+
+build:
+	@echo "+ $@"
+	@docker build -t ${IMAGE_NAME} .
+
+serve:
+	@docker run -it --rm \
+		--name ${CONTAINER_NAME} \
+		-p 25565:25565 \
+		-v /var/run/docker.sock:/var/run/docker.sock \
+		${IMAGE_NAME}

circle.yml

@@ -0,0 +1,12 @@
+---
+machine:
+  services:
+    - docker
+
+dependencies:
+  override:
+    - echo "Nothing to see here.." 
+
+test:
+  override:
+    - make test