summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--OS/Fedora/.ssh/authorized_keys1
-rw-r--r--OS/Fedora/Dockerfile14
-rw-r--r--OS/Fedora/README.md10
-rw-r--r--Services/php/Dockerfile12
-rw-r--r--Services/php/welcome_apache.html11
6 files changed, 47 insertions, 2 deletions
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 <dev@startx.fr>
+
+# 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 <dev@startx.fr>
+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 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>STARTX : Fedora + Apache Webserver</title>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ </head>
+ <body>
+ <div>See <a href="https://registry.hub.docker.com/u/startx/" target="_blank">Docker registry</a></div>
+ </body>
+</html>