Skip to content

docker-yii2-app
docker-yii2-app
Commit 2fc6666c authored by Tobias Munk's avatar Tobias Munk
Browse files
Options

moved config to separate folder

parent 5435a0d8
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 136 deletions
Dockerfile
View file @ 2fc6666c
FROM dmstr/php-yii2:7.1-fpm-3.1-alpine-nginx
FROM yiisoftware/yii2-php:7.2-apache
WORKDIR /app
......@@ -6,6 +6,7 @@ ADD composer.lock composer.json /app/
RUN composer install --prefer-dist --optimize-autoloader
ADD yii /app/
ADD ./config /app/config
ADD ./web /app/web/
ADD ./src /app/src/
RUN cp src/app.env-dist src/app.env
......
composer.json
View file @ 2fc6666c
......@@ -3,19 +3,30 @@
"minimum-stability": "stable",
"require": {
"vlucas/phpdotenv": "2.*",
"yiisoft/yii2": "^2.0.8",
"yiisoft/yii2": "^2.0.13",
"yiisoft/yii2-bootstrap": "2.*",
"yiisoft/yii2-debug": "2.*",
"codemix/yii2-streamlog": "^1.0.0"
},
"extra": {
"asset-installer-paths": {
"npm-asset-library": "vendor/npm",
"bower-asset-library": "vendor/bower"
},
"asset-vcs-driver-options": {
"github-no-api": true
},
"asset-pattern-skip-version": "(-build|-patch)"
"repositories": [
{
"type": "composer",
"url": "https://asset-packagist.org"
}
],
"config": {
"fxp-asset": {
"enabled": false,
"installer-paths": {
"npm-asset-library": "vendor/npm",
"bower-asset-library": "vendor/bower"
},
"vcs-driver-options": {
"github-no-api": true
},
"git-skip-update": "2 days",
"pattern-skip-version": "(-build|-patch)",
"optimize-with-installed-packages": false
}
}
}
composer.lock
View file @ 2fc6666c
......@@ -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": "f2dc05f3e5c0d89137074f1013eff2bd",
"content-hash": "b133215816a78cf0f43cdd7984377d0a",
"packages": [
{
"name": "bower-asset/bootstrap",
......@@ -56,95 +56,45 @@
]
},
{
"name": "bower-asset/jquery",
"version": "2.2.4",
"name": "bower-asset/inputmask",
"version": "3.3.11",
"source": {
"type": "git",
"url": "https://github.com/jquery/jquery-dist.git",
"reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72"
"url": "https://github.com/RobinHerbots/Inputmask.git",
"reference": "5e670ad62f50c738388d4dcec78d2888505ad77b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jquery/jquery-dist/zipball/c0185ab7c75aab88762c5aae780b9d83b80eda72",
"reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72",
"shasum": ""
"url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/5e670ad62f50c738388d4dcec78d2888505ad77b",
"reference": "5e670ad62f50c738388d4dcec78d2888505ad77b",
"shasum": null
},
"type": "bower-asset-library",
"extra": {
"bower-asset-main": "dist/jquery.js",
"bower-asset-ignore": [
"package.json"
]
"require": {
"bower-asset/jquery": ">=1.7"
},
"type": "bower-asset",
"license": [
"MIT"
],
"keywords": [
"browser",
"javascript",
"jquery",
"library"
"http://opensource.org/licenses/mit-license.php"
]
},
{
"name": "bower-asset/jquery.inputmask",
"version": "3.3.8",
"name": "bower-asset/jquery",
"version": "3.2.1",
"source": {
"type": "git",
"url": "https://github.com/RobinHerbots/jquery.inputmask.git",
"reference": "791d84990c4a98df1597e9d155be53a3725805dd"
"url": "https://github.com/jquery/jquery-dist.git",
"reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/791d84990c4a98df1597e9d155be53a3725805dd",
"reference": "791d84990c4a98df1597e9d155be53a3725805dd",
"shasum": ""
},
"require": {
"bower-asset/jquery": ">=1.7"
},
"type": "bower-asset-library",
"extra": {
"bower-asset-main": [
"./dist/inputmask/inputmask.js",
"./dist/inputmask/inputmask.extensions.js",
"./dist/inputmask/inputmask.date.extensions.js",
"./dist/inputmask/inputmask.numeric.extensions.js",
"./dist/inputmask/inputmask.phone.extensions.js",
"./dist/inputmask/jquery.inputmask.js",
"./dist/inputmask/global/document.js",
"./dist/inputmask/global/window.js",
"./dist/inputmask/phone-codes/phone.js",
"./dist/inputmask/phone-codes/phone-be.js",
"./dist/inputmask/phone-codes/phone-nl.js",
"./dist/inputmask/phone-codes/phone-ru.js",
"./dist/inputmask/phone-codes/phone-uk.js",
"./dist/inputmask/dependencyLibs/inputmask.dependencyLib.jqlite.js",
"./dist/inputmask/dependencyLibs/inputmask.dependencyLib.jquery.js",
"./dist/inputmask/dependencyLibs/inputmask.dependencyLib.js",
"./dist/inputmask/bindings/inputmask.binding.js"
],
"bower-asset-ignore": [
"**/*",
"!dist/*",
"!dist/inputmask/*",
"!dist/min/*",
"!dist/min/inputmask/*"
]
"url": "https://api.github.com/repos/jquery/jquery-dist/zipball/77d2a51d0520d2ee44173afdf4e40a9201f5964e",
"reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e",
"shasum": null
},
"type": "bower-asset",
"license": [
"http://opensource.org/licenses/mit-license.php"
],
"description": "Inputmask is a javascript library which creates an input mask. Inputmask can run against vanilla javascript, jQuery and jqlite.",
"keywords": [
"form",
"input",
"inputmask",
"jquery",
"mask",
"plugins"
],
"time": "2017-08-24T08:08:54+00:00"
"MIT"
]
},
{
"name": "bower-asset/punycode",
......@@ -176,34 +126,22 @@
},
{
"name": "bower-asset/yii2-pjax",
"version": "v2.0.6",
"version": "2.0.7.1",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/jquery-pjax.git",
"reference": "60728da6ade5879e807a49ce59ef9a72039b8978"
"url": "git@github.com:yiisoft/jquery-pjax.git",
"reference": "aef7b953107264f00234902a3880eb50dafc48be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/60728da6ade5879e807a49ce59ef9a72039b8978",
"reference": "60728da6ade5879e807a49ce59ef9a72039b8978",
"shasum": ""
"url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/aef7b953107264f00234902a3880eb50dafc48be",
"reference": "aef7b953107264f00234902a3880eb50dafc48be",
"shasum": null
},
"require": {
"bower-asset/jquery": ">=1.8"
},
"type": "bower-asset-library",
"extra": {
"bower-asset-main": "./jquery.pjax.js",
"bower-asset-ignore": [
".travis.yml",
"Gemfile",
"Gemfile.lock",
"CONTRIBUTING.md",
"vendor/",
"script/",
"test/"
]
},
"type": "bower-asset",
"license": [
"MIT"
]
......@@ -406,21 +344,21 @@
},
{
"name": "yiisoft/yii2",
"version": "2.0.12",
"version": "2.0.13.1",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-framework.git",
"reference": "70acbecc75cb26b6cd66d16be0b06e4b73db190d"
"reference": "7af96d8da5ea3e9a5dd05d0e734b21c5726a6ddf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/70acbecc75cb26b6cd66d16be0b06e4b73db190d",
"reference": "70acbecc75cb26b6cd66d16be0b06e4b73db190d",
"url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/7af96d8da5ea3e9a5dd05d0e734b21c5726a6ddf",
"reference": "7af96d8da5ea3e9a5dd05d0e734b21c5726a6ddf",
"shasum": ""
},
"require": {
"bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
"bower-asset/jquery.inputmask": "~3.2.2 | ~3.3.5",
"bower-asset/inputmask": "~3.2.2 | ~3.3.5",
"bower-asset/jquery": "3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
"bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": "~2.0.1",
"cebe/markdown": "~1.0.0 | ~1.1.0",
......@@ -502,34 +440,30 @@
"framework",
"yii2"
],
"time": "2017-06-05T14:33:41+00:00"
"time": "2017-11-14T11:08:21+00:00"
},
{
"name": "yiisoft/yii2-bootstrap",
"version": "2.0.6",
"version": "2.0.7",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-bootstrap.git",
"reference": "3fd2b8c950cce79d60e9702d6bcb24eb3c80f6c5"
"reference": "02a54d868343ed11d02f0f0f8cbbecb590e0cb3f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/3fd2b8c950cce79d60e9702d6bcb24eb3c80f6c5",
"reference": "3fd2b8c950cce79d60e9702d6bcb24eb3c80f6c5",
"url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/02a54d868343ed11d02f0f0f8cbbecb590e0cb3f",
"reference": "02a54d868343ed11d02f0f0f8cbbecb590e0cb3f",
"shasum": ""
},
"require": {
"bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*",
"yiisoft/yii2": ">=2.0.6"
"yiisoft/yii2": "~2.0.6"
},
"type": "yii2-extension",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
},
"asset-installer-paths": {
"npm-asset-library": "vendor/npm",
"bower-asset-library": "vendor/bower"
}
},
"autoload": {
......@@ -552,7 +486,7 @@
"bootstrap",
"yii2"
],
"time": "2016-03-17T03:29:28+00:00"
"time": "2017-10-09T19:48:22+00:00"
},
{
"name": "yiisoft/yii2-composer",
......@@ -606,20 +540,20 @@
},
{
"name": "yiisoft/yii2-debug",
"version": "2.0.11",
"version": "2.0.13",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-debug.git",
"reference": "372fbf0d47303b7d68275d6720935e5116915418"
"reference": "b37f414959c2fafefb332020b42037cd17c1cb7f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/372fbf0d47303b7d68275d6720935e5116915418",
"reference": "372fbf0d47303b7d68275d6720935e5116915418",
"url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/b37f414959c2fafefb332020b42037cd17c1cb7f",
"reference": "b37f414959c2fafefb332020b42037cd17c1cb7f",
"shasum": ""
},
"require": {
"yiisoft/yii2": "~2.0.11",
"yiisoft/yii2": "~2.0.13",
"yiisoft/yii2-bootstrap": "~2.0.0"
},
"type": "yii2-extension",
......@@ -649,7 +583,7 @@
"debugger",
"yii2"
],
"time": "2017-09-05T23:21:05+00:00"
"time": "2017-12-05T07:36:23+00:00"
}
],
"packages-dev": [],
......
src/config/common.php → config/common.php
View file @ 2fc6666c
......@@ -13,7 +13,7 @@
return [
'id' => 'app',
'language' => 'en',
'basePath' => dirname(__DIR__),
'basePath' => dirname(__DIR__).'/src',
'vendorPath' => '@app/../vendor',
'runtimePath' => '@app/../runtime',
// Bootstrapped modules are loaded in every request
......
src/config/env.php → config/env.php
View file @ 2fc6666c
......@@ -14,7 +14,7 @@ $version = is_file(__DIR__.'/../version') ? file_get_contents(__DIR__.'/../versi
defined('APP_VERSION') or define('APP_VERSION', $version);
// Load default settings via dotenv from file
$dotenv = new Dotenv\Dotenv(__DIR__.'/..', 'app.env');
$dotenv = new Dotenv\Dotenv(__DIR__, 'app.env');
$dotenv->load();
// Checks & validation
......
src/config/main.php → config/main.php
View file @ 2fc6666c
......@@ -10,11 +10,11 @@
*/
// Define application aliases
Yii::setAlias('@app', dirname(__DIR__).'/..');
Yii::setAlias('@root', '@app/..');
Yii::setAlias('@runtime', dirname(__DIR__).'/../../runtime');
Yii::setAlias('@web', dirname(__DIR__).'/../web');
Yii::setAlias('@webroot', dirname(__DIR__).'/web');
Yii::setAlias('@app', dirname(__DIR__).'/../src');
Yii::setAlias('@root', '..');
Yii::setAlias('@runtime', '@root/runtime');
Yii::setAlias('@web', '@root/web');
Yii::setAlias('@webroot', '/');
// Load $merge configuration files
$applicationType = php_sapi_name() == 'cli' ? 'console' : 'web';
......
docker-compose.dev.yml
View file @ 2fc6666c
......@@ -3,12 +3,12 @@ services:
php:
build: .
environment:
- PHP_USER_ID=82
- GITHUB_API_TOKEN=${GITHUB_API_TOKEN}
- GITHUB_API_TOKEN
volumes:
- ./composer.json:/app/composer.json
- ./composer.lock:/app/composer.lock
- ./vendor:/app/vendor
- ./config:/app/config
- ./src:/app/src
- ./web:/app/web
- ./tests:/app/tests
......
web/index.php
View file @ 2fc6666c
......@@ -2,13 +2,13 @@
$rootPath = __DIR__.'/..';
require($rootPath.'/vendor/autoload.php');
require($rootPath.'/src/config/env.php');
require($rootPath.'/config/env.php');
defined('YII_DEBUG') or define('YII_DEBUG', (boolean)getenv('YII_DEBUG'));
defined('YII_ENV') or define('YII_ENV', getenv('YII_ENV'));
require($rootPath.'/vendor/yiisoft/yii2/Yii.php');
$config = require($rootPath.'/src/config/main.php');
$config = require($rootPath.'/config/main.php');
$application = new yii\web\Application($config);
$application->run();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment