[Orxonox-commit 7605] r12198 - in build/dockerfiles: orxonox_build orxonox_jenkins-slave

[landauf at orxonox.net]

Author: landauf
Date: 2019-03-01 13:04:10 +0100 (Fri, 01 Mar 2019)
New Revision: 12198

Modified:
   build/dockerfiles/orxonox_build/Dockerfile
   build/dockerfiles/orxonox_jenkins-slave/Dockerfile
Log:
redo changes from r11812

Modified: build/dockerfiles/orxonox_build/Dockerfile
===================================================================
--- build/dockerfiles/orxonox_build/Dockerfile	2019-02-28 13:30:40 UTC (rev 12197)
+++ build/dockerfiles/orxonox_build/Dockerfile	2019-03-01 12:04:10 UTC (rev 12198)
@@ -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	2019-02-28 13:30:40 UTC (rev 12197)
+++ build/dockerfiles/orxonox_jenkins-slave/Dockerfile	2019-03-01 12:04:10 UTC (rev 12198)
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 MAINTAINER Fabian 'x3n' Landau