Apply few tweaks

rinvex · May 28, 2019 · 376baa8 · 376baa8
1 parent 99a990a
commit 376baa8
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 40 deletions.
diff --git a/.config/nginx/sites/localhost.conf b/.config/nginx/sites/localhost.conf
@@ -4,7 +4,7 @@ server {
  listen [::]:80 default_server;
 
  server_name localhost;
- root /var/www/default;
+ root /var/www/localhost;
  index index.php index.html index.htm;
 
  location / {
@@ -27,6 +27,6 @@ server {
  deny all;
  }
 
- error_log /var/log/nginx/default/error.log;
- access_log /var/log/nginx/default/access.log;
+ error_log /var/log/nginx/localhost/error.log;
+ access_log /var/log/nginx/localhost/access.log;
 }
diff --git a/.env.example b/.env.example
@@ -27,7 +27,7 @@ COMPOSE_PATH_SEPARATOR=:
 COMPOSE_PROJECT_NAME=punnet
 
 # Enter your Docker Host IP (will be appended to /etc/hosts). Default is `10.0.75.1`
-DOCKER_HOST_IP=10.10.10.1
+DOCKER_HOST_IP=10.0.75.1
 
 
 ###########################################################

diff --git a/composer.json b/composer.json
@@ -2,23 +2,9 @@
  "name": "rinvex/punnet",
  "description": "Rinvex Punnet is a polymorphic Laravel package, for addressbook management. You can add addresses to any eloquent model with ease.",
  "keywords": [
- "city",
- "state",
- "model",
- "postal",
  "rinvex",
- "street",
- "address",
- "laravel",
- "country",
- "primary",
- "billing",
- "shipping",
- "eloquent",
- "latitude",
- "longitude",
- "addressable",
- "polymorphic"
+ "punnet",
+ "laravel"
  ],
  "license": "MIT",
  "homepage": "https://rinvex.com",
@@ -46,18 +32,10 @@
  }
  ],
  "require": {
- "php": "^7.1.3",
- "illuminate/console": "~5.6.0",
- "illuminate/database": "~5.6.0",
- "illuminate/support": "~5.6.0",
- "jackpopp/geodistance": "^1.2",
- "rinvex/cacheable": "dev-develop",
- "rinvex/country": "dev-develop",
- "rinvex/support": "dev-develop"
+ "php": "^7.2.0"
  },
  "require-dev": {
- "codedungeon/phpunit-result-printer": "^0.19.0",
- "illuminate/container": "~5.6.0",
+ "codedungeon/phpunit-result-printer": "^0.26.0",
  "phpunit/phpunit": "^7.0.0"
  },
  "autoload": {

diff --git a/mysql/Dockerfile b/mysql/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends nano && rm -rf
 ARG TZ=UTC
 ENV TZ ${TZ}
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \
- && echo $TZ > /etc/timezone
+ && echo $TZ > /etc/timezone
 
 # Fix filesystem permissions
 RUN chown -R mysql:root /var/lib/mysql/

diff --git a/mysql/my.cnf b/mysql/my.cnf
@@ -10,6 +10,8 @@ default-character-set = utf8mb4
 default-character-set = utf8mb4
 
 [mysqld]
-sql-mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
+sql-mode = "STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION"
 character-set-server = utf8mb4
 collation-server = utf8mb4_unicode_ci
+
+default_authentication_plugin = mysql_native_password
diff --git a/workspace/composer.json b/workspace/composer.json
@@ -1,13 +1,13 @@
 {
  "require": {
- "deployer/dist": "^6.2.0",
- "friendsofphp/php-cs-fixer": "^2.12.0",
- "laravel/envoy": "^1.4.0",
- "laravel/installer": "^2.0.0",
+ "deployer/dist": "^6.4.0",
+ "friendsofphp/php-cs-fixer": "^2.15.0",
+ "laravel/envoy": "^1.5.0",
+ "laravel/installer": "^2.1.0",
  "pdepend/pdepend": "^2.5.0",
- "phploc/phploc": "^4.0.0",
+ "phploc/phploc": "^5.0.0",
  "phpmd/phpmd": "^2.6.0",
- "sebastian/phpcpd": "^4.0.0",
- "squizlabs/php_codesniffer": "^3.3.0"
+ "sebastian/phpcpd": "^4.1.0",
+ "squizlabs/php_codesniffer": "^3.4.0"
  }
-} 
+}