codeedu · argentinaluiz · Aug 31, 2020 · Aug 21, 2020 · Aug 21, 2020
diff --git a/Dockerfile → .docker/app/Dockerfile b/Dockerfile → .docker/app/Dockerfile
@@ -1,15 +1,10 @@
-FROM php:7.3.6-fpm-alpine3.9
+FROM php:7.3.6-fpm-alpine3.9 as base
 
 RUN apk add --no-cache shadow openssl bash mysql-client nodejs npm git
 RUN docker-php-ext-install pdo pdo_mysql
 
 RUN touch /home/www-data/.bashrc | echo "PS1='\w\$ '" >> /home/www-data/.bashrc
 
-ENV DOCKERIZE_VERSION v0.6.1
-RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 RUN usermod -u 1000 www-data
@@ -21,3 +16,15 @@ RUN rm -rf /var/www/html && ln -s public html
 USER www-data
 
 EXPOSE 9000
+
+FROM base as dev
+USER root
+ENV DOCKERIZE_VERSION v0.6.1
+RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+
+ADD .docker/app/.env /templates/.env
+ADD .docker/app/entrypoint.sh /entrypoint.sh
+
+USER www-data
diff --git a/.docker/entrypoint.sh → .docker/app/entrypoint.sh b/.docker/entrypoint.sh → .docker/app/entrypoint.sh
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,118 @@
-/node_modules
-/public/hot
-/public/storage
-/storage/*.key
-/vendor
-.env
-.env.backup
-.phpunit.result.cache
+www/node_modules
+www/public/hot
+www/public/storage
+www/storage/*.key
+www/vendor
+www/.env
+www/.env.backup
+www/.phpunit.result.cache
 Homestead.json
 Homestead.yaml
 npm-debug.log
 yarn-error.log
 .docker/dbdata/
-.idea/
-.vscode/
 .history/
 .devcontainer/
+
+# Created by https://www.toptal.com/developers/gitignore/api/phpstorm+all,code
+# Edit at https://www.toptal.com/developers/gitignore?templates=phpstorm+all,code
+
+### Code ###
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+### PhpStorm+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### PhpStorm+all Patch ###
+# Ignores the whole .idea folder and all .iml files
+# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
+
+.idea/
+
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+# End of https://www.toptal.com/developers/gitignore/api/phpstorm+all,code
+
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,18 +1,21 @@
-version: '3'
+version: "3.7"
 
 services:
 
     app:
-        build: .
+        build:
+          dockerfile: .docker/app/Dockerfile
+          context: .
+          target: dev
         container_name: micro-videos-app
-        entrypoint: dockerize -template ./.docker/app/.env:.env -wait tcp://db:3306 -timeout 40s ./.docker/entrypoint.sh
+        entrypoint: dockerize -template /templates/.env:.env -wait tcp://db:3306 -timeout 40s /entrypoint.sh
         environment:
             - _DB_HOST=db
             - _DB_DATABASE=code_micro_videos
             - _DB_USERNAME=root
             - _DB_PASSWORD=root
         volumes:
-            - .:/var/www
+            - ./www:/var/www
         networks:
             - app-network
         depends_on:
@@ -27,7 +30,7 @@ services:
         ports:
             - "8000:80"
         volumes:
-            - .:/var/www
+            - ./www:/var/www
         networks:
             - app-network
         depends_on:

diff --git a/.env.example → www/.env.example b/.env.example → www/.env.example
diff --git a/.styleci.yml → www/.styleci.yml b/.styleci.yml → www/.styleci.yml
diff --git a/app/Console/Kernel.php → www/app/Console/Kernel.php b/app/Console/Kernel.php → www/app/Console/Kernel.php
diff --git a/app/Exceptions/Handler.php → www/app/Exceptions/Handler.php b/app/Exceptions/Handler.php → www/app/Exceptions/Handler.php
diff --git a/...rollers/Auth/ForgotPasswordController.php → ...rollers/Auth/ForgotPasswordController.php b/...rollers/Auth/ForgotPasswordController.php → ...rollers/Auth/ForgotPasswordController.php
diff --git a/...Http/Controllers/Auth/LoginController.php → ...Http/Controllers/Auth/LoginController.php b/...Http/Controllers/Auth/LoginController.php → ...Http/Controllers/Auth/LoginController.php
diff --git a/...p/Controllers/Auth/RegisterController.php → ...p/Controllers/Auth/RegisterController.php b/...p/Controllers/Auth/RegisterController.php → ...p/Controllers/Auth/RegisterController.php
diff --git a/...trollers/Auth/ResetPasswordController.php → ...trollers/Auth/ResetPasswordController.php b/...trollers/Auth/ResetPasswordController.php → ...trollers/Auth/ResetPasswordController.php
diff --git a/...ntrollers/Auth/VerificationController.php → ...ntrollers/Auth/VerificationController.php b/...ntrollers/Auth/VerificationController.php → ...ntrollers/Auth/VerificationController.php
diff --git a/app/Http/Controllers/Controller.php → www/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php → www/app/Http/Controllers/Controller.php
diff --git a/app/Http/Kernel.php → www/app/Http/Kernel.php b/app/Http/Kernel.php → www/app/Http/Kernel.php
diff --git a/app/Http/Middleware/Authenticate.php → www/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php → www/app/Http/Middleware/Authenticate.php
diff --git a/...tp/Middleware/CheckForMaintenanceMode.php → ...tp/Middleware/CheckForMaintenanceMode.php b/...tp/Middleware/CheckForMaintenanceMode.php → ...tp/Middleware/CheckForMaintenanceMode.php
diff --git a/app/Http/Middleware/EncryptCookies.php → www/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php → www/app/Http/Middleware/EncryptCookies.php
diff --git a/...tp/Middleware/RedirectIfAuthenticated.php → ...tp/Middleware/RedirectIfAuthenticated.php b/...tp/Middleware/RedirectIfAuthenticated.php → ...tp/Middleware/RedirectIfAuthenticated.php
diff --git a/app/Http/Middleware/TrimStrings.php → www/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php → www/app/Http/Middleware/TrimStrings.php
diff --git a/app/Http/Middleware/TrustProxies.php → www/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php → www/app/Http/Middleware/TrustProxies.php
diff --git a/app/Http/Middleware/VerifyCsrfToken.php → www/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php → www/app/Http/Middleware/VerifyCsrfToken.php
diff --git a/app/Providers/AppServiceProvider.php → www/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php → www/app/Providers/AppServiceProvider.php
diff --git a/app/Providers/AuthServiceProvider.php → www/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php → www/app/Providers/AuthServiceProvider.php
diff --git a/app/Providers/BroadcastServiceProvider.php → ...pp/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php → ...pp/Providers/BroadcastServiceProvider.php
diff --git a/app/Providers/EventServiceProvider.php → www/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php → www/app/Providers/EventServiceProvider.php
diff --git a/app/Providers/RouteServiceProvider.php → www/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php → www/app/Providers/RouteServiceProvider.php
diff --git a/app/User.php → www/app/User.php b/app/User.php → www/app/User.php
diff --git a/artisan → www/artisan b/artisan → www/artisan
diff --git a/bootstrap/app.php → www/bootstrap/app.php b/bootstrap/app.php → www/bootstrap/app.php
diff --git a/bootstrap/cache/.gitignore → www/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore → www/bootstrap/cache/.gitignore
diff --git a/composer.json → www/composer.json b/composer.json → www/composer.json
@@ -37,8 +37,8 @@
             "App\\": "app/"
         },
         "classmap": [
-            "database/seeds",
-            "database/factories"
+          "database/seeds",
+          "database/factories"
         ]
     },
     "autoload-dev": {

diff --git a/composer.lock → www/composer.lock b/composer.lock → www/composer.lock
diff --git a/config/app.php → www/config/app.php b/config/app.php → www/config/app.php
diff --git a/config/auth.php → www/config/auth.php b/config/auth.php → www/config/auth.php
diff --git a/config/broadcasting.php → www/config/broadcasting.php b/config/broadcasting.php → www/config/broadcasting.php
diff --git a/config/cache.php → www/config/cache.php b/config/cache.php → www/config/cache.php
diff --git a/config/database.php → www/config/database.php b/config/database.php → www/config/database.php
diff --git a/config/filesystems.php → www/config/filesystems.php b/config/filesystems.php → www/config/filesystems.php
diff --git a/config/hashing.php → www/config/hashing.php b/config/hashing.php → www/config/hashing.php
diff --git a/config/logging.php → www/config/logging.php b/config/logging.php → www/config/logging.php
diff --git a/config/mail.php → www/config/mail.php b/config/mail.php → www/config/mail.php
diff --git a/config/queue.php → www/config/queue.php b/config/queue.php → www/config/queue.php
diff --git a/config/services.php → www/config/services.php b/config/services.php → www/config/services.php
diff --git a/config/session.php → www/config/session.php b/config/session.php → www/config/session.php
diff --git a/config/view.php → www/config/view.php b/config/view.php → www/config/view.php
diff --git a/database/.gitignore → www/database/.gitignore b/database/.gitignore → www/database/.gitignore
diff --git a/database/factories/UserFactory.php → www/database/factories/UserFactory.php b/database/factories/UserFactory.php → www/database/factories/UserFactory.php
diff --git a/.../2014_10_12_000000_create_users_table.php → .../2014_10_12_000000_create_users_table.php b/.../2014_10_12_000000_create_users_table.php → .../2014_10_12_000000_create_users_table.php
diff --git a/...2_100000_create_password_resets_table.php → ...2_100000_create_password_resets_table.php b/...2_100000_create_password_resets_table.php → ...2_100000_create_password_resets_table.php
diff --git a/...08_19_000000_create_failed_jobs_table.php → ...08_19_000000_create_failed_jobs_table.php b/...08_19_000000_create_failed_jobs_table.php → ...08_19_000000_create_failed_jobs_table.php
diff --git a/database/seeds/DatabaseSeeder.php → www/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php → www/database/seeds/DatabaseSeeder.php
diff --git a/package.json → www/package.json b/package.json → www/package.json
diff --git a/phpunit.xml → www/phpunit.xml b/phpunit.xml → www/phpunit.xml
diff --git a/public/.htaccess → www/public/.htaccess b/public/.htaccess → www/public/.htaccess
diff --git a/public/favicon.ico → www/public/favicon.ico b/public/favicon.ico → www/public/favicon.ico
diff --git a/public/index.php → www/public/index.php b/public/index.php → www/public/index.php
diff --git a/public/robots.txt → www/public/robots.txt b/public/robots.txt → www/public/robots.txt
diff --git a/resources/js/app.js → www/resources/js/app.js b/resources/js/app.js → www/resources/js/app.js
diff --git a/resources/js/bootstrap.js → www/resources/js/bootstrap.js b/resources/js/bootstrap.js → www/resources/js/bootstrap.js
diff --git a/resources/lang/en/auth.php → www/resources/lang/en/auth.php b/resources/lang/en/auth.php → www/resources/lang/en/auth.php
diff --git a/resources/lang/en/pagination.php → www/resources/lang/en/pagination.php b/resources/lang/en/pagination.php → www/resources/lang/en/pagination.php
diff --git a/resources/lang/en/passwords.php → www/resources/lang/en/passwords.php b/resources/lang/en/passwords.php → www/resources/lang/en/passwords.php
diff --git a/resources/lang/en/validation.php → www/resources/lang/en/validation.php b/resources/lang/en/validation.php → www/resources/lang/en/validation.php
diff --git a/resources/sass/app.scss → www/resources/sass/app.scss b/resources/sass/app.scss → www/resources/sass/app.scss
diff --git a/resources/views/welcome.blade.php → www/resources/views/welcome.blade.php b/resources/views/welcome.blade.php → www/resources/views/welcome.blade.php
diff --git a/routes/api.php → www/routes/api.php b/routes/api.php → www/routes/api.php
diff --git a/routes/channels.php → www/routes/channels.php b/routes/channels.php → www/routes/channels.php
diff --git a/routes/console.php → www/routes/console.php b/routes/console.php → www/routes/console.php
diff --git a/routes/web.php → www/routes/web.php b/routes/web.php → www/routes/web.php
diff --git a/server.php → www/server.php b/server.php → www/server.php
diff --git a/storage/app/.gitignore → www/storage/app/.gitignore b/storage/app/.gitignore → www/storage/app/.gitignore
diff --git a/storage/app/public/.gitignore → www/storage/app/public/.gitignore b/storage/app/public/.gitignore → www/storage/app/public/.gitignore
diff --git a/storage/framework/.gitignore → www/storage/framework/.gitignore b/storage/framework/.gitignore → www/storage/framework/.gitignore
diff --git a/storage/framework/cache/.gitignore → www/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore → www/storage/framework/cache/.gitignore
diff --git a/storage/framework/cache/data/.gitignore → www/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore → www/storage/framework/cache/data/.gitignore
diff --git a/storage/framework/sessions/.gitignore → www/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore → www/storage/framework/sessions/.gitignore
diff --git a/storage/framework/testing/.gitignore → www/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore → www/storage/framework/testing/.gitignore
diff --git a/storage/framework/views/.gitignore → www/storage/framework/views/.gitignore b/storage/framework/views/.gitignore → www/storage/framework/views/.gitignore
diff --git a/storage/logs/.gitignore → www/storage/logs/.gitignore b/storage/logs/.gitignore → www/storage/logs/.gitignore
diff --git a/tests/Bootstrap.php → www/tests/Bootstrap.php b/tests/Bootstrap.php → www/tests/Bootstrap.php
diff --git a/tests/CreatesApplication.php → www/tests/CreatesApplication.php b/tests/CreatesApplication.php → www/tests/CreatesApplication.php
diff --git a/tests/Feature/ExampleTest.php → www/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php → www/tests/Feature/ExampleTest.php
diff --git a/tests/TestCase.php → www/tests/TestCase.php b/tests/TestCase.php → www/tests/TestCase.php
diff --git a/tests/Unit/ExampleTest.php → www/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php → www/tests/Unit/ExampleTest.php
diff --git a/webpack.mix.js → www/webpack.mix.js b/webpack.mix.js → www/webpack.mix.js
diff --git a/yarn.lock → www/yarn.lock b/yarn.lock → www/yarn.lock