Преглед изворни кода

Closes Psiphon-Inc/psiphon-issues#30 - pin ubuntu versions to 16.04 instead of latest; update android client jdk to 8 (was 7); update go version to 1.6.2 (was 1.6)

Michael Goldberger пре 9 година
родитељ
комит
f5ae8002e9
2 измењених фајлова са 5 додато и 5 уклоњено
  1. 3 3
      AndroidLibrary/Dockerfile
  2. 2 2
      ConsoleClient/Dockerfile

+ 3 - 3
AndroidLibrary/Dockerfile

@@ -2,7 +2,7 @@
 #
 # See README.md for usage instructions.
 
-FROM ubuntu:latest
+FROM ubuntu:16.04
 
 # Install system-level dependencies.
 ENV DEBIAN_FRONTEND=noninteractive
@@ -11,13 +11,13 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
     ca-certificates \
     curl \
     git \
-    openjdk-7-jdk \
+    openjdk-8-jdk \
     pkg-config \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Go.
-ENV GOVERSION=go1.6 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
+ENV GOVERSION=go1.6.2 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
 
 RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz -o /tmp/go.tar.gz \
   && tar -C /usr/local -xzf /tmp/go.tar.gz \

+ 2 - 2
ConsoleClient/Dockerfile

@@ -2,7 +2,7 @@
 #
 # See README.md for usage instructions.
 
-FROM ubuntu:latest
+FROM ubuntu:16.04
 
 # Install system-level dependencies.
 ENV DEBIAN_FRONTEND=noninteractive
@@ -22,7 +22,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Go.
-ENV GOVERSION=go1.6 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
+ENV GOVERSION=go1.6.2 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
 
 RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz -o /tmp/go.tar.gz \
    && tar -C /usr/local -xzf /tmp/go.tar.gz \