Reworked some Dockerfiles to improve cache usage.

googleforgames · Apr 20, 2018 · 86b727c · 86b727c
1 parent 1f6cb60
commit 86b727c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/cmd/controller/Dockerfile b/cmd/controller/Dockerfile
@@ -1,11 +1,13 @@
 FROM alpine:3.7
 
-COPY ./bin/controller /home/agones/controller
-COPY ./certs /home/agones/certs
 RUN apk --update add ca-certificates && \
-                adduser -D agones && \
-                chown -R agones /home/agones && \
-                chmod o+x /home/agones/controller
+    adduser -D agones
+
+COPY ./certs /home/agones/certs
+COPY ./bin/controller /home/agones/controller
+
+RUN chown -R agones /home/agones && \
+    chmod o+x /home/agones/controller
 
 USER agones
 ENTRYPOINT ["/home/agones/controller"]
diff --git a/cmd/sdk-server/Dockerfile b/cmd/sdk-server/Dockerfile
@@ -1,10 +1,12 @@
 FROM alpine:3.7
 
-COPY ./bin/sdk-server.linux.amd64 /home/agones/sdk-server
 RUN apk --update add ca-certificates && \
-                adduser -D agones && \
-                chown -R agones /home/agones && \
-                chmod o+x /home/agones/sdk-server
+    adduser -D agones
+
+COPY ./bin/sdk-server.linux.amd64 /home/agones/sdk-server
+
+RUN chown -R agones /home/agones && \
+    chmod o+x /home/agones/sdk-server
 
 USER agones
 ENTRYPOINT ["/home/agones/sdk-server"]
diff --git a/examples/simple-udp/server/Dockerfile b/examples/simple-udp/server/Dockerfile
@@ -14,9 +14,11 @@
 
 FROM alpine:3.7
 
+RUN adduser -D server    
+
 COPY ./bin/server /home/server/server
-RUN adduser -D server && \
-    chown -R server /home/server && \
+    
+RUN chown -R server /home/server && \
     chmod o+x /home/server/server
 
 USER server