Merge pull request #86 from lolPants/master

Fix all the things

Author: dave-tucker

Docker/docker.lua

@@ -176,6 +176,25 @@ function updateContainer(id,name,imageRepo,imageTag,state)
   else
     Containers[index] = container
   end
+
+  -- update hack
+  -- when new containers are started, all old containers dissappear
+  -- they're still running, but for some reason stop being displayed until they're updated
+  -- this forces them to re-render in world
+  LOG("New container detected: Refreshing all...")
+  for i=1, table.getn(Containers)
+  do
+    LOG("Refreshing container '" .. Containers[i].name .. "'")
+
+    -- Display
+    Containers[i]:display(Containers[i].running)
+
+    -- YES WE NEED TO DO IT TWICE
+    -- The signs don't display correctly on first re-render
+    -- Do it again to make signs work
+    -- Look don't ask me why, but it works so ¯\_(ツ)_/¯
+    Containers[i]:display(Containers[i].running)
+  end
 end
 
 --
@@ -290,4 +309,3 @@ end
 function OnWeatherChanging(World, Weather)
   return true, wSunny
 end
-

Docker/json.lua

@@ -182,4 +182,4 @@ function json.parse(str, pos, end_delim)
   end
 end
 
-return json
+return json

Docker/log.lua

@@ -16,4 +16,4 @@ function logTable (tbl, indent)
       print(formatting .. v)
     end
   end
-end
+end

Docker/update.lua

@@ -123,4 +123,3 @@ function updateSign(queue,x,y,z,line1,line2,line3,line4,delay)
   meta = {line1=line1,line2=line2,line3=line3,line4=line4}
   queue:newUpdate(UPDATE_SIGN, x, y, z, nil, meta, delay)
 end
-

Dockerfile

@@ -2,22 +2,23 @@ FROM alpine:3.6 AS wget
 RUN apk add --no-cache ca-certificates wget tar
 
 FROM wget AS docker
-ARG DOCKER_VERSION=17.04.0-ce
-RUN wget -qO- https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz | \
+ARG DOCKER_VERSION=17.09.0-ce
+RUN wget -qO- https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | \
   tar -xvz --strip-components=1 -C /bin
 
 FROM wget AS cuberite
-ARG CUBERITE_BUILD=630
+ARG CUBERITE_BUILD=905
 WORKDIR /srv
 RUN wget -qO- "https://builds.cuberite.org/job/Cuberite Linux x64 Master/${CUBERITE_BUILD}/artifact/Cuberite.tar.gz" |\
   tar -xzf -
 
-FROM golang:1.8 AS dockercraft
+FROM golang:1.9 AS dockercraft
 WORKDIR /go/src/github.com/docker/dockercraft
 COPY . .
 RUN go install
 
 FROM debian:jessie
+RUN apt-get update; apt-get install -y ca-certificates
 COPY --from=dockercraft /go/bin/dockercraft /bin
 COPY --from=docker /bin/docker /bin
 COPY --from=cuberite /srv /srv

config/settings.ini

@@ -3,7 +3,7 @@
 ; See: http://wiki.mc-server.org/doku.php?id=configure:settings.ini for further configuration help
 
 [Authentication]
-Authenticate=0
+Authenticate=1
 AllowBungeeCord=0
 Server=sessionserver.mojang.com
 Address=/session/minecraft/hasJoined?username=%USERNAME%&serverId=%SERVERID%
@@ -15,7 +15,7 @@ UUIDToProfileServer=sessionserver.mojang.com
 UUIDToProfileAddress=/session/minecraft/profile/%UUID%?unsigned=false
 
 [Server]
-Description=MCServer - in C++!
+Description=Dockercraft!
 MaxPlayers=100
 HardcoreEnabled=0
 AllowMultiLogin=0
@@ -45,4 +45,3 @@ Plugin=Docker
 [DeadlockDetect]
 Enabled=1
 IntervalSec=20
-

config/world/world.ini

@@ -55,4 +55,3 @@ LimitRadius=0
 
 [Difficulty]
 WorldDifficulty=1
-

setup.go

@@ -14,7 +14,7 @@ import (
 )
 
 const (
-	downloadURL   = "https://get.docker.com/builds/Linux/x86_64/docker-"
+	downloadURL   = "https://download.docker.com/linux/static/stable/x86_64/docker-"
 	rcDownloadURL = "https://test.docker.com/builds/Linux/x86_64/docker-"
 )