[Orxonox-commit 7195] r11812 - in build/dockerfiles: orxonox_build orxonox_jenkins-slave

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-24 18:12:44 +0100 (Sat, 24 Feb 2018)
New Revision: 11812

Modified:
   build/dockerfiles/orxonox_build/Dockerfile
   build/dockerfiles/orxonox_jenkins-slave/Dockerfile
Log:
upgrade docker container to build orxonox from ubuntu 14.04 to 16.04

Modified: build/dockerfiles/orxonox_build/Dockerfile
===================================================================
--- build/dockerfiles/orxonox_build/Dockerfile	2018-02-24 17:09:45 UTC (rev 11811)
+++ build/dockerfiles/orxonox_build/Dockerfile	2018-02-24 17:12:44 UTC (rev 11812)
@@ -14,10 +14,11 @@
 		libcegui-mk2-dev \
 		libenet-dev \
 		liblua5.1-0-dev \
-		libogre-1.8-dev \
+		libogre-1.9-dev \
 		libtolua-dev \
 		libtolua++5.1-dev \
 		libvorbis-dev \
 		subversion \
 		tcl-dev \
+		libx11-dev \
 	&& rm -rf /var/lib/apt/lists/*

Modified: build/dockerfiles/orxonox_jenkins-slave/Dockerfile
===================================================================
--- build/dockerfiles/orxonox_jenkins-slave/Dockerfile	2018-02-24 17:09:45 UTC (rev 11811)
+++ build/dockerfiles/orxonox_jenkins-slave/Dockerfile	2018-02-24 17:12:44 UTC (rev 11812)
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 MAINTAINER Fabian 'x3n' Landau