Explorar el Código

Fix Android Dockerfile (was missing one use of the Go version variable). Updated Go version used for building. Switched from Debian to Ubuntu as Docker base (because Debian is less reliable when apt-getting).

Adam Pritchard hace 11 años
padre
commit
d3a9bdcc04
Se han modificado 2 ficheros con 4 adiciones y 5 borrados
  1. 2 3
      AndroidLibrary/Dockerfile
  2. 2 2
      ConsoleClient/Dockerfile

+ 2 - 3
AndroidLibrary/Dockerfile

@@ -2,10 +2,9 @@
 #
 #
 # See README.md for usage instructions.
 # See README.md for usage instructions.
 
 
-# TODO: Switch to debian:testing
 FROM ubuntu:12.04
 FROM ubuntu:12.04
 
 
-ENV GOVERSION=go1.4
+ENV GOVERSION=go1.4.1
 
 
 # Install system-level dependencies.
 # Install system-level dependencies.
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -59,7 +58,7 @@ RUN echo "INSTALLING GO" && \
   curl -L https://github.com/golang/go/archive/$GOVERSION.zip -o /tmp/go.zip && \
   curl -L https://github.com/golang/go/archive/$GOVERSION.zip -o /tmp/go.zip && \
   unzip /tmp/go.zip && \
   unzip /tmp/go.zip && \
   rm /tmp/go.zip && \
   rm /tmp/go.zip && \
-  mv /go-master $GOROOT && \
+  mv /go-$GOVERSION $GOROOT && \
   echo devel > $GOROOT/VERSION && \
   echo devel > $GOROOT/VERSION && \
   cd $GOROOT/src && \
   cd $GOROOT/src && \
   ./all.bash && \
   ./all.bash && \

+ 2 - 2
ConsoleClient/Dockerfile

@@ -2,9 +2,9 @@
 #
 #
 # See README.md for usage instructions.
 # See README.md for usage instructions.
 
 
-FROM debian:testing
+FROM ubuntu:12.04
 
 
-ENV GOVERSION=go1.4
+ENV GOVERSION=go1.4.1
 
 
 # Install system-level dependencies.
 # Install system-level dependencies.
 ENV DEBIAN_FRONTEND=noninteractive
 ENV DEBIAN_FRONTEND=noninteractive