Pages in {{ .Title | singularize }}
- - {{ range .Data.Pages }} - -{{ .Title }}
- - -- {{ printf "%s" .Summary | markdownify }} - -
- {{ end }} - - -
diff --git a/.env-example b/.env-example
index f3080a1..a262324 100644
--- a/.env-example
+++ b/.env-example
@@ -1,17 +1,17 @@
APP_NAME=IZYIM
APP_ENV=local
-APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ=
+APP_KEY=base64:SqyQijGTJXCM9o50k2sKTkx+CWqxR+CE1xNS5b8INRQ=
APP_DEBUG=true
APP_URL=http://localhost
LOG_CHANNEL=stack
DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
+DB_HOST=mysql
DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secretx
+DB_DATABASE=default
+DB_USERNAME=default
+DB_PASSWORD=secret
BROADCAST_DRIVER=log
CACHE_DRIVER=file
@@ -37,3 +37,5 @@ PUSHER_APP_CLUSTER=mt1
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+JWT_SECRET=Ra1xgapjSAFoRJIO5Rbg14gfMpNQDmrS
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..f78c24a
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM php:7
+RUN apt-get update -y && apt-get install -y openssl zip unzip git
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+RUN docker-php-ext-install pdo pdo_mysql
+WORKDIR /app
+COPY . /app
+RUN composer install
+CMD php artisan serve --host=0.0.0.0 --port=8000
+EXPOSE 8000
\ No newline at end of file
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
new file mode 100644
index 0000000..b355764
--- /dev/null
+++ b/app/Http/Controllers/AuthController.php
@@ -0,0 +1,153 @@
+only('name', 'email', 'password');
+
+ $rules = [
+ 'name' => 'required|max:255',
+ 'email' => 'required|email|max:255|unique:users'
+ ];
+ $validator = Validator::make($credentials, $rules);
+ if($validator->fails()) {
+ return response()->json(['success'=> false, 'error'=> $validator->messages()]);
+ }
+ $name = $request->name;
+ $email = $request->email;
+ $password = $request->password;
+
+ $user = User::create(['name' => $name, 'email' => $email, 'password' => Hash::make($password)]);
+ $verification_code = str_random(30); //Generate verification code
+ DB::table('user_verifications')->insert(['user_id'=>$user->id,'token'=>$verification_code]);
+ $subject = "Please verify your email address.";
+ Mail::send('email.verify', ['name' => $name, 'verification_code' => $verification_code],
+ function($mail) use ($email, $name, $subject){
+ $mail->from(getenv('FROM_EMAIL_ADDRESS'), "From User/Company Name Goes Here");
+ $mail->to($email, $name);
+ $mail->subject($subject);
+ });
+ return response()->json(['success'=> true, 'message'=> 'Thanks for signing up! Please check your email to complete your registration.']);
+ }
+
+ /**
+ * API Login, on success return JWT Auth token
+ *
+ * @param Request $request
+ * @return \Illuminate\Http\JsonResponse
+ */
+ public function login(Request $request)
+ {
+ $credentials = $request->only('email', 'password');
+
+ $rules = [
+ 'email' => 'required|email',
+ 'password' => 'required',
+ ];
+ $validator = Validator::make($credentials, $rules);
+ if($validator->fails()) {
+ return response()->json(['success'=> false, 'error'=> $validator->messages()]);
+ }
+
+ $credentials['is_verified'] = 1;
+
+ try {
+ // attempt to verify the credentials and create a token for the user
+ if (! $token = JWTAuth::attempt($credentials)) {
+ return response()->json(['success' => false, 'error' => 'We cant find an account with this credentials. Please make sure you entered the right information and you have verified your email address.'], 401);
+ }
+ } catch (JWTException $e) {
+ // something went wrong whilst attempting to encode the token
+ return response()->json(['success' => false, 'error' => 'Failed to login, please try again.'], 500);
+ }
+ // all good so return the token
+ return response()->json(['success' => true, 'data'=> [ 'token' => $token ]]);
+ }
+
+ /**
+ * Log out
+ * Invalidate the token, so user cannot use it anymore
+ * They have to relogin to get a new token
+ *
+ * @param Request $request
+ */
+ public function logout(Request $request) {
+ $this->validate($request, ['token' => 'required']);
+
+ try {
+ JWTAuth::invalidate($request->input('token'));
+ return response()->json(['success' => true, 'message'=> "You have successfully logged out."]);
+ } catch (JWTException $e) {
+ // something went wrong whilst attempting to encode the token
+ return response()->json(['success' => false, 'error' => 'Failed to logout, please try again.'], 500);
+ }
+ }
+
+ /**
+ * API Recover Password
+ *
+ * @param Request $request
+ * @return \Illuminate\Http\JsonResponse
+ */
+ public function recover(Request $request)
+ {
+ $user = User::where('email', $request->email)->first();
+ if (!$user) {
+ $error_message = "Your email address was not found.";
+ return response()->json(['success' => false, 'error' => ['email'=> $error_message]], 401);
+ }
+ try {
+ Password::sendResetLink($request->only('email'), function (Message $message) {
+ $message->subject('Your Password Reset Link');
+ });
+ } catch (\Exception $e) {
+ //Return with error
+ $error_message = $e->getMessage();
+ return response()->json(['success' => false, 'error' => $error_message], 401);
+ }
+ return response()->json([
+ 'success' => true, 'data'=> ['message'=> 'A reset email has been sent! Please check your email.']
+ ]);
+ }
+
+ /**
+ * API Verify User
+ *
+ * @param Request $request
+ * @return \Illuminate\Http\JsonResponse
+ */
+ public function verifyUser($verification_code)
+ {
+ $check = DB::table('user_verifications')->where('token',$verification_code)->first();
+ if(!is_null($check)){
+ $user = User::find($check->user_id);
+ if($user->is_verified == 1){
+ return response()->json([
+ 'success'=> true,
+ 'message'=> 'Account already verified..'
+ ]);
+ }
+ $user->update(['is_verified' => 1]);
+ DB::table('user_verifications')->where('token',$verification_code)->delete();
+ return response()->json([
+ 'success'=> true,
+ 'message'=> 'You have successfully verified your email address.'
+ ]);
+ }
+ return response()->json(['success'=> false, 'error'=> "Verification code is invalid."]);
+ }
+
+}
\ No newline at end of file
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 3439540..fc5184c 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -18,7 +18,7 @@ class Kernel extends HttpKernel
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
- \App\Http\Middleware\TrustProxies::class,
+ \App\Http\Middleware\TrustProxies::class
];
/**
@@ -59,5 +59,7 @@ class Kernel extends HttpKernel
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+ 'jwt.auth' => 'Tymon\JWTAuth\Middleware\GetUserFromToken',
+ 'jwt.refresh' => 'Tymon\JWTAuth\Middleware\RefreshToken',
];
}
diff --git a/app/User.php b/app/User.php
index bfd96a6..602279d 100644
--- a/app/User.php
+++ b/app/User.php
@@ -2,10 +2,11 @@
namespace App;
+use Tymon\JWTAuth\Contracts\JWTSubject;
use Illuminate\Notifications\Notifiable;
use Illuminate\Foundation\Auth\User as Authenticatable;
-class User extends Authenticatable
+class User extends Authenticatable implements JWTSubject
{
use Notifiable;
@@ -15,7 +16,7 @@ class User extends Authenticatable
* @var array
*/
protected $fillable = [
- 'name', 'email', 'password',
+ 'name', 'email', 'password',
];
/**
@@ -26,4 +27,24 @@ class User extends Authenticatable
protected $hidden = [
'password', 'remember_token',
];
+
+ /**
+ * Get the identifier that will be stored in the subject claim of the JWT.
+ *
+ * @return mixed
+ */
+ public function getJWTIdentifier()
+ {
+ return $this->getKey();
+ }
+ /**
+ * Return a key value array, containing any custom claims to be added to the JWT.
+ *
+ * @return array
+ */
+ public function getJWTCustomClaims()
+ {
+ return [];
+ }
+
}
diff --git a/composer.json b/composer.json
index 65bf8b4..9b16a71 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,8 @@
"php": "^7.1.3",
"fideloper/proxy": "^4.0",
"laravel/framework": "5.6.*",
- "laravel/tinker": "^1.0"
+ "laravel/tinker": "^1.0",
+ "tymon/jwt-auth": "dev-develop"
},
"require-dev": {
"filp/whoops": "^2.0",
diff --git a/composer.lock b/composer.lock
index ef8e997..9b8412c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "d5bca48e56bbf3a25645858fcab9c285",
+ "content-hash": "f2d9e6ec1c09918f1f3130aa31e04472",
"packages": [
{
"name": "dnoegel/php-xdg-base-dir",
@@ -455,16 +455,16 @@
},
{
"name": "laravel/framework",
- "version": "v5.6.16",
+ "version": "v5.6.17",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "fcdbc791bc3e113ada38ab0a1147141fb9ec2b16"
+ "reference": "0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/fcdbc791bc3e113ada38ab0a1147141fb9ec2b16",
- "reference": "fcdbc791bc3e113ada38ab0a1147141fb9ec2b16",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d",
+ "reference": "0f787c763ae8fb9fae0c8c809830ba4fa81e2d9d",
"shasum": ""
},
"require": {
@@ -475,7 +475,7 @@
"ext-openssl": "*",
"league/flysystem": "^1.0.8",
"monolog/monolog": "~1.12",
- "nesbot/carbon": "^1.24.1",
+ "nesbot/carbon": "1.25.*",
"php": "^7.1.3",
"psr/container": "~1.0",
"psr/simple-cache": "^1.0",
@@ -590,20 +590,20 @@
"framework",
"laravel"
],
- "time": "2018-04-09T16:07:04+00:00"
+ "time": "2018-04-17T12:51:04+00:00"
},
{
"name": "laravel/tinker",
- "version": "v1.0.5",
+ "version": "v1.0.6",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
- "reference": "94f6daf2131508cebd11cd6f8632ba586d7ecc41"
+ "reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/tinker/zipball/94f6daf2131508cebd11cd6f8632ba586d7ecc41",
- "reference": "94f6daf2131508cebd11cd6f8632ba586d7ecc41",
+ "url": "https://api.github.com/repos/laravel/tinker/zipball/b22fe905fcefdffae76b011e27c7ac09e07e052b",
+ "reference": "b22fe905fcefdffae76b011e27c7ac09e07e052b",
"shasum": ""
},
"require": {
@@ -611,7 +611,7 @@
"illuminate/contracts": "~5.1",
"illuminate/support": "~5.1",
"php": ">=5.5.9",
- "psy/psysh": "0.7.*|0.8.*",
+ "psy/psysh": "0.7.*|0.8.*|0.9.*",
"symfony/var-dumper": "~3.0|~4.0"
},
"require-dev": {
@@ -653,7 +653,65 @@
"laravel",
"psysh"
],
- "time": "2018-03-06T17:34:36+00:00"
+ "time": "2018-04-16T12:10:37+00:00"
+ },
+ {
+ "name": "lcobucci/jwt",
+ "version": "3.2.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/lcobucci/jwt.git",
+ "reference": "0b5930be73582369e10c4d4bb7a12bac927a203c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/lcobucci/jwt/zipball/0b5930be73582369e10c4d4bb7a12bac927a203c",
+ "reference": "0b5930be73582369e10c4d4bb7a12bac927a203c",
+ "shasum": ""
+ },
+ "require": {
+ "ext-openssl": "*",
+ "php": ">=5.5"
+ },
+ "require-dev": {
+ "mdanter/ecc": "~0.3.1",
+ "mikey179/vfsstream": "~1.5",
+ "phpmd/phpmd": "~2.2",
+ "phpunit/php-invoker": "~1.1",
+ "phpunit/phpunit": "~4.5",
+ "squizlabs/php_codesniffer": "~2.3"
+ },
+ "suggest": {
+ "mdanter/ecc": "Required to use Elliptic Curves based algorithms."
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.1-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Lcobucci\\JWT\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Luís Otávio Cobucci Oblonczyk",
+ "email": "lcobucci@gmail.com",
+ "role": "developer"
+ }
+ ],
+ "description": "A simple library to work with JSON Web Token and JSON Web Signature",
+ "keywords": [
+ "JWS",
+ "jwt"
+ ],
+ "time": "2017-09-01T08:23:26+00:00"
},
{
"name": "league/flysystem",
@@ -817,6 +875,69 @@
],
"time": "2017-06-19T01:22:40+00:00"
},
+ {
+ "name": "namshi/jose",
+ "version": "7.2.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/namshi/jose.git",
+ "reference": "89a24d7eb3040e285dd5925fcad992378b82bcff"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/namshi/jose/zipball/89a24d7eb3040e285dd5925fcad992378b82bcff",
+ "reference": "89a24d7eb3040e285dd5925fcad992378b82bcff",
+ "shasum": ""
+ },
+ "require": {
+ "ext-date": "*",
+ "ext-hash": "*",
+ "ext-json": "*",
+ "ext-pcre": "*",
+ "ext-spl": "*",
+ "php": ">=5.5",
+ "symfony/polyfill-php56": "^1.0"
+ },
+ "require-dev": {
+ "phpseclib/phpseclib": "^2.0",
+ "phpunit/phpunit": "^4.5|^5.0",
+ "satooshi/php-coveralls": "^1.0"
+ },
+ "suggest": {
+ "ext-openssl": "Allows to use OpenSSL as crypto engine.",
+ "phpseclib/phpseclib": "Allows to use Phpseclib as crypto engine, use version ^2.0."
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "Namshi\\JOSE\\": "src/Namshi/JOSE/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Alessandro Nadalin",
+ "email": "alessandro.nadalin@gmail.com"
+ },
+ {
+ "name": "Alessandro Cinelli (cirpo)",
+ "email": "alessandro.cinelli@gmail.com"
+ }
+ ],
+ "description": "JSON Object Signing and Encryption library for PHP.",
+ "keywords": [
+ "JSON Web Signature",
+ "JSON Web Token",
+ "JWS",
+ "json",
+ "jwt",
+ "token"
+ ],
+ "time": "2016-12-05T07:27:31+00:00"
+ },
{
"name": "nesbot/carbon",
"version": "1.25.0",
@@ -872,24 +993,24 @@
},
{
"name": "nikic/php-parser",
- "version": "v3.1.5",
+ "version": "v4.0.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
+ "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
- "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
+ "reference": "e4a54fa90a5cd8e8dd3fb4099942681731c5cdd3",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
- "php": ">=5.5"
+ "php": ">=7.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.0|~5.0"
+ "phpunit/phpunit": "^6.5 || ^7.0"
},
"bin": [
"bin/php-parse"
@@ -897,7 +1018,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-master": "4.0-dev"
}
},
"autoload": {
@@ -919,7 +1040,7 @@
"parser",
"php"
],
- "time": "2018-02-28T20:30:58+00:00"
+ "time": "2018-03-25T17:35:16+00:00"
},
{
"name": "paragonie/random_compat",
@@ -1115,29 +1236,29 @@
},
{
"name": "psy/psysh",
- "version": "v0.8.18",
+ "version": "v0.9.3",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834"
+ "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5357b1cffc8fb375d6a9e3c86d5c82dd38a40834",
- "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/79c280013cf0b30fa23f3ba8bd3649218075adf4",
+ "reference": "79c280013cf0b30fa23f3ba8bd3649218075adf4",
"shasum": ""
},
"require": {
"dnoegel/php-xdg-base-dir": "0.1",
"jakub-onderka/php-console-highlighter": "0.3.*",
- "nikic/php-parser": "~1.3|~2.0|~3.0",
- "php": ">=5.3.9",
+ "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0",
+ "php": ">=5.4.0",
"symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0",
"symfony/var-dumper": "~2.7|~3.0|~4.0"
},
"require-dev": {
- "hoa/console": "~3.16|~1.14",
- "phpunit/phpunit": "^4.8.35|^5.4.3",
+ "hoa/console": "~2.15|~3.16",
+ "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0",
"symfony/finder": "~2.1|~3.0|~4.0"
},
"suggest": {
@@ -1153,15 +1274,15 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-develop": "0.8.x-dev"
+ "dev-develop": "0.9.x-dev"
}
},
"autoload": {
"files": [
- "src/Psy/functions.php"
+ "src/functions.php"
],
"psr-4": {
- "Psy\\": "src/Psy/"
+ "Psy\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -1183,7 +1304,7 @@
"interactive",
"shell"
],
- "time": "2018-04-02T05:41:44+00:00"
+ "time": "2018-04-18T12:32:50+00:00"
},
{
"name": "ramsey/uuid",
@@ -1807,6 +1928,62 @@
],
"time": "2018-01-30T19:27:44+00:00"
},
+ {
+ "name": "symfony/polyfill-php56",
+ "version": "v1.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php56.git",
+ "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ebc999ce5f14204c5150b9bd15f8f04e621409d8",
+ "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "symfony/polyfill-util": "~1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.7-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Php56\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2018-01-30T19:27:44+00:00"
+ },
{
"name": "symfony/polyfill-php72",
"version": "v1.7.0",
@@ -1862,6 +2039,58 @@
],
"time": "2018-01-31T17:43:24+00:00"
},
+ {
+ "name": "symfony/polyfill-util",
+ "version": "v1.7.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-util.git",
+ "reference": "e17c808ec4228026d4f5a8832afa19be85979563"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/e17c808ec4228026d4f5a8832afa19be85979563",
+ "reference": "e17c808ec4228026d4f5a8832afa19be85979563",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.7-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Util\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony utilities for portability of PHP codes",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compat",
+ "compatibility",
+ "polyfill",
+ "shim"
+ ],
+ "time": "2018-01-31T18:08:44+00:00"
+ },
{
"name": "symfony/process",
"version": "v4.0.8",
@@ -2173,6 +2402,81 @@
"homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
"time": "2017-11-27T11:13:29+00:00"
},
+ {
+ "name": "tymon/jwt-auth",
+ "version": "dev-develop",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/tymondesigns/jwt-auth.git",
+ "reference": "2b79229235d83523a05069ccb9c97cd5ec0b8123"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/tymondesigns/jwt-auth/zipball/2b79229235d83523a05069ccb9c97cd5ec0b8123",
+ "reference": "2b79229235d83523a05069ccb9c97cd5ec0b8123",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/auth": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "illuminate/contracts": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "illuminate/http": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "illuminate/support": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "lcobucci/jwt": "^3.2",
+ "namshi/jose": "^7.0",
+ "nesbot/carbon": "^1.0",
+ "php": "^5.5.9 || ^7.0"
+ },
+ "require-dev": {
+ "cartalyst/sentinel": "2.0.*",
+ "illuminate/console": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "illuminate/database": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "illuminate/routing": "5.1.* || 5.2.* || 5.3.* || 5.4.* || 5.5.* || 5.6.*",
+ "mockery/mockery": ">=0.9.9",
+ "phpunit/phpunit": "~4.8 || ~6.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-develop": "1.0-dev"
+ },
+ "laravel": {
+ "aliases": {
+ "JWTAuth": "Tymon\\JWTAuth\\Facades\\JWTAuth",
+ "JWTFactory": "Tymon\\JWTAuth\\Facades\\JWTFactory"
+ },
+ "providers": [
+ "Tymon\\JWTAuth\\Providers\\LaravelServiceProvider"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Tymon\\JWTAuth\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Sean Tymon",
+ "email": "tymon148@gmail.com",
+ "homepage": "https://tymon.xyz",
+ "role": "Developer"
+ }
+ ],
+ "description": "JSON Web Token Authentication for Laravel and Lumen",
+ "homepage": "https://github.com/tymondesigns/jwt-auth",
+ "keywords": [
+ "Authentication",
+ "JSON Web Token",
+ "auth",
+ "jwt",
+ "laravel"
+ ],
+ "time": "2018-03-10T22:14:03+00:00"
+ },
{
"name": "vlucas/phpdotenv",
"version": "v2.4.0",
@@ -2866,23 +3170,23 @@
},
{
"name": "phpspec/prophecy",
- "version": "1.7.5",
+ "version": "1.7.6",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401"
+ "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
- "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
+ "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
"phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
- "sebastian/comparator": "^1.1|^2.0",
+ "sebastian/comparator": "^1.1|^2.0|^3.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
"require-dev": {
@@ -2925,7 +3229,7 @@
"spy",
"stub"
],
- "time": "2018-02-19T10:16:54+00:00"
+ "time": "2018-04-18T13:57:24+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -3178,16 +3482,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "7.1.3",
+ "version": "7.1.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9"
+ "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9",
- "reference": "a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6d51299e307dc510149e0b7cd1931dd11770e1cb",
+ "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb",
"shasum": ""
},
"require": {
@@ -3206,7 +3510,7 @@
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.0",
"phpunit/phpunit-mock-objects": "^6.1.1",
- "sebastian/comparator": "^2.1",
+ "sebastian/comparator": "^2.1 || ^3.0",
"sebastian/diff": "^3.0",
"sebastian/environment": "^3.1",
"sebastian/exporter": "^3.1",
@@ -3254,7 +3558,7 @@
"testing",
"xunit"
],
- "time": "2018-04-13T02:28:50+00:00"
+ "time": "2018-04-18T13:41:53+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -3359,30 +3663,30 @@
},
{
"name": "sebastian/comparator",
- "version": "2.1.3",
+ "version": "3.0.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
+ "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
- "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
+ "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
"shasum": ""
},
"require": {
- "php": "^7.0",
- "sebastian/diff": "^2.0 || ^3.0",
+ "php": "^7.1",
+ "sebastian/diff": "^3.0",
"sebastian/exporter": "^3.1"
},
"require-dev": {
- "phpunit/phpunit": "^6.4"
+ "phpunit/phpunit": "^7.1"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1.x-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -3419,7 +3723,7 @@
"compare",
"equality"
],
- "time": "2018-02-01T13:46:46+00:00"
+ "time": "2018-04-18T13:33:00+00:00"
},
{
"name": "sebastian/diff",
@@ -3968,7 +4272,9 @@
],
"aliases": [],
"minimum-stability": "dev",
- "stability-flags": [],
+ "stability-flags": {
+ "tymon/jwt-auth": 20
+ },
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
diff --git a/config/app.php b/config/app.php
index b16e7f7..3dc5bca 100644
--- a/config/app.php
+++ b/config/app.php
@@ -146,10 +146,10 @@ return [
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
-
/*
* Package Service Providers...
*/
+ Tymon\JWTAuth\Providers\LaravelServiceProvider::class,
/*
* Application Service Providers...
@@ -208,6 +208,8 @@ return [
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
+ 'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class,
+ 'JWTFactory' => Tymon\JWTAuth\Facades\JWTFactory::class,
],
diff --git a/data/mysql/auto.cnf b/data/mysql/auto.cnf
new file mode 100644
index 0000000..a425e35
--- /dev/null
+++ b/data/mysql/auto.cnf
@@ -0,0 +1,2 @@
+[auto]
+server-uuid=ff897b63-45fb-11e8-a5e1-0242ac120002
diff --git a/data/mysql/default/db.opt b/data/mysql/default/db.opt
new file mode 100644
index 0000000..4ed6015
--- /dev/null
+++ b/data/mysql/default/db.opt
@@ -0,0 +1,2 @@
+default-character-set=utf8
+default-collation=utf8_general_ci
diff --git a/data/mysql/default/migrations.frm b/data/mysql/default/migrations.frm
new file mode 100644
index 0000000..6da308a
Binary files /dev/null and b/data/mysql/default/migrations.frm differ
diff --git a/data/mysql/default/migrations.ibd b/data/mysql/default/migrations.ibd
new file mode 100644
index 0000000..255cfbf
Binary files /dev/null and b/data/mysql/default/migrations.ibd differ
diff --git a/data/mysql/default/password_resets.frm b/data/mysql/default/password_resets.frm
new file mode 100644
index 0000000..37a6eee
Binary files /dev/null and b/data/mysql/default/password_resets.frm differ
diff --git a/data/mysql/default/password_resets.ibd b/data/mysql/default/password_resets.ibd
new file mode 100644
index 0000000..999d31c
Binary files /dev/null and b/data/mysql/default/password_resets.ibd differ
diff --git a/data/mysql/default/user_verifications.frm b/data/mysql/default/user_verifications.frm
new file mode 100644
index 0000000..af307a1
Binary files /dev/null and b/data/mysql/default/user_verifications.frm differ
diff --git a/data/mysql/default/user_verifications.ibd b/data/mysql/default/user_verifications.ibd
new file mode 100644
index 0000000..55c62e6
Binary files /dev/null and b/data/mysql/default/user_verifications.ibd differ
diff --git a/data/mysql/default/users.frm b/data/mysql/default/users.frm
new file mode 100644
index 0000000..2cd2671
Binary files /dev/null and b/data/mysql/default/users.frm differ
diff --git a/data/mysql/default/users.ibd b/data/mysql/default/users.ibd
new file mode 100644
index 0000000..75e4613
Binary files /dev/null and b/data/mysql/default/users.ibd differ
diff --git a/data/mysql/ib_logfile0 b/data/mysql/ib_logfile0
new file mode 100644
index 0000000..d7c183a
Binary files /dev/null and b/data/mysql/ib_logfile0 differ
diff --git a/data/mysql/ib_logfile1 b/data/mysql/ib_logfile1
new file mode 100644
index 0000000..274bba0
Binary files /dev/null and b/data/mysql/ib_logfile1 differ
diff --git a/data/mysql/ibdata1 b/data/mysql/ibdata1
new file mode 100644
index 0000000..998da9d
Binary files /dev/null and b/data/mysql/ibdata1 differ
diff --git a/laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/404.html b/data/mysql/mysql/columns_priv.MYD
similarity index 100%
rename from laradock/DOCUMENTATION/themes/hugo-material-docs/layouts/404.html
rename to data/mysql/mysql/columns_priv.MYD
diff --git a/data/mysql/mysql/columns_priv.MYI b/data/mysql/mysql/columns_priv.MYI
new file mode 100644
index 0000000..efbc3d8
Binary files /dev/null and b/data/mysql/mysql/columns_priv.MYI differ
diff --git a/data/mysql/mysql/columns_priv.frm b/data/mysql/mysql/columns_priv.frm
new file mode 100644
index 0000000..0db4610
Binary files /dev/null and b/data/mysql/mysql/columns_priv.frm differ
diff --git a/data/mysql/mysql/db.MYD b/data/mysql/mysql/db.MYD
new file mode 100644
index 0000000..4eff705
--- /dev/null
+++ b/data/mysql/mysql/db.MYD
@@ -0,0 +1 @@
+% test % test\_% % default default
\ No newline at end of file
diff --git a/data/mysql/mysql/db.MYI b/data/mysql/mysql/db.MYI
new file mode 100644
index 0000000..f371954
Binary files /dev/null and b/data/mysql/mysql/db.MYI differ
diff --git a/data/mysql/mysql/db.frm b/data/mysql/mysql/db.frm
new file mode 100644
index 0000000..dd0803e
Binary files /dev/null and b/data/mysql/mysql/db.frm differ
diff --git a/laradock/certbot/letsencrypt/.gitkeep b/data/mysql/mysql/event.MYD
similarity index 100%
rename from laradock/certbot/letsencrypt/.gitkeep
rename to data/mysql/mysql/event.MYD
diff --git a/data/mysql/mysql/event.MYI b/data/mysql/mysql/event.MYI
new file mode 100644
index 0000000..c871ddc
Binary files /dev/null and b/data/mysql/mysql/event.MYI differ
diff --git a/data/mysql/mysql/event.frm b/data/mysql/mysql/event.frm
new file mode 100644
index 0000000..342ed98
Binary files /dev/null and b/data/mysql/mysql/event.frm differ
diff --git a/laradock/certbot/letsencrypt/.well-known/.gitkeep b/data/mysql/mysql/func.MYD
similarity index 100%
rename from laradock/certbot/letsencrypt/.well-known/.gitkeep
rename to data/mysql/mysql/func.MYD
diff --git a/data/mysql/mysql/func.MYI b/data/mysql/mysql/func.MYI
new file mode 100644
index 0000000..9a77c3c
Binary files /dev/null and b/data/mysql/mysql/func.MYI differ
diff --git a/data/mysql/mysql/func.frm b/data/mysql/mysql/func.frm
new file mode 100644
index 0000000..fb31a3c
Binary files /dev/null and b/data/mysql/mysql/func.frm differ
diff --git a/data/mysql/mysql/general_log.CSM b/data/mysql/mysql/general_log.CSM
new file mode 100644
index 0000000..8d08b8d
Binary files /dev/null and b/data/mysql/mysql/general_log.CSM differ
diff --git a/data/mysql/mysql/general_log.CSV b/data/mysql/mysql/general_log.CSV
new file mode 100644
index 0000000..e69de29
diff --git a/data/mysql/mysql/general_log.frm b/data/mysql/mysql/general_log.frm
new file mode 100644
index 0000000..e53350e
Binary files /dev/null and b/data/mysql/mysql/general_log.frm differ
diff --git a/data/mysql/mysql/help_category.MYD b/data/mysql/mysql/help_category.MYD
new file mode 100644
index 0000000..9af2446
Binary files /dev/null and b/data/mysql/mysql/help_category.MYD differ
diff --git a/data/mysql/mysql/help_category.MYI b/data/mysql/mysql/help_category.MYI
new file mode 100644
index 0000000..d270c23
Binary files /dev/null and b/data/mysql/mysql/help_category.MYI differ
diff --git a/data/mysql/mysql/help_category.frm b/data/mysql/mysql/help_category.frm
new file mode 100644
index 0000000..f769ea0
Binary files /dev/null and b/data/mysql/mysql/help_category.frm differ
diff --git a/data/mysql/mysql/help_keyword.MYD b/data/mysql/mysql/help_keyword.MYD
new file mode 100644
index 0000000..2f41ea4
Binary files /dev/null and b/data/mysql/mysql/help_keyword.MYD differ
diff --git a/data/mysql/mysql/help_keyword.MYI b/data/mysql/mysql/help_keyword.MYI
new file mode 100644
index 0000000..e2ed4d1
Binary files /dev/null and b/data/mysql/mysql/help_keyword.MYI differ
diff --git a/data/mysql/mysql/help_keyword.frm b/data/mysql/mysql/help_keyword.frm
new file mode 100644
index 0000000..999b370
Binary files /dev/null and b/data/mysql/mysql/help_keyword.frm differ
diff --git a/data/mysql/mysql/help_relation.MYD b/data/mysql/mysql/help_relation.MYD
new file mode 100644
index 0000000..65296e1
Binary files /dev/null and b/data/mysql/mysql/help_relation.MYD differ
diff --git a/data/mysql/mysql/help_relation.MYI b/data/mysql/mysql/help_relation.MYI
new file mode 100644
index 0000000..54b3f8a
Binary files /dev/null and b/data/mysql/mysql/help_relation.MYI differ
diff --git a/data/mysql/mysql/help_relation.frm b/data/mysql/mysql/help_relation.frm
new file mode 100644
index 0000000..9ac0a57
Binary files /dev/null and b/data/mysql/mysql/help_relation.frm differ
diff --git a/data/mysql/mysql/help_topic.MYD b/data/mysql/mysql/help_topic.MYD
new file mode 100644
index 0000000..8e69aa5
Binary files /dev/null and b/data/mysql/mysql/help_topic.MYD differ
diff --git a/data/mysql/mysql/help_topic.MYI b/data/mysql/mysql/help_topic.MYI
new file mode 100644
index 0000000..4d51703
Binary files /dev/null and b/data/mysql/mysql/help_topic.MYI differ
diff --git a/data/mysql/mysql/help_topic.frm b/data/mysql/mysql/help_topic.frm
new file mode 100644
index 0000000..0959b93
Binary files /dev/null and b/data/mysql/mysql/help_topic.frm differ
diff --git a/data/mysql/mysql/innodb_index_stats.frm b/data/mysql/mysql/innodb_index_stats.frm
new file mode 100644
index 0000000..2f49e19
Binary files /dev/null and b/data/mysql/mysql/innodb_index_stats.frm differ
diff --git a/data/mysql/mysql/innodb_index_stats.ibd b/data/mysql/mysql/innodb_index_stats.ibd
new file mode 100644
index 0000000..3340649
Binary files /dev/null and b/data/mysql/mysql/innodb_index_stats.ibd differ
diff --git a/data/mysql/mysql/innodb_table_stats.frm b/data/mysql/mysql/innodb_table_stats.frm
new file mode 100644
index 0000000..c642051
Binary files /dev/null and b/data/mysql/mysql/innodb_table_stats.frm differ
diff --git a/data/mysql/mysql/innodb_table_stats.ibd b/data/mysql/mysql/innodb_table_stats.ibd
new file mode 100644
index 0000000..cf6d773
Binary files /dev/null and b/data/mysql/mysql/innodb_table_stats.ibd differ
diff --git a/data/mysql/mysql/ndb_binlog_index.MYD b/data/mysql/mysql/ndb_binlog_index.MYD
new file mode 100644
index 0000000..e69de29
diff --git a/data/mysql/mysql/ndb_binlog_index.MYI b/data/mysql/mysql/ndb_binlog_index.MYI
new file mode 100644
index 0000000..170e8d2
Binary files /dev/null and b/data/mysql/mysql/ndb_binlog_index.MYI differ
diff --git a/data/mysql/mysql/ndb_binlog_index.frm b/data/mysql/mysql/ndb_binlog_index.frm
new file mode 100644
index 0000000..87d7af2
Binary files /dev/null and b/data/mysql/mysql/ndb_binlog_index.frm differ
diff --git a/data/mysql/mysql/plugin.MYD b/data/mysql/mysql/plugin.MYD
new file mode 100644
index 0000000..e69de29
diff --git a/data/mysql/mysql/plugin.MYI b/data/mysql/mysql/plugin.MYI
new file mode 100644
index 0000000..4260d04
Binary files /dev/null and b/data/mysql/mysql/plugin.MYI differ
diff --git a/data/mysql/mysql/plugin.frm b/data/mysql/mysql/plugin.frm
new file mode 100644
index 0000000..a784284
Binary files /dev/null and b/data/mysql/mysql/plugin.frm differ
diff --git a/data/mysql/mysql/proc.MYD b/data/mysql/mysql/proc.MYD
new file mode 100644
index 0000000..e69de29
diff --git a/data/mysql/mysql/proc.MYI b/data/mysql/mysql/proc.MYI
new file mode 100644
index 0000000..17c863b
Binary files /dev/null and b/data/mysql/mysql/proc.MYI differ
diff --git a/data/mysql/mysql/proc.frm b/data/mysql/mysql/proc.frm
new file mode 100644
index 0000000..671c542
Binary files /dev/null and b/data/mysql/mysql/proc.frm differ
diff --git a/data/mysql/mysql/procs_priv.MYD b/data/mysql/mysql/procs_priv.MYD
new file mode 100644
index 0000000..e69de29
diff --git a/data/mysql/mysql/procs_priv.MYI b/data/mysql/mysql/procs_priv.MYI
new file mode 100644
index 0000000..53b97a0
Binary files /dev/null and b/data/mysql/mysql/procs_priv.MYI differ
diff --git a/data/mysql/mysql/procs_priv.frm b/data/mysql/mysql/procs_priv.frm
new file mode 100644
index 0000000..c31a351
Binary files /dev/null and b/data/mysql/mysql/procs_priv.frm differ
diff --git a/data/mysql/mysql/proxies_priv.MYD b/data/mysql/mysql/proxies_priv.MYD
new file mode 100644
index 0000000..79e0fb5
--- /dev/null
+++ b/data/mysql/mysql/proxies_priv.MYD
@@ -0,0 +1 @@
+localhost root Z4e4506dd5b9b1 root Z4
\ No newline at end of file
diff --git a/data/mysql/mysql/proxies_priv.MYI b/data/mysql/mysql/proxies_priv.MYI
new file mode 100644
index 0000000..4353e83
Binary files /dev/null and b/data/mysql/mysql/proxies_priv.MYI differ
diff --git a/data/mysql/mysql/proxies_priv.frm b/data/mysql/mysql/proxies_priv.frm
new file mode 100644
index 0000000..6420bbf
Binary files /dev/null and b/data/mysql/mysql/proxies_priv.frm differ
diff --git a/data/mysql/mysql/servers.MYD b/data/mysql/mysql/servers.MYD
new file mode 100644
index 0000000..e69de29
diff --git a/data/mysql/mysql/servers.MYI b/data/mysql/mysql/servers.MYI
new file mode 100644
index 0000000..7df8811
Binary files /dev/null and b/data/mysql/mysql/servers.MYI differ
diff --git a/data/mysql/mysql/servers.frm b/data/mysql/mysql/servers.frm
new file mode 100644
index 0000000..556a331
Binary files /dev/null and b/data/mysql/mysql/servers.frm differ
diff --git a/data/mysql/mysql/slave_master_info.frm b/data/mysql/mysql/slave_master_info.frm
new file mode 100644
index 0000000..a66f1c2
Binary files /dev/null and b/data/mysql/mysql/slave_master_info.frm differ
diff --git a/data/mysql/mysql/slave_master_info.ibd b/data/mysql/mysql/slave_master_info.ibd
new file mode 100644
index 0000000..d34578c
Binary files /dev/null and b/data/mysql/mysql/slave_master_info.ibd differ
diff --git a/data/mysql/mysql/slave_relay_log_info.frm b/data/mysql/mysql/slave_relay_log_info.frm
new file mode 100644
index 0000000..20d9655
Binary files /dev/null and b/data/mysql/mysql/slave_relay_log_info.frm differ
diff --git a/data/mysql/mysql/slave_relay_log_info.ibd b/data/mysql/mysql/slave_relay_log_info.ibd
new file mode 100644
index 0000000..7b28689
Binary files /dev/null and b/data/mysql/mysql/slave_relay_log_info.ibd differ
diff --git a/data/mysql/mysql/slave_worker_info.frm b/data/mysql/mysql/slave_worker_info.frm
new file mode 100644
index 0000000..9b4610d
Binary files /dev/null and b/data/mysql/mysql/slave_worker_info.frm differ
diff --git a/data/mysql/mysql/slave_worker_info.ibd b/data/mysql/mysql/slave_worker_info.ibd
new file mode 100644
index 0000000..806a4a4
Binary files /dev/null and b/data/mysql/mysql/slave_worker_info.ibd differ
diff --git a/data/mysql/mysql/slow_log.CSM b/data/mysql/mysql/slow_log.CSM
new file mode 100644
index 0000000..8d08b8d
Binary files /dev/null and b/data/mysql/mysql/slow_log.CSM differ
diff --git a/data/mysql/mysql/slow_log.CSV b/data/mysql/mysql/slow_log.CSV
new file mode 100644
index 0000000..e69de29
diff --git a/data/mysql/mysql/slow_log.frm b/data/mysql/mysql/slow_log.frm
new file mode 100644
index 0000000..ff56097
Binary files /dev/null and b/data/mysql/mysql/slow_log.frm differ
diff --git a/data/mysql/mysql/tables_priv.MYD b/data/mysql/mysql/tables_priv.MYD
new file mode 100644
index 0000000..e69de29
diff --git a/data/mysql/mysql/tables_priv.MYI b/data/mysql/mysql/tables_priv.MYI
new file mode 100644
index 0000000..5f6525a
Binary files /dev/null and b/data/mysql/mysql/tables_priv.MYI differ
diff --git a/data/mysql/mysql/tables_priv.frm b/data/mysql/mysql/tables_priv.frm
new file mode 100644
index 0000000..828f188
Binary files /dev/null and b/data/mysql/mysql/tables_priv.frm differ
diff --git a/data/mysql/mysql/time_zone.MYD b/data/mysql/mysql/time_zone.MYD
new file mode 100644
index 0000000..54eb88f
Binary files /dev/null and b/data/mysql/mysql/time_zone.MYD differ
diff --git a/data/mysql/mysql/time_zone.MYI b/data/mysql/mysql/time_zone.MYI
new file mode 100644
index 0000000..3dca088
Binary files /dev/null and b/data/mysql/mysql/time_zone.MYI differ
diff --git a/data/mysql/mysql/time_zone.frm b/data/mysql/mysql/time_zone.frm
new file mode 100644
index 0000000..7bd62bc
Binary files /dev/null and b/data/mysql/mysql/time_zone.frm differ
diff --git a/data/mysql/mysql/time_zone_leap_second.MYD b/data/mysql/mysql/time_zone_leap_second.MYD
new file mode 100644
index 0000000..e69de29
diff --git a/data/mysql/mysql/time_zone_leap_second.MYI b/data/mysql/mysql/time_zone_leap_second.MYI
new file mode 100644
index 0000000..7b877b6
Binary files /dev/null and b/data/mysql/mysql/time_zone_leap_second.MYI differ
diff --git a/data/mysql/mysql/time_zone_leap_second.frm b/data/mysql/mysql/time_zone_leap_second.frm
new file mode 100644
index 0000000..f07f30e
Binary files /dev/null and b/data/mysql/mysql/time_zone_leap_second.frm differ
diff --git a/data/mysql/mysql/time_zone_name.MYD b/data/mysql/mysql/time_zone_name.MYD
new file mode 100644
index 0000000..3f510be
Binary files /dev/null and b/data/mysql/mysql/time_zone_name.MYD differ
diff --git a/data/mysql/mysql/time_zone_name.MYI b/data/mysql/mysql/time_zone_name.MYI
new file mode 100644
index 0000000..a9db986
Binary files /dev/null and b/data/mysql/mysql/time_zone_name.MYI differ
diff --git a/data/mysql/mysql/time_zone_name.frm b/data/mysql/mysql/time_zone_name.frm
new file mode 100644
index 0000000..25d8759
Binary files /dev/null and b/data/mysql/mysql/time_zone_name.frm differ
diff --git a/data/mysql/mysql/time_zone_transition.MYD b/data/mysql/mysql/time_zone_transition.MYD
new file mode 100644
index 0000000..d6929ad
Binary files /dev/null and b/data/mysql/mysql/time_zone_transition.MYD differ
diff --git a/data/mysql/mysql/time_zone_transition.MYI b/data/mysql/mysql/time_zone_transition.MYI
new file mode 100644
index 0000000..6f78781
Binary files /dev/null and b/data/mysql/mysql/time_zone_transition.MYI differ
diff --git a/data/mysql/mysql/time_zone_transition.frm b/data/mysql/mysql/time_zone_transition.frm
new file mode 100644
index 0000000..2e72fdc
Binary files /dev/null and b/data/mysql/mysql/time_zone_transition.frm differ
diff --git a/data/mysql/mysql/time_zone_transition_type.MYD b/data/mysql/mysql/time_zone_transition_type.MYD
new file mode 100644
index 0000000..00d11d1
Binary files /dev/null and b/data/mysql/mysql/time_zone_transition_type.MYD differ
diff --git a/data/mysql/mysql/time_zone_transition_type.MYI b/data/mysql/mysql/time_zone_transition_type.MYI
new file mode 100644
index 0000000..e172b0e
Binary files /dev/null and b/data/mysql/mysql/time_zone_transition_type.MYI differ
diff --git a/data/mysql/mysql/time_zone_transition_type.frm b/data/mysql/mysql/time_zone_transition_type.frm
new file mode 100644
index 0000000..83e5828
Binary files /dev/null and b/data/mysql/mysql/time_zone_transition_type.frm differ
diff --git a/data/mysql/mysql/user.MYD b/data/mysql/mysql/user.MYD
new file mode 100644
index 0000000..adf534e
Binary files /dev/null and b/data/mysql/mysql/user.MYD differ
diff --git a/data/mysql/mysql/user.MYI b/data/mysql/mysql/user.MYI
new file mode 100644
index 0000000..996b335
Binary files /dev/null and b/data/mysql/mysql/user.MYI differ
diff --git a/data/mysql/mysql/user.frm b/data/mysql/mysql/user.frm
new file mode 100644
index 0000000..a96aa11
Binary files /dev/null and b/data/mysql/mysql/user.frm differ
diff --git a/data/mysql/performance_schema/accounts.frm b/data/mysql/performance_schema/accounts.frm
new file mode 100644
index 0000000..9a30736
Binary files /dev/null and b/data/mysql/performance_schema/accounts.frm differ
diff --git a/data/mysql/performance_schema/cond_instances.frm b/data/mysql/performance_schema/cond_instances.frm
new file mode 100644
index 0000000..079acd1
Binary files /dev/null and b/data/mysql/performance_schema/cond_instances.frm differ
diff --git a/data/mysql/performance_schema/db.opt b/data/mysql/performance_schema/db.opt
new file mode 100644
index 0000000..4ed6015
--- /dev/null
+++ b/data/mysql/performance_schema/db.opt
@@ -0,0 +1,2 @@
+default-character-set=utf8
+default-collation=utf8_general_ci
diff --git a/data/mysql/performance_schema/events_stages_current.frm b/data/mysql/performance_schema/events_stages_current.frm
new file mode 100644
index 0000000..daf2d5c
Binary files /dev/null and b/data/mysql/performance_schema/events_stages_current.frm differ
diff --git a/data/mysql/performance_schema/events_stages_history.frm b/data/mysql/performance_schema/events_stages_history.frm
new file mode 100644
index 0000000..daf2d5c
Binary files /dev/null and b/data/mysql/performance_schema/events_stages_history.frm differ
diff --git a/data/mysql/performance_schema/events_stages_history_long.frm b/data/mysql/performance_schema/events_stages_history_long.frm
new file mode 100644
index 0000000..daf2d5c
Binary files /dev/null and b/data/mysql/performance_schema/events_stages_history_long.frm differ
diff --git a/data/mysql/performance_schema/events_stages_summary_by_account_by_event_name.frm b/data/mysql/performance_schema/events_stages_summary_by_account_by_event_name.frm
new file mode 100644
index 0000000..61e7d94
Binary files /dev/null and b/data/mysql/performance_schema/events_stages_summary_by_account_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_stages_summary_by_host_by_event_name.frm b/data/mysql/performance_schema/events_stages_summary_by_host_by_event_name.frm
new file mode 100644
index 0000000..40741ca
Binary files /dev/null and b/data/mysql/performance_schema/events_stages_summary_by_host_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_stages_summary_by_thread_by_event_name.frm b/data/mysql/performance_schema/events_stages_summary_by_thread_by_event_name.frm
new file mode 100644
index 0000000..3aed7bc
Binary files /dev/null and b/data/mysql/performance_schema/events_stages_summary_by_thread_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_stages_summary_by_user_by_event_name.frm b/data/mysql/performance_schema/events_stages_summary_by_user_by_event_name.frm
new file mode 100644
index 0000000..544d1a0
Binary files /dev/null and b/data/mysql/performance_schema/events_stages_summary_by_user_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_stages_summary_global_by_event_name.frm b/data/mysql/performance_schema/events_stages_summary_global_by_event_name.frm
new file mode 100644
index 0000000..d207d22
Binary files /dev/null and b/data/mysql/performance_schema/events_stages_summary_global_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_statements_current.frm b/data/mysql/performance_schema/events_statements_current.frm
new file mode 100644
index 0000000..81c2c1c
Binary files /dev/null and b/data/mysql/performance_schema/events_statements_current.frm differ
diff --git a/data/mysql/performance_schema/events_statements_history.frm b/data/mysql/performance_schema/events_statements_history.frm
new file mode 100644
index 0000000..81c2c1c
Binary files /dev/null and b/data/mysql/performance_schema/events_statements_history.frm differ
diff --git a/data/mysql/performance_schema/events_statements_history_long.frm b/data/mysql/performance_schema/events_statements_history_long.frm
new file mode 100644
index 0000000..81c2c1c
Binary files /dev/null and b/data/mysql/performance_schema/events_statements_history_long.frm differ
diff --git a/data/mysql/performance_schema/events_statements_summary_by_account_by_event_name.frm b/data/mysql/performance_schema/events_statements_summary_by_account_by_event_name.frm
new file mode 100644
index 0000000..f56b74a
Binary files /dev/null and b/data/mysql/performance_schema/events_statements_summary_by_account_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_statements_summary_by_digest.frm b/data/mysql/performance_schema/events_statements_summary_by_digest.frm
new file mode 100644
index 0000000..ea8e027
Binary files /dev/null and b/data/mysql/performance_schema/events_statements_summary_by_digest.frm differ
diff --git a/data/mysql/performance_schema/events_statements_summary_by_host_by_event_name.frm b/data/mysql/performance_schema/events_statements_summary_by_host_by_event_name.frm
new file mode 100644
index 0000000..dedc38b
Binary files /dev/null and b/data/mysql/performance_schema/events_statements_summary_by_host_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_statements_summary_by_thread_by_event_name.frm b/data/mysql/performance_schema/events_statements_summary_by_thread_by_event_name.frm
new file mode 100644
index 0000000..77aa9f2
Binary files /dev/null and b/data/mysql/performance_schema/events_statements_summary_by_thread_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_statements_summary_by_user_by_event_name.frm b/data/mysql/performance_schema/events_statements_summary_by_user_by_event_name.frm
new file mode 100644
index 0000000..51f69e6
Binary files /dev/null and b/data/mysql/performance_schema/events_statements_summary_by_user_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_statements_summary_global_by_event_name.frm b/data/mysql/performance_schema/events_statements_summary_global_by_event_name.frm
new file mode 100644
index 0000000..8719392
Binary files /dev/null and b/data/mysql/performance_schema/events_statements_summary_global_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_waits_current.frm b/data/mysql/performance_schema/events_waits_current.frm
new file mode 100644
index 0000000..a2430ec
Binary files /dev/null and b/data/mysql/performance_schema/events_waits_current.frm differ
diff --git a/data/mysql/performance_schema/events_waits_history.frm b/data/mysql/performance_schema/events_waits_history.frm
new file mode 100644
index 0000000..a2430ec
Binary files /dev/null and b/data/mysql/performance_schema/events_waits_history.frm differ
diff --git a/data/mysql/performance_schema/events_waits_history_long.frm b/data/mysql/performance_schema/events_waits_history_long.frm
new file mode 100644
index 0000000..a2430ec
Binary files /dev/null and b/data/mysql/performance_schema/events_waits_history_long.frm differ
diff --git a/data/mysql/performance_schema/events_waits_summary_by_account_by_event_name.frm b/data/mysql/performance_schema/events_waits_summary_by_account_by_event_name.frm
new file mode 100644
index 0000000..61e7d94
Binary files /dev/null and b/data/mysql/performance_schema/events_waits_summary_by_account_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_waits_summary_by_host_by_event_name.frm b/data/mysql/performance_schema/events_waits_summary_by_host_by_event_name.frm
new file mode 100644
index 0000000..40741ca
Binary files /dev/null and b/data/mysql/performance_schema/events_waits_summary_by_host_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_waits_summary_by_instance.frm b/data/mysql/performance_schema/events_waits_summary_by_instance.frm
new file mode 100644
index 0000000..0b8b599
Binary files /dev/null and b/data/mysql/performance_schema/events_waits_summary_by_instance.frm differ
diff --git a/data/mysql/performance_schema/events_waits_summary_by_thread_by_event_name.frm b/data/mysql/performance_schema/events_waits_summary_by_thread_by_event_name.frm
new file mode 100644
index 0000000..3aed7bc
Binary files /dev/null and b/data/mysql/performance_schema/events_waits_summary_by_thread_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_waits_summary_by_user_by_event_name.frm b/data/mysql/performance_schema/events_waits_summary_by_user_by_event_name.frm
new file mode 100644
index 0000000..544d1a0
Binary files /dev/null and b/data/mysql/performance_schema/events_waits_summary_by_user_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/events_waits_summary_global_by_event_name.frm b/data/mysql/performance_schema/events_waits_summary_global_by_event_name.frm
new file mode 100644
index 0000000..d207d22
Binary files /dev/null and b/data/mysql/performance_schema/events_waits_summary_global_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/file_instances.frm b/data/mysql/performance_schema/file_instances.frm
new file mode 100644
index 0000000..437a96c
Binary files /dev/null and b/data/mysql/performance_schema/file_instances.frm differ
diff --git a/data/mysql/performance_schema/file_summary_by_event_name.frm b/data/mysql/performance_schema/file_summary_by_event_name.frm
new file mode 100644
index 0000000..8ad5a96
Binary files /dev/null and b/data/mysql/performance_schema/file_summary_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/file_summary_by_instance.frm b/data/mysql/performance_schema/file_summary_by_instance.frm
new file mode 100644
index 0000000..3b51a2b
Binary files /dev/null and b/data/mysql/performance_schema/file_summary_by_instance.frm differ
diff --git a/data/mysql/performance_schema/host_cache.frm b/data/mysql/performance_schema/host_cache.frm
new file mode 100644
index 0000000..5984e01
Binary files /dev/null and b/data/mysql/performance_schema/host_cache.frm differ
diff --git a/data/mysql/performance_schema/hosts.frm b/data/mysql/performance_schema/hosts.frm
new file mode 100644
index 0000000..d4801c9
Binary files /dev/null and b/data/mysql/performance_schema/hosts.frm differ
diff --git a/data/mysql/performance_schema/mutex_instances.frm b/data/mysql/performance_schema/mutex_instances.frm
new file mode 100644
index 0000000..bbf7f1e
Binary files /dev/null and b/data/mysql/performance_schema/mutex_instances.frm differ
diff --git a/data/mysql/performance_schema/objects_summary_global_by_type.frm b/data/mysql/performance_schema/objects_summary_global_by_type.frm
new file mode 100644
index 0000000..18dcc41
Binary files /dev/null and b/data/mysql/performance_schema/objects_summary_global_by_type.frm differ
diff --git a/data/mysql/performance_schema/performance_timers.frm b/data/mysql/performance_schema/performance_timers.frm
new file mode 100644
index 0000000..7c90b57
Binary files /dev/null and b/data/mysql/performance_schema/performance_timers.frm differ
diff --git a/data/mysql/performance_schema/rwlock_instances.frm b/data/mysql/performance_schema/rwlock_instances.frm
new file mode 100644
index 0000000..cf86c45
Binary files /dev/null and b/data/mysql/performance_schema/rwlock_instances.frm differ
diff --git a/data/mysql/performance_schema/session_account_connect_attrs.frm b/data/mysql/performance_schema/session_account_connect_attrs.frm
new file mode 100644
index 0000000..153b54f
Binary files /dev/null and b/data/mysql/performance_schema/session_account_connect_attrs.frm differ
diff --git a/data/mysql/performance_schema/session_connect_attrs.frm b/data/mysql/performance_schema/session_connect_attrs.frm
new file mode 100644
index 0000000..b4208ec
Binary files /dev/null and b/data/mysql/performance_schema/session_connect_attrs.frm differ
diff --git a/data/mysql/performance_schema/setup_actors.frm b/data/mysql/performance_schema/setup_actors.frm
new file mode 100644
index 0000000..ff88491
Binary files /dev/null and b/data/mysql/performance_schema/setup_actors.frm differ
diff --git a/data/mysql/performance_schema/setup_consumers.frm b/data/mysql/performance_schema/setup_consumers.frm
new file mode 100644
index 0000000..7e8fc08
Binary files /dev/null and b/data/mysql/performance_schema/setup_consumers.frm differ
diff --git a/data/mysql/performance_schema/setup_instruments.frm b/data/mysql/performance_schema/setup_instruments.frm
new file mode 100644
index 0000000..10669af
Binary files /dev/null and b/data/mysql/performance_schema/setup_instruments.frm differ
diff --git a/data/mysql/performance_schema/setup_objects.frm b/data/mysql/performance_schema/setup_objects.frm
new file mode 100644
index 0000000..cc0dd16
Binary files /dev/null and b/data/mysql/performance_schema/setup_objects.frm differ
diff --git a/data/mysql/performance_schema/setup_timers.frm b/data/mysql/performance_schema/setup_timers.frm
new file mode 100644
index 0000000..ced9dd6
Binary files /dev/null and b/data/mysql/performance_schema/setup_timers.frm differ
diff --git a/data/mysql/performance_schema/socket_instances.frm b/data/mysql/performance_schema/socket_instances.frm
new file mode 100644
index 0000000..26aa0ab
Binary files /dev/null and b/data/mysql/performance_schema/socket_instances.frm differ
diff --git a/data/mysql/performance_schema/socket_summary_by_event_name.frm b/data/mysql/performance_schema/socket_summary_by_event_name.frm
new file mode 100644
index 0000000..fb3cd4e
Binary files /dev/null and b/data/mysql/performance_schema/socket_summary_by_event_name.frm differ
diff --git a/data/mysql/performance_schema/socket_summary_by_instance.frm b/data/mysql/performance_schema/socket_summary_by_instance.frm
new file mode 100644
index 0000000..1be56a6
Binary files /dev/null and b/data/mysql/performance_schema/socket_summary_by_instance.frm differ
diff --git a/data/mysql/performance_schema/table_io_waits_summary_by_index_usage.frm b/data/mysql/performance_schema/table_io_waits_summary_by_index_usage.frm
new file mode 100644
index 0000000..a386460
Binary files /dev/null and b/data/mysql/performance_schema/table_io_waits_summary_by_index_usage.frm differ
diff --git a/data/mysql/performance_schema/table_io_waits_summary_by_table.frm b/data/mysql/performance_schema/table_io_waits_summary_by_table.frm
new file mode 100644
index 0000000..ef24530
Binary files /dev/null and b/data/mysql/performance_schema/table_io_waits_summary_by_table.frm differ
diff --git a/data/mysql/performance_schema/table_lock_waits_summary_by_table.frm b/data/mysql/performance_schema/table_lock_waits_summary_by_table.frm
new file mode 100644
index 0000000..dbe88e0
Binary files /dev/null and b/data/mysql/performance_schema/table_lock_waits_summary_by_table.frm differ
diff --git a/data/mysql/performance_schema/threads.frm b/data/mysql/performance_schema/threads.frm
new file mode 100644
index 0000000..ec4e2e2
Binary files /dev/null and b/data/mysql/performance_schema/threads.frm differ
diff --git a/data/mysql/performance_schema/users.frm b/data/mysql/performance_schema/users.frm
new file mode 100644
index 0000000..edcef6f
Binary files /dev/null and b/data/mysql/performance_schema/users.frm differ
diff --git a/database/migrations/2018_04_22_080323_create_user_verifications_table.php b/database/migrations/2018_04_22_080323_create_user_verifications_table.php
new file mode 100644
index 0000000..216feb5
--- /dev/null
+++ b/database/migrations/2018_04_22_080323_create_user_verifications_table.php
@@ -0,0 +1,39 @@
+increments('id');
+ $table->integer('user_id')->unsigned();
+ $table->string('token');
+ $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+ });
+ Schema::table('users', function (Blueprint $table) {
+ $table->boolean('is_verified')->default(0);
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists("user_verifications");
+ Schema::table('users', function (Blueprint $table) {
+ $table->dropColumn('is_verified');
+ });
+ }
+}
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..1def6b5
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,42 @@
+version: '2'
+services:
+ app:
+ build: .
+ ports:
+ - "8000:8000"
+ volumes:
+ - .:/app
+ env_file: .env
+ working_dir: /app
+ command: bash -c 'php artisan migrate && php artisan serve --host 0.0.0.0'
+ depends_on:
+ - mysql
+ links:
+ - mysql
+ mysql:
+ build:
+ context: ./docker/mysql
+ args:
+ - MYSQL_VERSION=5.6
+ environment:
+ - MYSQL_DATABASE=default
+ - MYSQL_USER=default
+ - MYSQL_PASSWORD=secret
+ - MYSQL_ROOT_PASSWORD=root
+ - TZ=UTC
+ volumes:
+ - ./data/mysql:/var/lib/mysql
+ - ./docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+ ports:
+ - "3306:3306"
+
+ phpmyadmin:
+ depends_on:
+ - mysql
+ image: phpmyadmin/phpmyadmin
+ restart: always
+ ports:
+ - 8090:80
+ environment:
+ PMA_HOST: mysql
+ MYSQL_ROOT_PASSWORD: root
\ No newline at end of file
diff --git a/laradock/mysql/Dockerfile b/docker/mysql/Dockerfile
similarity index 100%
rename from laradock/mysql/Dockerfile
rename to docker/mysql/Dockerfile
diff --git a/laradock/mariadb/docker-entrypoint-initdb.d/.gitignore b/docker/mysql/docker-entrypoint-initdb.d/.gitignore
similarity index 100%
rename from laradock/mariadb/docker-entrypoint-initdb.d/.gitignore
rename to docker/mysql/docker-entrypoint-initdb.d/.gitignore
diff --git a/laradock/mysql/docker-entrypoint-initdb.d/createdb.sql.example b/docker/mysql/docker-entrypoint-initdb.d/createdb.sql.example
similarity index 100%
rename from laradock/mysql/docker-entrypoint-initdb.d/createdb.sql.example
rename to docker/mysql/docker-entrypoint-initdb.d/createdb.sql.example
diff --git a/laradock/mysql/my.cnf b/docker/mysql/my.cnf
similarity index 100%
rename from laradock/mysql/my.cnf
rename to docker/mysql/my.cnf
diff --git a/laradock/.editorconfig b/laradock/.editorconfig
deleted file mode 100644
index 9a397cf..0000000
--- a/laradock/.editorconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-[*]
-charset = utf-8
-
-[{Dockerfile,docker-compose.yml}]
-indent_style = space
-indent_size = 2
diff --git a/laradock/.github/CODE_OF_CONDUCT.md b/laradock/.github/CODE_OF_CONDUCT.md
deleted file mode 100644
index 8359c58..0000000
--- a/laradock/.github/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mahmoud@zalt.me. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/laradock/.github/CONTRIBUTING.md b/laradock/.github/CONTRIBUTING.md
deleted file mode 100644
index 7d5865b..0000000
--- a/laradock/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### First off, thanks for taking the time to contribute!
-
-For the contribution guide [click here](http://laradock.io/contributing/).
diff --git a/laradock/.github/ISSUE_TEMPLATE.md b/laradock/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index eff16ef..0000000
--- a/laradock/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,23 +0,0 @@
-### Info:
-- Docker version (`$ docker --version`):
-- Laradock commit (`$ git rev-parse HEAD`):
-- System info (Mac, PC, Linux):
-- System info disto/version:
-
-### Issue:
-
-_____
-
-### Expected behavior:
-
-_____
-
-### Reproduce:
-
-_____
-
-### Relevant Code:
-
-```
-// place a code sample here
-```
diff --git a/laradock/.github/PULL_REQUEST_TEMPLATE.md b/laradock/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 9160f01..0000000
--- a/laradock/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-##### I completed the 3 steps below:
-
-- [] I've read the [Contribution Guide](http://laradock.io/contributing).
-- [] I've updated the **documentation**. (refer to [this](http://laradock.io/contributing/#update-the-documentation-site) for how to do so).
-- [] I enjoyed my time contributing and making developer's life easier :)
diff --git a/laradock/.github/README-zh.md b/laradock/.github/README-zh.md
deleted file mode 100644
index e50794b..0000000
--- a/laradock/.github/README-zh.md
+++ /dev/null
@@ -1,817 +0,0 @@
-# Laradock
-
-[](http://zalt.me)
-
-[](https://gitter.im/Laradock/laradock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-
-Laradock 能够帮你在 **Docker** 上快速搭建 **Laravel** 应用。
-
-就像 Laravel Homestead 一样,但是 Docker 替换了 Vagrant。
-
-> 先在使用 Laradock,然后再学习它们。
-
-## 目录
-- [Intro](#Intro)
- - [Features](#features)
- - [Supported Software's](#Supported-Containers)
- - [What is Docker](#what-is-docker)
- - [What is Laravel](#what-is-laravel)
- - [Why Docker not Vagrant](#why-docker-not-vagrant)
- - [Laradock VS Homestead](#laradock-vs-homestead)
-- [Demo Video](#Demo)
-- [Requirements](#Requirements)
-- [Installation](#Installation)
-- [Usage](#Usage)
-- [Documentation](#Documentation)
- - [Docker](#Docker)
- - [List current running Containers](#List-current-running-Containers)
- - [Close all running Containers](#Close-all-running-Containers)
- - [Delete all existing Containers](#Delete-all-existing-Containers)
- - [Enter a Container (SSH into a running Container)](#Enter-Container)
- - [Edit default container configuration](#Edit-Container)
- - [Edit a Docker Image](#Edit-a-Docker-Image)
- - [Build/Re-build Containers](#Build-Re-build-Containers)
- - [Add more Software's (Docker Images)](#Add-Docker-Images)
- - [View the Log files](#View-the-Log-files)
- - [Laravel](#Laravel):
- - [Install Laravel from a Docker Container](#Install-Laravel)
- - [Run Artisan Commands](#Run-Artisan-Commands)
- - [Use Redis](#Use-Redis)
- - [Use Mongo](#Use-Mongo)
- - [PHP](#PHP)
- - [Install PHP Extensions](#Install-PHP-Extensions)
- - [Change the PHP-FPM Version](#Change-the-PHP-FPM-Version)
- - [Change the PHP-CLI Version](#Change-the-PHP-CLI-Version)
- - [Install xDebug](#Install-xDebug)
- - [Misc](#Misc)
- - [Use custom Domain](#Use-custom-Domain)
- - [Enable Global Composer Build Install](#Enable-Global-Composer-Build-Install)
- - [Install Prestissimo](#Install-Prestissimo)
- - [Install Node + NVM](#Install-Node)
- - [Debugging](#debugging)
- - [Upgrading Laradock](#upgrading-laradock)
-- [Help & Questions](#Help)
-
-
-
-## 介绍
-
-Laradock 努力简化创建开发环境过程。
-它包含预包装 Docker 镜像,提供你一个美妙的开发环境而不需要安装 PHP, NGINX, MySQL 和其他任何软件在你本地机器上。
-
-**使用概览:**
-
-让我们了解使用它安装 `NGINX`, `PHP`, `Composer`, `MySQL` 和 `Redis`,然后运行 `Laravel`
-
-1. 将 Laradock 放到你的 Laravel 项目中:
-```bash
-git clone https://github.com/laradock/laradock.git
-```
-
-2. 进入 Laradock 目录
- ```bash
-cp env-example .env
-```
-
-3. 运行这些容器。
-```bash
-docker-compose up -d nginx mysql redis
-```
-
-4. 打开你的Laravel 项目的 `.env` 文件,然后设置 `mysql` 的 `DB_HOST` 和 `redis` 的`REDIS_HOST`。
-
-5. 打开浏览器,访问 localhost:
-
-
-### 特点
-
-- 在 PHP 版本:7.0,5.6.5.5...之中可以简单切换。
-- 可选择你最喜欢的数据库引擎,比如:MySQL, Postgres, MariaDB...
-- 可运行自己的软件组合,比如:Memcached, HHVM, Beanstalkd...
-- 所有软件运行在不同的容器之中,比如:PHP-FPM, NGINX, PHP-CLI...
-- 通过简单的编写 `Dockerfile` 容易定制任何容器。
-- 所有镜像继承自一个官方基础镜像(Trusted base Images)
-- 可预配置Laravel的Nginx环境
-- 容易应用容器中的配置 配置文件(`Dockerfile`)
-- 最新的 Docker Compose 版本(`docker-compose`)
-- 所有的都是可视化和可编辑的
-- 快速的镜像构建
-- 每周都会有更新...
-
-
-### 支持的软件 (容器)
-
-- **数据库引擎:**
- - MySQL
- - PostgreSQL
- - MariaDB
- - MongoDB
- - Neo4j
-- **缓存引擎:**
- - Redis
- - Memcached
-- **PHP 服务器:**
- - NGINX
- - Apache2
- - Caddy
-- **PHP 编译工具:**
- - PHP-FPM
- - HHVM
-- **消息队列系统:**
- - Beanstalkd (+ Beanstalkd Console)
-- **工具:**
- - Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...)
-
->如果你找不到你需要的软件,构建它然后把它添加到这个列表。你的贡献是受欢迎的。
-
-
-### Docker 是什么?
-
-[Docker](https://www.docker.com) 是一个开源项目,自动化部署应用程序软件的容器,在 Linux, Mac OS and Windows 提供一个额外的抽象层和自动化的[操作系统级的虚拟化](https://en.wikipedia.org/wiki/Operating-system-level_virtualization)
-
-
-### Laravel 是什么?
-
-额,这很认真的!!!
-
-
-### 为什么使用 Docker 而不是 Vagrant!?
-
-[Vagrant](https://www.vagrantup.com) 构建虚拟机需要几分钟然而 Docker 构建虚拟容器只需要几秒钟。
-而不是提供一个完整的虚拟机,就像你用 Vagrant, Docker 为您提供**轻量级**虚拟容器,共享相同的内核和允许安全执行独立的进程。
-
-除了速度, Docker 提供大量的 Vagrant 无法实现的功能。
-
-最重要的是 Docker 可以运行在开发和生产(相同环境无处不在)。Vagrant 是专为开发,(所以在生产环境你必须每一次重建您的服务器)。
-
-
-### Laradock Homestead 对比
-
-Laradock and [Homestead](https://laravel.com/docs/master/homestead) 给你一个完整的虚拟开发环境。(不需要安装和配置软件在你自己的每一个操作系统)。
-
-Homestead 是一个工具,为你控制虚拟机(使用 Homestead 特殊命令)。Vagrant 可以管理你的管理虚容器。
-
-运行一个虚拟容器比运行一整个虚拟机快多了 **Laradock 比 Homestead 快多了**
-
-
-## 演示视频
-还有什么比**演示视频**好:
-
-- Laradock [v4.0](https://www.youtube.com/watch?v=TQii1jDa96Y)
-- Laradock [v2.2](https://www.youtube.com/watch?v=-DamFMczwDA)
-- Laradock [v0.3](https://www.youtube.com/watch?v=jGkyO6Is_aI)
-- Laradock [v0.1](https://www.youtube.com/watch?v=3YQsHe6oF80)
-
-
-## 依赖
-
-- [Git](https://git-scm.com/downloads)
-- [Docker](https://www.docker.com/products/docker/)
-
-
-## 安装
-
-1 - 克隆 `Laradock` 仓库:
-
-**A)** 如果你已经有一个 Laravel 项目,克隆这个仓库在到 `Laravel` 根目录
-
-```bash
-git submodule add https://github.com/laradock/laradock.git
-```
-
->如果你不是使用 Git 管理 Laravel 项目,您可以使用 `git clone` 而不是 `git submodule`。
-
-**B)** 如果你没有一个 Laravel 项目,你想 Docker 安装 Laravel,克隆这个源在您的机器任何地方上:
-
-```bash
-git clone https://github.com/laradock/laradock.git
-```
-
-
-## 使用
-
-**请在开始之前阅读:**
-如果你正在使用 **Docker Toolbox** (VM),选择以下任何一个方法:
-- 更新到 Docker [Native](https://www.docker.com/products/docker) Mac/Windows 版本 (建议). 查看 [Upgrading Laradock](#upgrading-laradock)
-- 使用 Laradock v3.* (访问 `Laradock-ToolBox` [分支](https://github.com/laradock/laradock/tree/Laradock-ToolBox)).
-如果您使用的是 **Docker Native**(Mac / Windows 版本)甚至是 Linux 版本,通常可以继续阅读这个文档,Laradock v4 以上版本将仅支持 **Docker Native**。
-
-1 - 运行容器: *(在运行 `docker-compose` 命令之前,确认你在 `laradock` 目录中*
-
-**例子:** 运行 NGINX 和 MySQL:
-
-```bash
-docker-compose up -d nginx mysql
-```
-你可以从以下列表选择你自己的容器组合:
-
-`nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `workspace`.
-
-**说明**: `workspace` 和 `php-fpm` 将运行在大部分实例中, 所以不需要在 `up` 命令中加上它们.
-
-2 - 进入 Workspace 容器, 执行像 (Artisan, Composer, PHPUnit, Gulp, ...)等命令
-
-```bash
-docker-compose exec workspace bash
-```
-
-增加 `--user=laradock` (例如 `docker-compose exec --user=laradock workspace bash`) 作为您的主机的用户创建的文件. (你可以从 `docker-compose.yml`修改 PUID (User id) 和 PGID (group id) 值 ).
-
-3 - 编辑 Laravel 的配置.
-
-如果你还没有安装 Laravel 项目,请查看 [How to Install Laravel in a Docker Container](#Install-Laravel).
-
-打开 Laravel 的 `.env` 文件 然后 配置 你的 `mysql` 的 `DB_HOST`:
-
-```env
-DB_HOST=mysql
-```
-
-4 - 打开浏览器访问 localhost (`http://localhost/`).
-
-**调试**: 如果你碰到任何问题,请查看 [调试](#debugging) 章节
-如果你需要特别支持,请联系我,更多细节在[帮助 & 问题](#Help)章节
-
-
-## 文档
-
-
-### [Docker]
-
-
-### 列出正在运行的容器
-```bash
-docker ps
-```
-
-你也可以使用以下命令查看某项目的容器
-```bash
-docker-compose ps
-```
-
-
-### 关闭所有容器
-```bash
-docker-compose stop
-```
-
-停止某个容器:
-
-```bash
-docker-compose stop {容器名称}
-```
-
-
-### 删除所有容器
-```bash
-docker-compose down
-```
-
-小心这个命令,因为它也会删除你的数据容器。(如果你想保留你的数据你应该在上述命令后列出容器名称删除每个容器本身):*
-
-
-### 进入容器 (通过 SSH 进入一个运行中的容器)
-
-1 - 首先使用 `docker ps` 命令查看正在运行的容器
-
-2 - 进入某个容器使用:
-
-```bash
-docker-compose exec {container-name} bash
-```
-
-*例如: 进入 MySQL 容器*
-
-```bash
-docker-compose exec mysql bash
-```
-
-3 - 退出容器, 键入 `exit`.
-
-
-
-### 编辑默认容器配置
-打开 `docker-compose.yml` 然后 按照你想的修改.
-
-例如:
-
-修改 MySQL 数据库名称:
-
-```yml
- environment:
- MYSQL_DATABASE: laradock
-```
-
-修改 Redis 默认端口为 1111:
-
-```yml
- ports:
- - "1111:6379"
-```
-
-
-### 编辑 Docker 镜像
-
-1 - 找到你想修改的镜像的 `Dockerfile` ,
-
-例如: `mysql` 在 `mysql/Dockerfile`.
-
-2 - 按你所要的编辑文件.
-
-3 - 重新构建容器:
-
-```bash
-docker-compose build mysql
-```
-
-更多信息在容器重建中[点击这里](#Build-Re-build-Containers).
-
-
-### 建立/重建容器
-
-如果你做任何改变 `Dockerfile` 确保你运行这个命令,可以让所有修改更改生效:
-
-```bash
-docker-compose build
-```
-
-选择你可以指定哪个容器重建(而不是重建所有的容器):
-
-```bash
-docker-compose build {container-name}
-```
-
-如果你想重建整个容器,你可能需要使用 `--no-cache` 选项 (`docker-compose build --no-cache {container-name}`).
-
-
-### 增加更多软件 (Docker 镜像)
-
-为了增加镜像(软件), 编辑 `docker-compose.yml` 添加容器细节, 你需要熟悉 [docker compose 文件语法](https://docs.docker.com/compose/compose-file/).
-
-
-### 查看日志文件
-Nginx的日志在 `logs/nginx` 目录
-
-然后查看其它容器日志(MySQL, PHP-FPM,...) 你可以运行:
-
-```bash
-docker logs {container-name}
-```
-
-
-### [Laravel]
-
-
-### 从 Docker 镜像安装 Laravel
-
-1 - 首先你需要进入 Workspace 容器.
-
-2 - 安装 Laravel.
-
-例如 使用 Composer
-
-```bash
-composer create-project laravel/laravel my-cool-app "5.2.*"
-```
-
-> 我们建议使用 `composer create-project` 替换 Laravel 安装器去安装 Laravel.
-
-关于更多 Laravel 安装内容请 [点击这儿](https://laravel.com/docs/master#installing-laravel).
-
-
-3 - 编辑 `docker-compose.yml` 映射新的应用目录:
-系统默认 Laradock 假定 Laravel 应用在 laradock 的父级目录中
-
-更新 Laravel 应用在 `my-cool-app` 目录中, 我们需要用 `../my-cool-app/:/var/www`替换 `../:/var/www` , 如下:
-
-```yaml
- application:
- build: ./application
- volumes:
- - ../my-cool-app/:/var/www
-```
-
-4 - 进入目录下继续工作..
-
-```bash
-cd my-cool-app
-```
-
-5 - 回到 Laradock 安装步骤,看看如何编辑 `.env` 的文件。
-
-
-### 运行 Artisan 命令
-
-你可以从 Workspace 容器运行 artisan 命令和其他终端命令
-
-1 - 确认 Workspace 容器已经运行.
-
-```bash
-docker-compose up -d workspace // ..and all your other containers
-```
-
-2 - 找到 Workspace 容器名称:
-
-```bash
-docker-compose ps
-```
-
-3 - 进入 Workspace 容器:
-
-```bash
-docker-compose exec workspace bash
-```
-
-增加 `--user=laradock` (例如 `docker-compose exec --user=laradock workspace bash`) 作为您的主机的用户创建的文件.
-
-4 - 运行任何你想的 :)
-
-```bash
-php artisan
-```
-```bash
-composer update
-```
-```bash
-phpunit
-```
-
-
-### 使用 Redis
-1 - 首先务必用 `docker-compose up` 命令运行 (`redis`) 容器.
-
-```bash
-docker-compose up -d redis
-```
-
-2 - 打开你的Laravel的 `.env` 文件 然后 配置 `redis` 的 `REDIS_HOST`
-
-```env
-REDIS_HOST=redis
-```
-
-如果在你的 `.env` 文件没有找到 `REDIS_HOST` 变量。打开数据库配置文件 `config/database.php` 然后用 `redis` 替换默认 IP `127.0.0.1`,例如:
-
-
-```php
-'redis' => [
- 'cluster' => false,
- 'default' => [
- 'host' => 'redis',
- 'port' => 6379,
- 'database' => 0,
- ],
-],
-```
-
-3 - 启用 Redis 缓存或者开启 Session 管理也在 `.env` 文件中用 `redis` 替换默认 `file` 设置 `CACHE_DRIVER` 和 `SESSION_DRIVER`
-
-```env
-CACHE_DRIVER=redis
-SESSION_DRIVER=redis
-```
-
-4 - 最好务必通过 Composer 安装 `predis/predis` 包 `(~1.0)`:
-
-```bash
-composer require predis/predis:^1.0
-```
-
-5 - 你可以用以下代码在 Laravel 中手动测试:
-
-```php
-\Cache::store('redis')->put('Laradock', 'Awesome', 10);
-```
-
-
-### 使用 Mongo
-
-1 - 首先在 Workspace 和 PHP-FPM 容器中安装 `mongo`:
-
- a) 打开 `docker-compose.yml` 文件
- b) 在 Workspace 容器中找到 `INSTALL_MONGO` 选项:
- c) 设置为 `true`
- d) 在 PHP-FPM 容器中找到 `INSTALL_MONGO`
- e) 设置为 `true`
-
-相关配置项如下:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_MONGO=true
- ...
- php-fpm:
- build:
- context: ./php-fpm
- args:
- - INSTALL_MONGO=true
- ...
-```
-
-2 - 重建 `Workspace、PHP-FPM` 容器
-
-```bash
-docker-compose build workspace php-fpm
-```
-
-3 - 使用 `docker-compose up` 命令运行 MongoDB 容器 (`mongo`)
-
-```bash
-docker-compose up -d mongo
-```
-
-4 - 在 `config/database.php` 文件添加 MongoDB 的配置项:
-
-```php
-'connections' => [
-
- 'mongodb' => [
- 'driver' => 'mongodb',
- 'host' => env('DB_HOST', 'localhost'),
- 'port' => env('DB_PORT', 27017),
- 'database' => env('DB_DATABASE', 'database'),
- 'username' => '',
- 'password' => '',
- 'options' => [
- 'database' => '',
- ]
- ],
-
- // ...
-
-],
-```
-
-5 - 打开 Laravel 的 `.env` 文件然后更新以下字段:
-
-- 设置 `DB_HOST` 为 `mongo` 的主机 IP.
-- 设置 `DB_PORT` 为 `27017`.
-- 设置 `DB_DATABASE` 为 `database`.
-
-
-6 - 最后务必通过 Composer 安装 `jenssegers/mongodb` 包,添加服务提供者(Laravel Service Provider)
-
-
-```bash
-composer require jenssegers/mongodb
-```
-
-更多细节内容 [点击这儿](https://github.com/jenssegers/laravel-mongodb#installation).
-
-7 - 测试:
-
-- 首先让你的模型继承 Mongo 的 Eloquent Model. 查看 [文档](https://github.com/jenssegers/laravel-mongodb#eloquent).
-- 进入 Workspace 容器.
-- 迁移数据库 `php artisan migrate`.
-
-
-### [PHP]
-
-
-### 安装 PHP 拓展
-
-安装 PHP 扩展之前,你必须决定你是否需要 `FPM` 或 `CLI`,因为他们安装在不同的容器上,如果你需要两者,则必须编辑两个容器。
-
-PHP-FPM 拓展务必安装在 `php-fpm/Dockerfile-XX`. *(用你 PHP 版本号替换 XX)*.
-
-PHP-CLI 拓展应该安装到 `workspace/Dockerfile`.
-
-
-### 修改 PHP-FPM 版本
-默认运行 **PHP-FPM 7.0** 版本.
-
->PHP-FPM 负责服务你的应用代码,如果你是计划运行您的应用程序在不同 PHP-FPM 版本上,则不需要更改 PHP-CLI 版本。
-
-#### A) 切换版本 PHP `7.0` 到 PHP `5.6`
-
-1 - 打开 `docker-compose.yml`。
-
-2 - 在PHP容器的 `Dockerfile-70` 文件。
-
-3 - 修改版本号, 用 `Dockerfile-56` 替换 `Dockerfile-70` , 例如:
-
-```txt
-php-fpm:
- build:
- context: ./php-fpm
- dockerfile: Dockerfile-70
-```
-
-4 - 最后重建PHP容器
-
-```bash
-docker-compose build php
-```
-
-> 更多关于PHP基础镜像, 请访问 [PHP Docker官方镜像](https://hub.docker.com/_/php/).
-
-
-#### B) 切换版本 PHP `7.0` 或 `5.6` 到 PHP `5.5`
-我们已不在本地支持 PHP5.5,但是你按照以下步骤获取:
-
-1 - 克隆 `https://github.com/laradock/php-fpm`.
-
-2 - 重命名 `Dockerfile-56` 为 `Dockerfile-55`.
-
-3 - 编辑文件 `FROM php:5.6-fpm` 为 `FROM php:5.5-fpm`.
-
-4 - 从 `Dockerfile-55` 构建镜像.
-
-5 - 打开 `docker-compose.yml` 文件.
-
-6 - 将 `php-fpm` 指向你的 `Dockerfile-55` 文件.
-
-
-
-### 修改 PHP-CLI 版本
-默认运行 **PHP-CLI 7.0** 版本
-
->说明: PHP-CLI 只用于执行 Artisan 和 Composer 命令,不服务于你的应用代码,这是 PHP-FPM 的工作,所以编辑 PHP-CLI 的版本不是很重要。
-PHP-CLI 安装在 Workspace 容器,改变 PHP-CLI 版本你需要编辑 `workspace/Dockerfile`.
-现在你必须手动修改 PHP-FPM 的 `Dockerfile` 或者创建一个新的。 (可以考虑贡献功能).
-
-
-### 安装 xDebug
-
-1 - 首先在 Workspace 和 PHP-FPM 容器安装 `xDebug`:
-
- a) 打开 `docker-compose.yml` 文件
- b) 在 Workspace 容器中找到 `INSTALL_XDEBUG` 选项
- c) 改为 `true`
- d) 在 PHP-FPM 容器中找到 `INSTALL_XDEBUG ` 选项
- e) 改为 `true`
-
-例如:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_XDEBUG=true
- ...
- php-fpm:
- build:
- context: ./php-fpm
- args:
- - INSTALL_XDEBUG=true
- ...
-```
-
-2 - 重建容器 `docker-compose build workspace php-fpm`
-
-
-### [Misc]
-
-
-### 使用自定义域名 (替换 Docker 的 IP)
-
-假定你的自定义域名是 `laravel.test`
-
-1 - 打开 `/etc/hosts` 文件添加以下内容,映射你的 localhost 地址 `127.0.0.1` 为 `laravel.test` 域名
-```bash
-127.0.0.1 laravel.test
-```
-
-2 - 打开你的浏览器访问 `{http://laravel.test}`
-
-你可以在 nginx 配置文件自定义服务器名称,如下:
-
-```conf
-server_name laravel.test;
-```
-
-
-### 安装全局 Composer 命令
-
-为启用全局 Composer Install 在容器构建中允许你安装 composer 的依赖,然后构建完成后就是可用的。
-
-1 - 打开 `docker-compose.yml` 文件
-
-2 - 在 Workspace 容器找到 `COMPOSER_GLOBAL_INSTALL` 选项并设置为 `true`
-
-例如:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - COMPOSER_GLOBAL_INSTALL=true
- ...
-```
-3 - 现在特价你的依赖关系到 `workspace/composer.json`
-
-4 - 重建 Workspace 容器 `docker-compose build workspace`
-
-
-### 安装 Prestissimo
-
-[Prestissimo](https://github.com/hirak/prestissimo) 是一个平行安装功能的 composer 插件。
-
-1 - 在安装期间,使全局 Composer Install 正在运行:
-
- 点击这个 [启用全局 Composer 构建安装](#Enable-Global-Composer-Build-Install) 然后继续步骤1、2.
-
-2 - 添加 prestissimo 依赖到 Composer:
-
-a - 现在打开 `workspace/composer.json` 文件
-
-b - 添加 `"hirak/prestissimo": "^0.3"` 依赖
-
-c - 重建 Workspace 容器 `docker-compose build workspace`
-
-
-
-### 安装 Node + NVM
-
-在 Workspace 容器安装 NVM 和 NodeJS
-
-1 - 打开 `docker-compose.yml` 文件
-
-2 - 在 Workspace 容器找到 `INSTALL_NODE` 选项设为 `true`
-
-例如:
-
-```yml
- workspace:
- build:
- context: ./workspace
- args:
- - INSTALL_NODE=true
- ...
-```
-
-3 - 重建容器 `docker-compose build workspace`
-
-
-### Debugging
-
-*这里是你可能面临的常见问题列表,以及可能的解决方案.*
-
-#### 看到空白页而不是 Laravel 的欢迎页面!
-
-在 Laravel 根目录,运行下列命令:
-
-```bash
-sudo chmod -R 777 storage bootstrap/cache
-```
-
-#### 看到 "Welcome to nginx" 而不是 Laravel 应用!
-
-在浏览器使用 `http://127.0.0.1` 替换 `http://localhost`.
-
-#### 看到包含 `address already in use` 的错误
-
-确保你想运行的服务端口(80, 3306, etc.)不是已经被其他程序使用,例如 `apache`/`httpd` 服务或其他安装的开发工具
-
-
-### Laradock 升级
-
-
-从 Docker Toolbox (VirtualBox) 移动到 Docker Native (for Mac/Windows),需要从 Laradock v3.* 升级到 v4.*:
-
-1. 停止 Docker 虚拟机 `docker-machine stop {default}`
-2. 安装 Docker [Mac](https://docs.docker.com/docker-for-mac/) 或 [Windows](https://docs.docker.com/docker-for-windows/).
-3. 升级 Laradock 到 `v4.*.*` (`git pull origin master`)
-4. 像之前一样使用 Laradock: `docker-compose up -d nginx mysql`.
-
-**说明:** 如果你面临任何上面的问题的最后一步:重建你所有的容器
-```bash
-docker-compose build --no-cache
-```
-"警告:容器数据可能会丢失!"
-
-
-## 贡献
-这个小项目是由一个有一个全职工作和很多的职责的人建立的,所以如果你喜欢这个项目,并且发现它需要一个 bug 修复或支持或新软件或升级任何容器,或其他任何. . 你是非常欢迎,欢迎毫不不犹豫地贡献吧:)
-
-#### 阅读我们的 [贡献说明](https://github.com/laradock/laradock/blob/master/CONTRIBUTING.md)
-
-
-## 帮助 & 问题
-
-从聊天室 [Gitter](https://gitter.im/Laradock/laradock) 社区获取帮助和支持.
-
-你也可以打开 Github 上的 [issue](https://github.com/laradock/laradock/issues) (将被贴上问题和答案) 或与大家讨论 [Gitter](https://gitter.im/Laradock/laradock).
-
-Docker 或 Laravel 的特别帮助,你可以在 [Codementor.io](https://www.codementor.io/mahmoudz) 上直接和项目创始人在线沟通
-
-## 关于作者
-
-**创始人:**
-
-- [Mahmoud Zalt](https://github.com/Mahmoudz) (Twitter [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt))
-
-**优秀的人:**
-
-- [Contributors](https://github.com/laradock/laradock/graphs/contributors)
-- [Supporters](https://github.com/laradock/laradock/issues?utf8=%E2%9C%93&q=)
-
-
-## 许可证
-
-[MIT License](https://github.com/laradock/laradock/blob/master/LICENSE) (MIT)
diff --git a/laradock/.github/README.md b/laradock/.github/README.md
deleted file mode 100644
index 948ec93..0000000
--- a/laradock/.github/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
A Docker PHP development environment that facilitates running PHP Apps on Docker
- - - -
-
-
-
-