[Orxonox-commit 7211] r11826 - in build/dockerfiles: orxonox_build orxonox_jenkins-slave

[landauf at orxonox.net]

Author: landauf
Date: 2018-03-18 10:22:18 +0100 (Sun, 18 Mar 2018)
New Revision: 11826

Modified:
   build/dockerfiles/orxonox_build/Dockerfile
   build/dockerfiles/orxonox_jenkins-slave/Dockerfile
Log:
revert changes from r11812 because orxonox still requires cegui 0.7 at the moment

Modified: build/dockerfiles/orxonox_build/Dockerfile
===================================================================
--- build/dockerfiles/orxonox_build/Dockerfile	2018-03-18 01:35:41 UTC (rev 11825)
+++ build/dockerfiles/orxonox_build/Dockerfile	2018-03-18 09:22:18 UTC (rev 11826)
@@ -14,11 +14,10 @@
 		libcegui-mk2-dev \
 		libenet-dev \
 		liblua5.1-0-dev \
-		libogre-1.9-dev \
+		libogre-1.8-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-03-18 01:35:41 UTC (rev 11825)
+++ build/dockerfiles/orxonox_jenkins-slave/Dockerfile	2018-03-18 09:22:18 UTC (rev 11826)
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:14.04
 
 MAINTAINER Fabian 'x3n' Landau