summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2014-11-20 11:34:01 +0100
committerstartxfr <clarue@startx.fr>2014-11-20 11:34:01 +0100
commit1bf7a4cce5e6235f4d9065e892c9aead51866238 (patch)
tree61a4d0b7074d5dea89e8a6468f390aa9cc89feda
parent571b9292a928511369add143497c9c15719b64c9 (diff)
downloadphpmyadmin-1bf7a4cce5e6235f4d9065e892c9aead51866238.tar.gz
phpmyadmin-1bf7a4cce5e6235f4d9065e892c9aead51866238.tar.bz2
phpmyadmin-1bf7a4cce5e6235f4d9065e892c9aead51866238.tar.xz
phpmyadmin-1bf7a4cce5e6235f4d9065e892c9aead51866238.zip
modif de code example dans les readme
-rw-r--r--Applications/phpmyadmin/README.md4
-rw-r--r--Applications/rockmongo/README.md4
-rw-r--r--OS/Fedora/README.md14
-rw-r--r--Services/apache/README.md4
-rw-r--r--Services/mariadb/README.md4
-rw-r--r--Services/memcache/README.md4
-rw-r--r--Services/mongo/README.md4
-rw-r--r--Services/nodejs/README.md4
-rw-r--r--Services/php/Dockerfile2
-rw-r--r--Services/php/README.md4
-rw-r--r--Services/postgres/README.md4
-rw-r--r--Services/ssh/Dockerfile2
-rw-r--r--Services/ssh/README.md4
13 files changed, 26 insertions, 32 deletions
diff --git a/Applications/phpmyadmin/README.md b/Applications/phpmyadmin/README.md
index ab0d25f..3079538 100644
--- a/Applications/phpmyadmin/README.md
+++ b/Applications/phpmyadmin/README.md
@@ -6,13 +6,13 @@ This container run phpMyAdmin on PHP server running under a fedora server.
## Build and run from local Dockerfile
### Building docker image
-Copy the sources to your docker host
+* Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-and build the container
+* Build the container
docker build -t startx/app-pma Applications/phpmyadmin/
diff --git a/Applications/rockmongo/README.md b/Applications/rockmongo/README.md
index 56badf9..6eb6770 100644
--- a/Applications/rockmongo/README.md
+++ b/Applications/rockmongo/README.md
@@ -6,13 +6,13 @@ This container run Rockmongo on PHP server running under a fedora server.
## Build and run from local Dockerfile
### Building docker image
-Copy the sources to your docker host
+* Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-and build the container
+* Build the container
docker build -t startx/app-rockmongo Applications/rockmongo/
diff --git a/OS/Fedora/README.md b/OS/Fedora/README.md
index 4cfc20f..0fc3c7c 100644
--- a/OS/Fedora/README.md
+++ b/OS/Fedora/README.md
@@ -5,23 +5,17 @@ Fedora image builded with minimal and updated binaries
docker run -it --name="fedora" startx/fedora
## Build and run from local Dockerfile
-### Building docker image
-Copy the sources to your docker host
-
+* ### Building docker image
+ * Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-
-and build the container
-
+ * Build the container
docker build -t fedora OS/Fedora/
-
-### Running local image
-
+* ### Running local image
docker run -it --name="fedora" startx/fedora bash
## Accessing server
-
docker run -it startx/fedora bash
## Related Resources
diff --git a/Services/apache/README.md b/Services/apache/README.md
index b6c6764..bf3dfce 100644
--- a/Services/apache/README.md
+++ b/Services/apache/README.md
@@ -7,13 +7,13 @@ This container run apache on fedora server.
## Build and run from local Dockerfile
### Building docker image
-Copy the sources to your docker host
+* Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-and build the container
+* Build the container
docker build -t sv-apache Services/apache/
diff --git a/Services/mariadb/README.md b/Services/mariadb/README.md
index 6d858e7..a0c1e48 100644
--- a/Services/mariadb/README.md
+++ b/Services/mariadb/README.md
@@ -10,13 +10,13 @@ This container run mariadb on fedora server.
## Build and run from local Dockerfile
### Building docker image
-Copy the sources to your docker host
+* Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-and build the container
+* Build the container
docker build -t sv-mariadb Services/mariadb/
diff --git a/Services/memcache/README.md b/Services/memcache/README.md
index 94e54d3..13df4d9 100644
--- a/Services/memcache/README.md
+++ b/Services/memcache/README.md
@@ -10,13 +10,13 @@ This container run memcached on fedora server.
## Build and run from local Dockerfile
### Building docker image
-Copy the sources to your docker host
+* Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-and build the container
+* Build the container
docker build -t sv-memcache Services/memcache/
diff --git a/Services/mongo/README.md b/Services/mongo/README.md
index da0e8ca..ae5d542 100644
--- a/Services/mongo/README.md
+++ b/Services/mongo/README.md
@@ -10,13 +10,13 @@ This container run mongod on fedora server.
## Build and run from local Dockerfile
### Building docker image
-Copy the sources to your docker host
+* Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-and build the container
+* Build the container
docker build -t sv-mongo Services/mongo/
diff --git a/Services/nodejs/README.md b/Services/nodejs/README.md
index dbb816a..772bdf9 100644
--- a/Services/nodejs/README.md
+++ b/Services/nodejs/README.md
@@ -7,13 +7,13 @@ This container run nodejs on fedora server.
## Build and run from local Dockerfile
### Building docker image
-Copy the sources to your docker host
+* Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-and build the container
+* Build the container
docker build -t sv-nodejs Services/nodejs/
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index cca87cb..ca945ee 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -10,6 +10,6 @@ RUN yum -y install php php-pecl-mongo php-cli php-pear \
&& yum clean all \
&& rm -rf /var/www/html \
&& ln -s /src /var/www/html
-ADD index.php /src/index.php
+COPY index.php /src/index.php
CMD ["/bin/apache_run.sh"] \ No newline at end of file
diff --git a/Services/php/README.md b/Services/php/README.md
index 7d85d27..461e6a0 100644
--- a/Services/php/README.md
+++ b/Services/php/README.md
@@ -7,13 +7,13 @@ This container run php via apache on fedora server.
## Build and run from local Dockerfile
### Building docker image
-Copy the sources to your docker host
+* Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-and build the container
+* Build the container
docker build -t sv-php Services/php/
diff --git a/Services/postgres/README.md b/Services/postgres/README.md
index 877403f..cc6366a 100644
--- a/Services/postgres/README.md
+++ b/Services/postgres/README.md
@@ -10,13 +10,13 @@ This container run postgres on fedora server.
## Build and run from local Dockerfile
### Building docker image
-Copy the sources to your docker host
+* Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-and build the container
+* Build the container
docker build -t sv-postgres Services/postgres/
diff --git a/Services/ssh/Dockerfile b/Services/ssh/Dockerfile
index c2a2c5e..904a064 100644
--- a/Services/ssh/Dockerfile
+++ b/Services/ssh/Dockerfile
@@ -8,7 +8,7 @@ RUN yum -y update \
RUN mkdir /var/run/sshd \
&& ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-# Add ssh keys
+# Copy ssh keys
COPY .ssh/authorized_keys /root/.ssh/authorized_keys
EXPOSE 22
diff --git a/Services/ssh/README.md b/Services/ssh/README.md
index 86bac2d..a753c27 100644
--- a/Services/ssh/README.md
+++ b/Services/ssh/README.md
@@ -7,13 +7,13 @@ This container run sshd on fedora server. You can overwrite /root/.ssh/autorized
## Build and run from local Dockerfile
### Building docker image
-Copy the sources to your docker host
+* Copy sources in your docker host
mkdir startx-docker-images;
cd startx-docker-images;
git clone https://github.com/startxfr/docker-images.git .
-and build the container
+* Build the container
docker build -t sv-ssh Services/ssh/