@@ -21,6 +21,7 @@ bin
 /docs
 *.md
 *.amd64
+/site/public
 
 # Created by .ignore support plugin (hsz.mobi)
 ### Go template
 
@@ -12,23 +12,37 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM debian:stretch
+# build
+FROM golang:1.11.5 as builder
+WORKDIR /go/src/xonotic
 
 RUN apt-get update && apt-get install -y unzip curl
-RUN useradd -m xonotic
 
-WORKDIR /home/xonotic
+COPY examples/xonotic/main.go .
+COPY . /go/src/agones.dev/agones
+RUN go build -o wrapper .
+
 RUN curl -o xonotic.zip http://dl.xonotic.org/xonotic-0.8.2.zip && \
     unzip xonotic.zip && rm xonotic.zip
 
+# final image
+FROM debian:stretch
+
+WORKDIR /home/xonotic
+
+RUN useradd -m xonotic
+
 #
 # To learn about setting up a Xonotic dedicated server, read the `readme.txt` in the
 # `server` directory after downloading the archive from xonotic.org
 #
 
+COPY --from=builder /go/src/xonotic/wrapper .
+COPY --from=builder /go/src/xonotic/Xonotic ./Xonotic
+
 RUN mkdir -p ./.xonotic/data && mv /home/xonotic/Xonotic/server/server_linux.sh /home/xonotic/Xonotic/
-COPY ./bin/wrapper .
-COPY server.cfg ./.xonotic/data
+COPY examples/xonotic/server.cfg ./.xonotic/data
+
 RUN chown -R xonotic:xonotic . && chmod +x wrapper
 
 USER xonotic
 
@@ -27,8 +27,8 @@ REPOSITORY = gcr.io/agones-images
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-agones_path := $(realpath $(project_path)/../..)
-image_tag = $(REPOSITORY)/xonotic-example:0.4
+root_path := $(realpath $(project_path)/../..)
+image_tag = $(REPOSITORY)/xonotic-example:0.5
 
 #   _____                    _
 #  |_   _|_ _ _ __ __ _  ___| |_ ___
@@ -38,14 +38,5 @@ image_tag = $(REPOSITORY)/xonotic-example:0.4
 #                 |___/
 
 # Build a docker image for the server, and tag it
-build: build-go-binary
-	docker build $(project_path) --tag=$(image_tag)
-
-# build the go binary with Docker, so you don't have to install anything
-build-go-binary: MOUNTPATH="/go/src/agones.dev/agones"
-build-go-binary:
-	docker run --rm -v $(agones_path):$(MOUNTPATH) golang:1.11.1 go build -o $(MOUNTPATH)/examples/xonotic/bin/wrapper agones.dev/agones/examples/xonotic
-
-
-
-
+build:
+	cd $(root_path) && docker build -f $(project_path)/Dockerfile --tag=$(image_tag) .
@@ -35,4 +35,4 @@ spec:
         spec:
           containers:
           - name: xonotic
-            image: gcr.io/agones-images/xonotic-example:0.4
+            image: gcr.io/agones-images/xonotic-example:0.5
@@ -24,5 +24,5 @@ spec:
     spec:
       containers:
       - name: xonotic
-        image: gcr.io/agones-images/xonotic-example:0.4
+        image: gcr.io/agones-images/xonotic-example:0.5
         # imagePullPolicy: Always # add for development
@@ -13,7 +13,7 @@
 // make it 'YOUR' server.  IF so remove the // from the line start and
 // change them to your liking.
 
-sv_public 1	// 0 if the server should not be on the public servers list
+sv_public 0	// 0 if the server should not be on the public servers list
 //sv_status_privacy 1	// 1 hides IP addresses from "status" replies shown to clients, 0 shows them. Enables players to identify wellknown punks on your server OR is a thread to anonymity.. depending on your point of view :)
 hostname "Xonotic Agones $g_xonoticversion Server"	// this name will appear on the server list (the $g_xonoticversion gets replaced with the current version)
 //sv_motd ""	// this message (unless "") is displayed to players on connect