From 1ac407b29b6319fbfb341a9b42725ad558918e45 Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 21:54:25 +0100 Subject: [PATCH 01/17] Updated base images and author --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b881f96..d99303f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Info -FROM debian:8.2 -MAINTAINER Nikolas Tsiongas -LABEL Description="Flarum forum easy deployment" Vendor="echo511" Version="1.0" +FROM debian:8.3 +MAINTAINER Meta Lounge +LABEL Description="Flarum forum easy deployment" Vendor="djtye" Version="0.1" # System RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \ From 74f99ec253572026ca3cc5dd2a4bfab693540b6c Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 21:58:27 +0100 Subject: [PATCH 02/17] Fixes and better explanations --- run-flarum.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/run-flarum.sh b/run-flarum.sh index ed7d918..5fc3957 100644 --- a/run-flarum.sh +++ b/run-flarum.sh @@ -1,14 +1,12 @@ #!/bin/sh -echo "Starting flarum..." +echo "Starting Flarum Docker Container..." -echo "Stargin mysql" +echo "Stargin MySQL" /etc/init.d/mysql start -echo "Starting php" +echo "Starting PHP" /etc/init.d/php5-fpm start -echo "Starting nginx" +echo "Starting NGINX" /etc/init.d/nginx start - -tail -f /var/log/nginx/access.log \ No newline at end of file From 79605cb65e1983cf5dcffd35610cea75d1fdfadc Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 21:59:00 +0100 Subject: [PATCH 03/17] Typo fix --- run-flarum.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-flarum.sh b/run-flarum.sh index 5fc3957..2073dcc 100644 --- a/run-flarum.sh +++ b/run-flarum.sh @@ -1,8 +1,8 @@ #!/bin/sh -echo "Starting Flarum Docker Container..." +echo "Starting Flarum Docker Container" -echo "Stargin MySQL" +echo "Starting MySQL" /etc/init.d/mysql start echo "Starting PHP" From 43304f6a0dd278d46642047fc0905884fca2cc70 Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:01:12 +0100 Subject: [PATCH 04/17] Fixes --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d99303f..503fae5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Info FROM debian:8.3 MAINTAINER Meta Lounge -LABEL Description="Flarum forum easy deployment" Vendor="djtye" Version="0.1" +LABEL Description="Just a Stable Flarum Docker Image" Vendor="djtye" Version="0.1" # System RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \ From 8ca78ede0845968f9cfcea9b00ff19190b96ec9d Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:07:00 +0100 Subject: [PATCH 05/17] Create a bootstrap file --- bootstrap-flarum.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 bootstrap-flarum.sh diff --git a/bootstrap-flarum.sh b/bootstrap-flarum.sh new file mode 100644 index 0000000..c221f64 --- /dev/null +++ b/bootstrap-flarum.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +echo "Bootstraping Flarum" +docker run djtye/docker-forum From f9ccf772b0df60b5ec8df30fe5630819b036dafa Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:08:58 +0100 Subject: [PATCH 06/17] Files updater --- update-files | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 update-files diff --git a/update-files b/update-files new file mode 100644 index 0000000..a1b84ce --- /dev/null +++ b/update-files @@ -0,0 +1,4 @@ +#!/bin/sh + +echo "Updating These Files From GitHub (djtye/docker-flarum)" +git pull From a79d2759658095f9b54fbc653148286758a7bb91 Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:14:08 +0100 Subject: [PATCH 07/17] New install --- README.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0bcb13c..51595c3 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,23 @@ -# Flarum forum Docker image +# Flarum Forum Docker Image + +## Install + +> Make sure git is installed. +> Pull these files using git pull https://github.com/djtye/docker-flarum.git ## Instructions -Image database details: +Image Database Details: > db: flarum > user: root > password: (without password) + + +## File Contents + +What our files do: + +> bootstrap-flarum.sh : Builds a Flarum Docker Image +> run-flarum.sh : Run the Flarum Docker Image +> update-files.sh: Updates these files from GitHub From 333a517bc4d37e7c4f2c86ec0d434924e6fb03d3 Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:14:46 +0100 Subject: [PATCH 08/17] Added bullets --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 51595c3..c161719 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,6 @@ Image Database Details: What our files do: -> bootstrap-flarum.sh : Builds a Flarum Docker Image -> run-flarum.sh : Run the Flarum Docker Image -> update-files.sh: Updates these files from GitHub +* bootstrap-flarum.sh : Builds a Flarum Docker Image +* run-flarum.sh : Run the Flarum Docker Image +* update-files.sh: Updates these files from GitHub From 5860fa1f038ebde93417a1985b77e3803d43e71b Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:15:30 +0100 Subject: [PATCH 09/17] Added more bullets --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c161719..7895bb7 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Image Database Details: -> db: flarum -> user: root -> password: (without password) +* Database: flarum +* Username: root +* Password: (without password) ## File Contents @@ -20,4 +20,4 @@ What our files do: * bootstrap-flarum.sh : Builds a Flarum Docker Image * run-flarum.sh : Run the Flarum Docker Image -* update-files.sh: Updates these files from GitHub +* update-files.sh: Updates these files from GitHub From 17226b99cfb63eb977dd400e5349eb2c056e0041 Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:16:15 +0100 Subject: [PATCH 10/17] Make the code install readable --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7895bb7..082ef68 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Install > Make sure git is installed. -> Pull these files using git pull https://github.com/djtye/docker-flarum.git +> Pull these files using [code]git pull https://github.com/djtye/docker-flarum.git[/code] ## Instructions From d46defb3bb136ff9a2772d6b3e9176708779256b Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:19:44 +0100 Subject: [PATCH 11/17] New install aha --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 082ef68..913266e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,10 @@ ## Install > Make sure git is installed. -> Pull these files using [code]git pull https://github.com/djtye/docker-flarum.git[/code] +> Pull these files using: +- git pull https://github.com/djtye/docker-flarum.git +> Then run: +- sh bootstrap-flarum.sh ## Instructions @@ -11,12 +14,12 @@ Image Database Details: * Database: flarum * Username: root -* Password: (without password) +* Password: (Without password) ## File Contents -What our files do: +What do our files do: * bootstrap-flarum.sh : Builds a Flarum Docker Image * run-flarum.sh : Run the Flarum Docker Image From 867d3abbf6049b128a736a871435063c90fcecc9 Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:20:40 +0100 Subject: [PATCH 12/17] Even more bullets --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 913266e..a14a3c6 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ ## Install -> Make sure git is installed. -> Pull these files using: +* Make sure git is installed. +* Pull these files using: - git pull https://github.com/djtye/docker-flarum.git -> Then run: +* Then run: - sh bootstrap-flarum.sh ## Instructions From 16b6cefd9019f0aa7632db8ab59887d4c228470f Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:32:53 +0100 Subject: [PATCH 13/17] Silly mistake :L --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a14a3c6..b48a95f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ * Make sure git is installed. * Pull these files using: -- git pull https://github.com/djtye/docker-flarum.git +- git clone https://github.com/djtye/docker-flarum.git * Then run: - sh bootstrap-flarum.sh From d9a4baac08c572360ef0980b911ee3d84f32229e Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:34:29 +0100 Subject: [PATCH 14/17] Revert test --- bootstrap-flarum.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-flarum.sh b/bootstrap-flarum.sh index c221f64..29f8c4b 100644 --- a/bootstrap-flarum.sh +++ b/bootstrap-flarum.sh @@ -1,4 +1,4 @@ #!/bin/sh echo "Bootstraping Flarum" -docker run djtye/docker-forum +docker run echo511/docker-flarum From 0a0726cbfc65c78354c2ded2ec0b9e8293ca2a5d Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:35:06 +0100 Subject: [PATCH 15/17] Revert test --- update-files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-files b/update-files index a1b84ce..c94a982 100644 --- a/update-files +++ b/update-files @@ -1,4 +1,4 @@ #!/bin/sh -echo "Updating These Files From GitHub (djtye/docker-flarum)" +echo "Updating These Files From GitHub (echo511/docker-flarum)" git pull From 2b065f08882dcd557ae0a0dc23b4c626a82e3e99 Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:36:04 +0100 Subject: [PATCH 16/17] Revert test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b48a95f..c63e607 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ * Make sure git is installed. * Pull these files using: -- git clone https://github.com/djtye/docker-flarum.git +- git clone https://github.com/echo511/docker-flarum.git * Then run: - sh bootstrap-flarum.sh From ea837a09f688550f0507fbed18367aa4f18c7ea9 Mon Sep 17 00:00:00 2001 From: David Tye Date: Thu, 31 Mar 2016 22:38:10 +0100 Subject: [PATCH 17/17] Revert to main maintainer --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 503fae5..acb88dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Info FROM debian:8.3 -MAINTAINER Meta Lounge -LABEL Description="Just a Stable Flarum Docker Image" Vendor="djtye" Version="0.1" +MAINTAINER Nikolas Tsiongas +LABEL Description="Just a Stable Flarum Docker Image" Vendor="echo511" Version="2.0" # System RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && \