switching to fedora 23 in master. Start adding docker-compose support

10 files changed, 18 insertions, 31 deletions

diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile
index 10a6e1f..d382ea7 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -3,8 +3,8 @@ MAINTAINER Christophe LARUE <dev@startx.fr>
 
 USER root
 # Install packages and set up httpd
-RUN yum -y install httpd \
-    && yum clean all \
+RUN dnf -y install httpd \
+    && dnf clean all \
     && mkdir -p /var/www/html \
     && mkdir -p /var/log/httpd 
 # Copy startx toolkit
diff --git a/Services/dockerhub_run.sh b/Services/dockerhub_run.sh
deleted file mode 100755
index 3b3d06d..0000000
--- a/Services/dockerhub_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-docker run -d -p 80:80 --name="apache" startx/sv-apache
-docker run -d -p 3306:3306 --name="mariadb" startx/sv-mariadb
-docker run -d -p 11211:11211 --name="memcache" startx/sv-memcache
-docker run -d -p 27017:27017 --name="mongo" startx/sv-mongo
-docker run -d -p 8000:8000 --name="nodejs" startx/sv-nodejs
-docker run -d -p 82:80 --name="php" startx/sv-php
-docker run -d -p 5432:5432 --name="postgres" startx/sv-postgres
-docker run -d -p 2002:2002 --name="ooconv" startx/sv-ooconv
-docker run -d -p 22022:22 --name="ssh" startx/sv-ssh
\ No newline at end of file
diff --git a/Services/mariadb/Dockerfile b/Services/mariadb/Dockerfile
index 3dc35fe..5efa265 100644
--- a/Services/mariadb/Dockerfile
+++ b/Services/mariadb/Dockerfile
@@ -1,11 +1,8 @@
 FROM startx/fedora
 MAINTAINER Christophe LARUE <dev@startx.fr>
 
-RUN yum -y install \
-    mariadb-libs \
-    mariadb-server \
-    mariadb \
-    && yum clean all \
+RUN dnf -y install  mariadb-common mariadb-libs mariadb-config mariadb-errmsg mariadb-server mariadb \
+    && dnf clean all \
     && mkdir -p /var/log/mysql \
     && touch /var/log/mysql/.keep /var/lib/mysql/.keep \
     && chown -R mysql:mysql /var/log/mysql /var/lib/mysql \
diff --git a/Services/memcache/Dockerfile b/Services/memcache/Dockerfile
index b71fb6f..6bc68fe 100644
--- a/Services/memcache/Dockerfile
+++ b/Services/memcache/Dockerfile
@@ -1,7 +1,7 @@
 FROM startx/fedora
 MAINTAINER Christophe LARUE <dev@startx.fr>
 
-RUN yum -y install memcached memcached-selinux && yum clean all 
+RUN dnf -y install memcached memcached-selinux && yum clean all 
 COPY sx/* /sx/
 RUN chmod ug+rx /sx/memcache* 
 
diff --git a/Services/mongo/Dockerfile b/Services/mongo/Dockerfile
index 0199e76..85261c8 100644
--- a/Services/mongo/Dockerfile
+++ b/Services/mongo/Dockerfile
@@ -1,14 +1,14 @@
 FROM startx/fedora
 MAINTAINER Christophe LARUE <dev@startx.fr>
 
-RUN yum -y install \
+RUN dnf -y install \
     mongodb \
     mongodb-server \
     libmongo-client \
     rsyslog-mongodb \
     mongodb-mms-backup-agent \
     mongodb-mms-monitoring-agent \
-    && yum clean all \
+    && dnf clean all \
     && mkdir -p /var/lib/mongodb \
     && touch /var/lib/mongodb/.keep 
 COPY sx/* /sx/
diff --git a/Services/nodejs/Dockerfile b/Services/nodejs/Dockerfile
index c25c32d..dc20d72 100644
--- a/Services/nodejs/Dockerfile
+++ b/Services/nodejs/Dockerfile
@@ -1,8 +1,8 @@
 FROM startx/fedora
 MAINTAINER Christophe LARUE <dev@startx.fr>
 
-RUN yum -y install nodejs npm python make gcc \
-    && yum clean all \
+RUN dnf -y install nodejs npm python make gcc \
+    && dnf clean all \
     && mkdir -p /app \
     && chmod ug+rx /app
 VOLUME ["/app"]
diff --git a/Services/ooconv/Dockerfile b/Services/ooconv/Dockerfile
index 699f6de..f8ce949 100644
--- a/Services/ooconv/Dockerfile
+++ b/Services/ooconv/Dockerfile
@@ -3,8 +3,8 @@ MAINTAINER Christophe LARUE <dev@startx.fr>
 
 USER root
 # Install packages and set up unoconv
-RUN yum -y install unoconv libreoffice-headless libreoffice-writer libreoffice-calc pdftk gs \
-    && yum clean all \
+RUN dnf -y install unoconv libreoffice-headless libreoffice-writer libreoffice-calc pdftk gs \
+    && dnf clean all \
     && mkdir -p /tmp/ootmp 
 # Copy startx toolkit
 COPY sx/* /sx/
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index 2c86f15..60985df 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -2,12 +2,12 @@ FROM startx/sv-apache
 MAINTAINER Christophe LARUE <dev@startx.fr>
 
 USER root
-RUN yum -y install php php-pecl-mongo php-cli php-pear \
+RUN dnf -y install php php-pecl-mongo php-cli php-pear \
         php-gd php-mcrypt php-mysqlnd php-soap php-pecl-xdebug \
         php-pdo php-process php-common php-mbstring \
         php-bcmath php-pecl-zip php-php-gettext php-tcpdf \
         php-tcpdf-dejavu-sans-fonts php-tidy \
-    && yum clean all  
+    && dnf clean all  
 # Copy application content
 COPY app/* /var/www/html/
 COPY httpd.conf /etc/httpd/conf.d/sx.conf
diff --git a/Services/postgres/Dockerfile b/Services/postgres/Dockerfile
index 0f2a617..2af22b1 100644
--- a/Services/postgres/Dockerfile
+++ b/Services/postgres/Dockerfile
@@ -1,8 +1,8 @@
 FROM startx/fedora
 MAINTAINER Christophe LARUE <dev@startx.fr>
 
-RUN yum -y install postgresql postgresql-libs postgresql-server \
-    && yum clean all \
+RUN dnf -y install postgresql postgresql-libs postgresql-server \
+    && dnf clean all \
     && mkdir -p /var/log/pgsql /var/lib/pgsql \
     && touch /var/log/pgsql/.keep /var/lib/pgsql/.keep \
     && chown -R postgres:postgres /var/log/pgsql /var/lib/pgsql
diff --git a/Services/ssh/Dockerfile b/Services/ssh/Dockerfile
index 2ad849c..7a582b1 100644
--- a/Services/ssh/Dockerfile
+++ b/Services/ssh/Dockerfile
@@ -2,9 +2,9 @@ FROM startx/fedora
 MAINTAINER Christophe LARUE <dev@startx.fr>
 
 # Install packages and set up sshd
-RUN yum -y update \
-    && yum -y install openssh-server \
-    && yum clean all 
+RUN dnf -y update \
+    && dnf -y install openssh-server \
+    && dnf clean all 
 # Copy startx toolkit
 COPY sx/* /sx/
 # Copy ssh keys