Merge remote-tracking branch 'origin/develop' into develop

pydio · Nov 29, 2014 · 7ced6d3 · 7ced6d3
2 parents 65aa360 + f7d0410
commit 7ced6d3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dist/docker/Dockerfile b/dist/docker/Dockerfile
@@ -1,6 +1,6 @@
 # DOCKER-VERSION 0.xx
 # Pydio Version 5.2.5
-FROM centos:6.4
+FROM centos:centos6
 MAINTAINER team@pyd.io
 
 ADD ./my.cnf /etc/my.cnf
@@ -37,7 +37,7 @@ RUN /etc/configure_php_modules.sh
 RUN echo -e "NETWORKING=yes" > /etc/sysconfig/network
 
 # install pydio
-RUN yum install -y pydio
+RUN yum --disablerepo=pydio-testing -y install pydio
 # pre-configure pydio
 RUN /etc/pre_conf_pydio.sh