Skip to content

Commit

Permalink
Merge pull request #5 from vuongxuongminh/2.0
Browse files Browse the repository at this point in the history
2.0
  • Loading branch information
vuongxuongminh authored Jul 5, 2020
2 parents ec7a6d3 + 0bdbf04 commit d9bf031
Show file tree
Hide file tree
Showing 19 changed files with 1,475 additions and 588 deletions.
2 changes: 2 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ ARG APCU_VERSION=5.1.18
ARG AMQP_VERSION=1.9.4

RUN apk add --no-cache \
git \
acl \
fcgi \
file \
Expand Down Expand Up @@ -77,6 +78,7 @@ COPY /symfony/.env /symfony/.env
COPY /symfony/bin /symfony/bin
COPY /symfony/config /symfony/config
COPY /symfony/src /symfony/src
COPY /symfony/migrations /symfony/migrations
COPY /symfony/public /symfony/public

ENV SYMFONY_PHPUNIT_VERSION=8.3
Expand Down
6 changes: 3 additions & 3 deletions helm/symfony/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: mysql
repository: https://kubernetes-charts.storage.googleapis.com
version: ~1.6.2
version: 1.6.4
- name: rabbitmq
repository: https://charts.bitnami.com/bitnami
version: ~6.18.9
digest: sha256:0ec9c58ca429abe3f83140737e4d0171ac919195cc2ae91c5a5d176e01869b56
generated: "2020-05-01T23:07:59.443188329+07:00"
digest: sha256:ca75859758c4edf888a9b05ef9bdca936c6a52cbd8f97a6d27f7ea308b0b2974
generated: "2020-07-05T11:50:56.883974687+07:00"
2 changes: 1 addition & 1 deletion helm/symfony/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ php:
env: 'prod'
debug: '0'
secret: '!ChangeMe!'
trustedHosts: '^.*\\.example\\.com$'
trustedHosts: '^.*\\.example$'
trustedProxies:
- 10.0.0.0/8
- 172.16.0.0/12
Expand Down
4 changes: 2 additions & 2 deletions symfony/.env
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=72951e0ecd9d607e0af26a97c3d15692
APP_SECRET=8fa6e35d6633fe9cd51303f5e869cbd9
#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
#TRUSTED_HOSTS='^(localhost|example\.com)$'
###< symfony/framework-bundle ###
Expand All @@ -33,5 +33,5 @@ MAILER_DSN=smtp://mailhog:1025
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
# For a PostgreSQL database, use: "postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=utf8"
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
DATABASE_URL=mysql://root:root@mysql:3306/test?serverVersion=5.7
DATABASE_URL=mysql://root:root@mysql:3306/test?serverVersion=8
###< doctrine/doctrine-bundle ###
19 changes: 19 additions & 0 deletions symfony/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) Fabien Potencier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
7 changes: 4 additions & 3 deletions symfony/bin/console
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
use App\Kernel;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\Dotenv\Dotenv;
use Symfony\Component\ErrorHandler\Debug;

if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
Expand All @@ -14,8 +15,8 @@ set_time_limit(0);

require dirname(__DIR__).'/vendor/autoload.php';

if (!class_exists(Application::class)) {
throw new LogicException('You need to add "symfony/framework-bundle" as a Composer dependency.');
if (!class_exists(Application::class) || !class_exists(Dotenv::class)) {
throw new LogicException('You need to add "symfony/framework-bundle" and "symfony/dotenv" as Composer dependencies.');
}

$input = new ArgvInput();
Expand All @@ -27,7 +28,7 @@ if ($input->hasParameterOption('--no-debug', true)) {
putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
}

require dirname(__DIR__).'/config/bootstrap.php';
(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');

if ($_SERVER['APP_DEBUG']) {
umask(0000);
Expand Down
15 changes: 8 additions & 7 deletions symfony/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
"php": "^7.2.5",
"ext-ctype": "*",
"ext-iconv": "*",
"symfony/console": "5.0.*",
"symfony/dotenv": "5.0.*",
"symfony/console": "5.1.*",
"symfony/dotenv": "5.1.*",
"symfony/flex": "^1.3.1",
"symfony/framework-bundle": "5.0.*",
"symfony/mailer": "5.0.*",
"symfony/messenger": "5.0.*",
"symfony/framework-bundle": "5.1.*",
"symfony/mailer": "5.1.*",
"symfony/messenger": "5.1.*",
"symfony/monolog-bundle": "^3.5",
"symfony/orm-pack": "^1.0",
"symfony/yaml": "5.0.*"
"symfony/yaml": "5.1.*"
},
"require-dev": {
},
"config": {
"optimize-autoloader": true,
"preferred-install": {
"*": "dist"
},
Expand Down Expand Up @@ -60,7 +61,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.0.*"
"require": "5.1.*"
}
}
}
Loading

0 comments on commit d9bf031

Please sign in to comment.