Merge pull request #3 from imonroe/dockerize

Dockerize
imonroe · Nov 22, 2019 · da90d9a · da90d9a
2 parents 99498d0 + f92e049
commit da90d9a
Show file tree

Hide file tree

Showing 514 changed files with 229,520 additions and 3,648 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,10 @@
+COMPOSE_PROJECT_NAME=Coldreader
+
+MASTER_DB_PORT=3306
+MASTER_DB_DATABASE=homestead
+MASTER_DB_USERNAME=homestead
+MASTER_DB_PASSWORD=secret
+MASTER_MYSQL_ROOT_PASSWORD=Pro@123
+
+MASTER_REDIS_PASSWORD=null
+MASTER_REDIS_PORT=6379
diff --git a/.gitignore b/.gitignore
@@ -1,16 +1,2 @@
-/node_modules
-/public/hot
-/public/storage
-/storage/*.key
-/vendor
-/.idea
-/.vscode
-/.vagrant
-Homestead.json
-Homestead.yaml
-npm-debug.log
-yarn-error.log
-.env
-.env.dusk.local
-.env*
-/.env.BAK
+dbdata/mysql/*
+dbdata/postgres/*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ All Notable changes to Coldreader will be documented in this file.
 
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## 2.3.1 - 2019-11-22
+- Breaking changes since 2.2.1: Dockerized the application, changes to the folder structure, added support for CapRover deployments
+
 ## 2.2.1 - 2018-04-22
 - Breaking changes since 2.1.1.  Method signatures have changed for the Aspect type in the CRPS package, and I updated the basic aspect types to reflect it.
 

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,66 @@
+FROM php:7.2-fpm
+
+# Set working directory
+WORKDIR /var/www
+
+# Install dependencies
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    mariadb-client \
+    libpng-dev \
+    libpq-dev \
+    libjpeg62-turbo-dev \
+    libfreetype6-dev \
+    locales \
+    zip \
+    jpegoptim optipng pngquant gifsicle \
+    vim \
+    nano \
+    unzip \
+    git \
+    curl \
+    dos2unix \
+    cron \
+    procps \
+    nginx
+
+# install nodejs
+RUN curl sL https://deb.nodesource.com/setup_10.x | bash
+RUN apt-get install --yes nodejs && node -v && npm -v
+
+# Clear cache
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Install extensions
+RUN docker-php-ext-install pdo_mysql pdo_pgsql mbstring zip exif pcntl
+RUN docker-php-ext-configure gd --with-gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/
+RUN docker-php-ext-install gd
+
+# Install composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+# Add user for laravel application
+RUN groupadd -g 1000 www && useradd -u 1000 -ms /bin/bash -g www www
+
+# Copy existing application directory and supporting files.
+COPY ./application /var/www/
+COPY ./configuration/nginx/conf.d/ /etc/nginx/conf.d/
+COPY ./configuration/php/local.ini /usr/local/etc/php/conf.d/local.ini
+
+RUN rm -rf /etc/nginx/sites-enabled && mkdir -p /etc/nginx/sites-enabled && chmod -R 777 /var/www/storage
+
+RUN ln -sf /dev/stdout /var/log/nginx/access.log \
+  && ln -sf /dev/stderr /var/log/nginx/error.log
+
+# Copy in our helper scripts
+COPY wait-for-it.sh /
+COPY docker-entry.sh /
+
+# fix scripts
+RUN dos2unix /*.sh && chmod +x /docker-entry.sh && chmod +x /wait-for-it.sh
+
+# Expose port 80 and start php-fpm server
+EXPOSE 80
+
+CMD ["/docker-entry.sh"]
+
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,5 +1,7 @@
 Coldreader
-Copyright (C) 2017-2018  Ian Monroe
+
+Copyright (C) 2017-2019  Ian Monroe
+
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/.env.example → application/.env.example b/.env.example → application/.env.example
@@ -1,28 +1,16 @@
-APP_NAME=Laravel
-APP_ENV=local
+
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost
 
 LOG_CHANNEL=stack
 
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
-
 BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
+CACHE_DRIVER=redis
+SESSION_DRIVER=redis
 SESSION_LIFETIME=120
 QUEUE_DRIVER=sync
 
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
 MAIL_DRIVER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525

diff --git a/.gitattributes → application/.gitattributes b/.gitattributes → application/.gitattributes
diff --git a/application/.gitignore b/application/.gitignore
@@ -0,0 +1,15 @@
+/node_modules
+/public/hot
+/public/storage
+/storage/*.key
+/vendor
+/.idea
+/.vscode
+/.vagrant
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+.env
+.env.dusk.local
+/.env.BAK
diff --git a/...onsole/Commands/ColdreaderBoilerplate.php → ...onsole/Commands/ColdreaderBoilerplate.php b/...onsole/Commands/ColdreaderBoilerplate.php → ...onsole/Commands/ColdreaderBoilerplate.php
diff --git a/app/Console/Commands/ColdreaderInsaller.php → ...p/Console/Commands/ColdreaderInsaller.php b/app/Console/Commands/ColdreaderInsaller.php → ...p/Console/Commands/ColdreaderInsaller.php
diff --git a/app/Console/Commands/UsersAspectsJobs.php → ...app/Console/Commands/UsersAspectsJobs.php b/app/Console/Commands/UsersAspectsJobs.php → ...app/Console/Commands/UsersAspectsJobs.php
diff --git a/app/Console/Commands/dockerArtisan.php → ...on/app/Console/Commands/dockerArtisan.php b/app/Console/Commands/dockerArtisan.php → ...on/app/Console/Commands/dockerArtisan.php
diff --git a/app/Console/Kernel.php → application/app/Console/Kernel.php b/app/Console/Kernel.php → application/app/Console/Kernel.php
diff --git a/app/CustomAspects.php → application/app/CustomAspects.php b/app/CustomAspects.php → application/app/CustomAspects.php
@@ -11,7 +11,6 @@
 use imonroe\crps\AspectFactory;
 use imonroe\crps\Subject;
 use imonroe\crps\Ana;
-use League\CommonMark\CommonMarkConverter;
 use Validator;
 
 class DefaultAspect extends Aspect{
@@ -76,17 +75,3 @@ public function pre_delete(Request &$request)
     }
 
 }
-
-
-
-// ---------  Begin Custom Aspects -------------- //
-
-/*  -- Basic Aspect Types -- */
-
-/*  -- Begin App-specific Aspects -- */
-
-
-// ---------------------------------------------- //
-
-
-// ---------- End Custom Aspects ---------------- //
diff --git a/app/Exceptions/Handler.php → application/app/Exceptions/Handler.php b/app/Exceptions/Handler.php → application/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/app/Http/Controllers/Controller.php → ...ation/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php → ...ation/app/Http/Controllers/Controller.php
diff --git a/app/Http/Controllers/HomeController.php → ...n/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php → ...n/app/Http/Controllers/HomeController.php
diff --git a/.../Controllers/ProfileDetailsController.php → .../Controllers/ProfileDetailsController.php b/.../Controllers/ProfileDetailsController.php → .../Controllers/ProfileDetailsController.php
diff --git a/app/Http/Controllers/RSSController.php → ...on/app/Http/Controllers/RSSController.php b/app/Http/Controllers/RSSController.php → ...on/app/Http/Controllers/RSSController.php
diff --git a/app/Http/Controllers/SearchController.php → ...app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php → ...app/Http/Controllers/SearchController.php
diff --git a/app/Http/Kernel.php → application/app/Http/Kernel.php b/app/Http/Kernel.php → application/app/Http/Kernel.php
diff --git a/app/Http/Middleware/EncryptCookies.php → ...on/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php → ...on/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 → ...ation/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php → ...ation/app/Http/Middleware/TrimStrings.php
diff --git a/app/Http/Middleware/TrustProxies.php → ...tion/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php → ...tion/app/Http/Middleware/TrustProxies.php
diff --git a/app/Http/Middleware/VerifyCsrfToken.php → ...n/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php → ...n/app/Http/Middleware/VerifyCsrfToken.php
diff --git a/app/Jobs/ParseAspectJob.php → application/app/Jobs/ParseAspectJob.php b/app/Jobs/ParseAspectJob.php → application/app/Jobs/ParseAspectJob.php
diff --git a/app/Jobs/UsersAspectsJob.php → application/app/Jobs/UsersAspectsJob.php b/app/Jobs/UsersAspectsJob.php → application/app/Jobs/UsersAspectsJob.php
diff --git a/app/Providers/AppServiceProvider.php → ...tion/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php → ...tion/app/Providers/AppServiceProvider.php
diff --git a/app/Providers/AuthServiceProvider.php → ...ion/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php → ...ion/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 → ...on/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php → ...on/app/Providers/EventServiceProvider.php
diff --git a/app/Providers/RouteServiceProvider.php → ...on/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php → ...on/app/Providers/RouteServiceProvider.php
diff --git a/app/Seeders/NewAccountSeeder.php → application/app/Seeders/NewAccountSeeder.php b/app/Seeders/NewAccountSeeder.php → application/app/Seeders/NewAccountSeeder.php
diff --git a/app/User.php → application/app/User.php b/app/User.php → application/app/User.php
diff --git a/artisan → application/artisan b/artisan → application/artisan
diff --git a/bootstrap/app.php → application/bootstrap/app.php b/bootstrap/app.php → application/bootstrap/app.php
diff --git a/bootstrap/cache/.gitignore → application/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore → application/bootstrap/cache/.gitignore
diff --git a/composer.json → application/composer.json b/composer.json → application/composer.json
@@ -35,14 +35,18 @@
         "spatie/laravel-medialibrary": "^6.0.0",
         "watson/bootstrap-form": "^1.1",
         "fabpot/goutte": "^3.2",
-        "imonroe/cr_basic_aspects": "dev-master"
+        "imonroe/cr_basic_aspects": "dev-master",
+        "predis/predis": "^1.1"
     },
     "require-dev": {
         "filp/whoops": "^2.0",
         "fzaninotto/faker": "^1.4",
         "mockery/mockery": "^1.0",
         "nunomaduro/collision": "^2.0",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^7.0",
+        "barryvdh/laravel-debugbar": "^3.2",
+        "jeroen-g/laravel-packager": "^2.2",
+        "squizlabs/php_codesniffer": "*"
     },
     "autoload": {
         "classmap": [