Просмотр исходного кода

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 11 лет назад
Родитель
Сommit
d3a9bdcc04
2 измененных файлов с 4 добавлено и 5 удалено
  1. 2 3
      AndroidLibrary/Dockerfile
  2. 2 2
      ConsoleClient/Dockerfile

+ 2 - 3
AndroidLibrary/Dockerfile

@@ -2,10 +2,9 @@
 #
 # See README.md for usage instructions.
 
-# TODO: Switch to debian:testing
 FROM ubuntu:12.04
 
-ENV GOVERSION=go1.4
+ENV GOVERSION=go1.4.1
 
 # Install system-level dependencies.
 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 && \
   unzip /tmp/go.zip && \
   rm /tmp/go.zip && \
-  mv /go-master $GOROOT && \
+  mv /go-$GOVERSION $GOROOT && \
   echo devel > $GOROOT/VERSION && \
   cd $GOROOT/src && \
   ./all.bash && \

+ 2 - 2
ConsoleClient/Dockerfile

@@ -2,9 +2,9 @@
 #
 # 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.
 ENV DEBIAN_FRONTEND=noninteractive