Converting tag 'beta' to '2.0'

2.0.0-beta.3/docker-compose.yml → 2.0/docker-compose.yml

@@ -5,7 +5,7 @@ web:
   links:
     - mysql
   volumes:
-    - ~/www/Elgg/:/var/www/html/
+    - .:/var/www/html/
   environment:
     MYSQL_USER: root
     MYSQL_PASS: root-pass

2.0.0-beta.3/elgg-install.sh → 2.0/elgg-install.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MYSQL_LOOPS="20"
+WAIT_MYSQL_START="30" # In seconds
 MYSQL_PORT="$MYSQL_PORT"
 MYSQL_USER="$MYSQL_USER"
 MYSQL_PASS="$MYSQL_PASS"

README.md

@@ -1,6 +1,6 @@
 # Supported tags and respective `Dockerfile` links
 
-  -	[`2.0.0-beta.3` (*2.0.0-beta.3/Dockerfile*)](https://github.com/keviocastro/elgg-docker/blob/master/2.0.0-beta.3/Dockerfile)
+  -	[`2.0` (*2.0/Dockerfile*)](https://github.com/keviocastro/elgg-docker/blob/master/2.0/Dockerfile)
   
   Note: I'm working to add tags: 1.12.4, 1.x-dev, 2.x-dev
 
@@ -31,7 +31,7 @@ $ mkdir Elgg && cd Elgg
     "name": "your-account/elgg",
     "type": "project",
     "require": {
-        "elgg/elgg": "2.0.0-beta.3"
+        "elgg/elgg": "2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.7"
@@ -52,11 +52,11 @@ $ composer global require "fxp/composer-asset-plugin:~1.0"
 $ composer install
 ```
 
-2.. Create file docker-compose.yml for running multi-container applications with docker-compose:
+2.. Create file docker-compose.yml at your project directory, for running multi-container applications with docker-compose:
 
 ```yml
 web:
-  image: keviocastro/elgg-docker:2.0.0-beta.3
+  image: keviocastro/elgg-docker:2.0
   ports:
     - "8000:80"
   links:
@@ -90,14 +90,14 @@ Visit your Elgg site: <http://localhost:8000/>
 
 When you start the elgg-docker image, you can adjust the configuration of the elgg instance by passing one or 
 more environment variables.
-The default values are in Dockerfile file: [`Dockerfile`](https://github.com/keviocastro/elgg-docker/blob/master/2.0.0-beta.3/Dockerfile)
+The default values are in Dockerfile file: [`Dockerfile`](https://github.com/keviocastro/elgg-docker/blob/master/2.0/Dockerfile)
 
 > You can modify the parameters by passing one or more environment variables in file docker-compose.yml
 
 > Example: 
 ```yml
 web:
-  image: keviocastro/elgg-docker:2.0.0-beta.3
+  image: keviocastro/elgg-docker:2.0
   environment:
     MYSQL_USER: elgg
     MYSQL_PASS: elgg-pass

elgg-docker.sublime-project

@@ -0,0 +1,8 @@
+{
+	"folders":
+	[
+		{
+			"path": "."
+		}
+	]
+}

elgg-docker.sublime-workspace

@@ -0,0 +1,282 @@
+{
+	"auto_complete":
+	{
+		"selected_items":
+		[
+			[
+				"st",
+				"style	Tag"
+			],
+			[
+				"fu",
+				"fun	Function"
+			],
+			[
+				"pos",
+				"position"
+			],
+			[
+				"map",
+				"maps"
+			],
+			[
+				"googl",
+				"google"
+			],
+			[
+				"goo",
+				"google"
+			],
+			[
+				"google",
+				"google-map"
+			],
+			[
+				"se",
+				"section	Tag"
+			],
+			[
+				"s",
+				"span	Tag"
+			]
+		]
+	},
+	"buffers":
+	[
+	],
+	"build_system": "",
+	"build_system_choices":
+	[
+	],
+	"build_varint": "",
+	"command_palette":
+	{
+		"height": 392.0,
+		"last_filter": "rein",
+		"selected_items":
+		[
+			[
+				"rein",
+				"Indentation: Reindent Lines"
+			],
+			[
+				"insta",
+				"Package Control: Install Package"
+			],
+			[
+				"instal",
+				"Package Control: Install Package"
+			],
+			[
+				"REIN",
+				"Indentation: Reindent Lines"
+			]
+		],
+		"width": 467.0
+	},
+	"console":
+	{
+		"height": 153.0,
+		"history":
+		[
+			"import urllib.request,os,hashlib; h = '2915d1851351e5ee549c20394736b442' + '8bc59f460fa1548d1514676163dafc88'; pf = 'Package Control.sublime-package'; ipp = sublime.installed_packages_path(); urllib.request.install_opener( urllib.request.build_opener( urllib.request.ProxyHandler()) ); by = urllib.request.urlopen( 'http://packagecontrol.io/' + pf.replace(' ', '%20')).read(); dh = hashlib.sha256(by).hexdigest(); print('Error validating download (got %s instead of %s), please try manual install' % (dh, h)) if dh != h else open(os.path.join( ipp, pf), 'wb' ).write(by)"
+		]
+	},
+	"distraction_free":
+	{
+		"menu_visible": true,
+		"show_minimap": false,
+		"show_open_files": false,
+		"show_tabs": false,
+		"side_bar_visible": false,
+		"status_bar_visible": false
+	},
+	"expanded_folders":
+	[
+		"/home/kevio/DockerProjects/elgg-docker",
+		"/home/kevio/DockerProjects/elgg-docker/2.0"
+	],
+	"file_history":
+	[
+		"/home/kevio/DockerProjects/elgg-docker/2.0/elgg-install.sh",
+		"/home/kevio/DockerProjects/elgg-docker/2.0.0-beta.3/Dockerfile",
+		"/home/kevio/WebProjects/resap/composer.json",
+		"/home/kevio/WebProjects/resap/docker-compose.yml",
+		"/home/kevio/DockerProjects/elgg-docker/2.0.0-beta.3/docker-compose.yml",
+		"/home/kevio/.composer/auth.json",
+		"/home/kevio/Projects/tohelp/app/elements/my-map/my-map.html",
+		"/home/kevio/Projects/tohelp/app/index.html",
+		"/home/kevio/Projects/tohelp/app/styles/main.css",
+		"/home/kevio/Projects/tohelp/app/elements/my-list/my-list.html",
+		"/home/kevio/.config/sublime-text-3/Packages/User/HTML.sublime-settings",
+		"/home/kevio/Projects/tohelp/bower_components/google-map/google-map.html",
+		"/home/kevio/Projects/tohelp/app/elements/elements.html",
+		"/home/kevio/.config/sublime-text-3/Packages/Default/Preferences.sublime-settings",
+		"/home/kevio/Projects/tohelp/app/elements/map/map.html",
+		"/home/kevio/Projects/tohelp/bower_components/google-apis/google-maps-api.html",
+		"/home/kevio/Projects/tohelp/app/elements/routing.html"
+	],
+	"find":
+	{
+		"height": 27.0
+	},
+	"find_in_files":
+	{
+		"height": 0.0,
+		"where_history":
+		[
+		]
+	},
+	"find_state":
+	{
+		"case_sensitive": false,
+		"find_history":
+		[
+			"google-map",
+			"api",
+			"space",
+			"indent",
+			"infoWindow",
+			"options",
+			"api",
+			"MAP",
+			"map",
+			"users",
+			"IMPORT"
+		],
+		"highlight": true,
+		"in_selection": false,
+		"preserve_case": false,
+		"regex": false,
+		"replace_history":
+		[
+		],
+		"reverse": false,
+		"show_context": true,
+		"use_buffer2": true,
+		"whole_word": false,
+		"wrap": true
+	},
+	"groups":
+	[
+		{
+			"sheets":
+			[
+			]
+		}
+	],
+	"incremental_find":
+	{
+		"height": 27.0
+	},
+	"input":
+	{
+		"height": 35.0
+	},
+	"layout":
+	{
+		"cells":
+		[
+			[
+				0,
+				0,
+				1,
+				1
+			]
+		],
+		"cols":
+		[
+			0.0,
+			1.0
+		],
+		"rows":
+		[
+			0.0,
+			1.0
+		]
+	},
+	"menu_visible": true,
+	"output.find_results":
+	{
+		"height": 0.0
+	},
+	"pinned_build_system": "",
+	"project": "elgg-docker.sublime-project",
+	"replace":
+	{
+		"height": 50.0
+	},
+	"save_all_on_build": true,
+	"select_file":
+	{
+		"height": 0.0,
+		"last_filter": "",
+		"selected_items":
+		[
+			[
+				"google-map",
+				"bower_components/google-map/google-map.html"
+			],
+			[
+				"google-maps-api",
+				"bower_components/google-apis/google-maps-api.html"
+			],
+			[
+				"google-apis/google-maps-api.html",
+				"bower_components/google-apis/google-maps-api.html"
+			],
+			[
+				"google-map-api",
+				"bower_components/google-apis/google-maps-api.html"
+			],
+			[
+				"google",
+				"bower_components/google-map/google-map.html"
+			],
+			[
+				"wer_components/google-apis/google-maps-api.html",
+				"bower_components/google-apis/google-maps-api.html"
+			]
+		],
+		"width": 0.0
+	},
+	"select_project":
+	{
+		"height": 500.0,
+		"last_filter": "",
+		"selected_items":
+		[
+			[
+				"",
+				"~/WebProjects/resap/resap.sublime-project"
+			],
+			[
+				"re",
+				"~/WebProjects/resap/resap.sublime-workspace"
+			]
+		],
+		"width": 380.0
+	},
+	"select_symbol":
+	{
+		"height": 0.0,
+		"last_filter": "",
+		"selected_items":
+		[
+		],
+		"width": 0.0
+	},
+	"selected_group": 0,
+	"settings":
+	{
+	},
+	"show_minimap": true,
+	"show_open_files": false,
+	"show_tabs": true,
+	"side_bar_visible": true,
+	"side_bar_width": 314.0,
+	"status_bar_visible": true,
+	"template_settings":
+	{
+	}
+}