diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-05-22 19:00:59 -0400 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-05-22 20:23:21 -0400 |
| commit | 348ca76cf790c84d5650b13aba5576e8cd0aa609 (patch) | |
| tree | 39308c966f6136de2870b41710250bebba25c615 /templates/tools/dockerfile | |
| parent | 336292d2f38b9883e2002f1f1c89704b971d62a6 (diff) | |
hotfix for sanity tests
Diffstat (limited to 'templates/tools/dockerfile')
| -rw-r--r-- | templates/tools/dockerfile/test/sanity/Dockerfile.template | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index 8e2140e648..9987e35260 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -29,7 +29,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - FROM debian:jessie + FROM ubuntu:15.10 <%include file="../../apt_get_basic.include"/> #======================== @@ -46,10 +46,8 @@ #====================================== # More sanity test dependencies (bazel) - RUN echo "deb http://httpredir.debian.org/debian jessie-backports main" > \ - /etc/apt/sources.list.d/backports.list - RUN apt-get update - RUN apt-get -t jessie-backports install -y openjdk-8-jdk + RUN apt-get install -y openjdk-8-jdk + # TOOD(jtattermusch): pin the bazel version RUN git clone https://github.com/bazelbuild/bazel.git /bazel RUN cd /bazel && ./compile.sh RUN ln -s /bazel/output/bazel /bin/ @@ -58,7 +56,6 @@ # Docker "inception" # Note this is quite the ugly hack. # This makes sure that the docker binary we inject has its dependencies. - RUN apt-get install libsystemd-journal0 RUN curl https://get.docker.com/ | sh RUN apt-get remove --purge -y docker-engine |