From 25a402256893d2fcaf9d7c6fd3d82cb20af35851 Mon Sep 17 00:00:00 2001 From: startxfr Date: Sun, 16 Nov 2014 02:39:30 +0100 Subject: ajout d'une image fedora pour servir de base. Ajout de la clef ssh cl@alcor. Modif de l'image apache-php pour s'appuyer sur startx/fedora --- .gitignore | 1 + OS/Fedora/.ssh/authorized_keys | 1 + OS/Fedora/Dockerfile | 14 ++++++++++++++ OS/Fedora/README.md | 10 ++++++++++ Services/php/Dockerfile | 12 ++++++++++-- Services/php/welcome_apache.html | 11 +++++++++++ 6 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 OS/Fedora/.ssh/authorized_keys create mode 100644 OS/Fedora/Dockerfile create mode 100644 OS/Fedora/README.md create mode 100644 Services/php/welcome_apache.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..53a5344 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/nbproject diff --git a/OS/Fedora/.ssh/authorized_keys b/OS/Fedora/.ssh/authorized_keys new file mode 100644 index 0000000..0dbe4dc --- /dev/null +++ b/OS/Fedora/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7pCBSddCIi/lOH+z6KdkyS/JLGFCQTH8u+JyHoqUj8X9nVty6xBWNTdYDq5/0vUFLUtOxMlX9noV8JddA/XFAWpGmQU8KDq3dcqjWJXZ4NUiXwDrysP7JryVXBDidZC16ObAGw58a2/5BiXs+WGoSkkNUFZN3rbIaurrth1ODD67YZiL+Jzts2KyJednn8bM+rmmMvvhKFzV4QnmgbYF0OvdAucaMTWrdmkuY/VVse1l2LxxEx2IFz/q6dxH8uuQUGXjESXlHw5I0Fi0lhMDQ9M8xqI9AKeu87R+UPKxyOZjwGpz5Fui5yKuJOHsjY57Mze5wTOnu+YdVxJOwpJhN cl@startx.fr \ No newline at end of file diff --git a/OS/Fedora/Dockerfile b/OS/Fedora/Dockerfile new file mode 100644 index 0000000..00dcbc6 --- /dev/null +++ b/OS/Fedora/Dockerfile @@ -0,0 +1,14 @@ +FROM fedora:latest +MAINTAINER Chistophe LARUE + +# Install packages and set up sshd +RUN yum -y update && yum clean all +RUN yum -y install openssh-server && yum clean all +RUN mkdir /var/run/sshd +RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' + +# Add ssh keys +ADD .ssh/authorized_keys /root/.ssh/authorized_keys + +EXPOSE 22 +ENTRYPOINT ["/usr/sbin/sshd", "-D"] \ No newline at end of file diff --git a/OS/Fedora/README.md b/OS/Fedora/README.md new file mode 100644 index 0000000..5090799 --- /dev/null +++ b/OS/Fedora/README.md @@ -0,0 +1,10 @@ +docker-images OS : Fedora 21 +============================ + +**Description** +Based on the [tutum fedora](https://registry.hub.docker.com/u/tutum/fedora) Dockerfile + +**Usage** + ``` + docker run --name="test-fedora" -d startx/os-fedora + ``` diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile index d1a8beb..5af160a 100644 --- a/Services/php/Dockerfile +++ b/Services/php/Dockerfile @@ -1,5 +1,13 @@ +FROM startx/fedora +MAINTAINER Chistophe LARUE +RUN yum -y update && yum clean all +RUN yum -y install httpd php php-* && yum clean all +ADD welcome_apache.html /var/www/html/index.html -FROM tutum/apache-php:latest -MAINTAINER startx dev@startx.fr +EXPOSE 80 +# avoid some issues observed with container restart +RUN rm -rf /run/httpd/* + +ENTRYPOINT ["/usr/sbin/apachectl", "-D FOREGROUND"] \ No newline at end of file diff --git a/Services/php/welcome_apache.html b/Services/php/welcome_apache.html new file mode 100644 index 0000000..5c9dfd9 --- /dev/null +++ b/Services/php/welcome_apache.html @@ -0,0 +1,11 @@ + + + + STARTX : Fedora + Apache Webserver + + + + +
See Docker registry
+ + -- cgit v1.2.3