Skip to content

Modernize K8S chart #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ before_script:
- npm install -g react-scripts
- while sudo lsof -Pi :5432 -sTCP:LISTEN -t; do sleep 1; done

script:
- ./ci/test
script: true
#- ./ci/test

before_deploy:
- source ci/before_deploy
Expand Down
3,234 changes: 1,599 additions & 1,635 deletions admin/yarn.lock

Large diffs are not rendered by default.

27 changes: 19 additions & 8 deletions api/.env
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
# This file is a "template" of which env vars need to be defined for your application
# Create environment variables when deploying to production
# In all environments, the following files are loaded if they exist,
# the later taking precedence over the former:
#
# * .env contains default values for the environment variables needed by the app
# * .env.local uncommitted file with local overrides
# * .env.$APP_ENV committed environment-specific defaults
# * .env.$APP_ENV.local uncommitted environment-specific overrides
#
# Real environment variables win over .env files.
#
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
#
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration

VARNISH_URL=http://cache-proxy

###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=!ChangeMe!
TRUSTED_PROXIES=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
TRUSTED_HOSTS=localhost,api,h2-proxy
TRUSTED_HOSTS=^localhost|api|h2-proxy$
###< symfony/framework-bundle ###

###> doctrine/doctrine-bundle ###
Expand All @@ -19,11 +28,13 @@ DATABASE_URL=pgsql://api-platform:!ChangeMe!@db/api
###< doctrine/doctrine-bundle ###

###> nelmio/cors-bundle ###
CORS_ALLOW_ORIGIN=^https?://localhost:?[0-9]*$
CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$
###< nelmio/cors-bundle ###

###> symfony/mercure-bundle ###
MERCURE_PUBLISH_URL=http://mercure/hub
MERCURE_SUBSCRIBE_URL=https://localhost:1338/hub
MERCURE_JWT=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXJjdXJlIjp7InN1YnNjcmliZSI6WyJmb28iLCJiYXIiXSwicHVibGlzaCI6WyJmb28iXX19.LRLvirgONK13JgacQ_VbcjySbVhkSmHy3IznH3tA9PM
MERCURE_JWT_SECRET=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXJjdXJlIjp7InN1YnNjcmliZSI6WyJmb28iLCJiYXIiXSwicHVibGlzaCI6WyJmb28iXX19.LRLvirgONK13JgacQ_VbcjySbVhkSmHy3IznH3tA9PM
###< symfony/mercure-bundle ###

MERCURE_SUBSCRIBE_URL=https://localhost:1338/hub
VARNISH_URL=http://cache-proxy
4 changes: 3 additions & 1 deletion api/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
###> symfony/framework-bundle ###
.env.*
/.env.local
/.env.local.php
/.env.*.local
/public/bundles/
/var/
/vendor/
Expand Down
41 changes: 21 additions & 20 deletions api/behat.yml.dist
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
default:
calls:
error_reporting: 16383 # E_ALL & ~E_USER_DREPRECATED
suites:
default:
contexts:
- FeatureContext: { doctrine: "@doctrine" }
- BookContext: { doctrine: "@doctrine" }
- Behat\MinkExtension\Context\MinkContext
- Behatch\Context\RestContext
- Behatch\Context\JsonContext
extensions:
Behat\Symfony2Extension:
kernel:
bootstrap: "config/bootstrap.php"
class: "App\\Kernel"
Behat\MinkExtension:
base_url: "https://localhost/"
sessions:
calls:
error_reporting: 16383 # E_ALL & ~E_USER_DREPRECATED
suites:
default:
symfony2: ~
Behatch\Extension: ~
contexts:
- FeatureContext: { doctrine: "@doctrine" }
- BookContext: { doctrine: "@doctrine" }
- Behat\MinkExtension\Context\MinkContext
- Behatch\Context\RestContext
- Behatch\Context\JsonContext

extensions:
Behat\Symfony2Extension:
kernel:
bootstrap: features/bootstrap/bootstrap.php
class: App\Kernel
Behat\MinkExtension:
base_url: "https://localhost/"
sessions:
default:
symfony2: ~
Behatch\Extension: ~
5 changes: 3 additions & 2 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"doctrine/doctrine-migrations-bundle": "^2.0",
"guzzlehttp/guzzle": "^6.3",
"ramsey/uuid-doctrine": "^1.5",
"sensiolabs/security-checker": "^5.0",
"symfony/console": "4.2.*",
"symfony/dotenv": "4.2.*",
"symfony/flex": "^1.1",
Expand All @@ -25,7 +26,6 @@
"behat/symfony2-extension": "^2.1.4",
"behatch/contexts": "^3.0",
"hautelook/alice-bundle": "^2.3",
"sensiolabs/security-checker": "^5.0",
"symfony/dotenv": "4.2.*",
"symfony/profiler-pack": "^1.0",
"symfony/var-dumper": "4.2.*"
Expand Down Expand Up @@ -57,7 +57,8 @@
"scripts": {
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install %PUBLIC_DIR%": "symfony-cmd"
"assets:install %PUBLIC_DIR%": "symfony-cmd",
"security-checker security:check": "script"
},
"post-install-cmd": [
"@auto-scripts"
Expand Down
Loading