Skip to content

Test #2

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.

Sign up for GitHub

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

Open
newLoki wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Test #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c8fa17d
add dotcloud config
newLoki Jul 14, 2012
5918c3c
add config for dotcloud production environment
newLoki Jul 14, 2012
98c79e6
load dependencies with composer on production
newLoki Jul 14, 2012
6868241
load dependencies with composer on production
newLoki Jul 14, 2012
26c3405
load dependencies with composer on production
newLoki Jul 14, 2012
eec24d0
add installer script for production
newLoki Jul 14, 2012
bd5c460
add installer script for production
newLoki Jul 14, 2012
5dc8214
something realy different
newLoki Aug 29, 2012
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
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ php:
before_script:
- "pyrus install pear.phpunit.de/PHPUnit_MockObject"
- "phpenv rehash"
- "wget http://getcomposer.org/composer.phar"
- "php composer.phar install"
- "composer install"
- "mysql -uroot -e 'create database pollex;'"
- 'java -jar build/liquibase.jar --driver=com.mysql.jdbc.Driver --classpath=build/databasedriver/mysql-connector-java-5.1.17-bin.jar --changeLogFile=data/sql/changelog.xml --url="jdbc:mysql://127.0.0.1:3306/pollex" --username=root --password="" --contexts="test" migrate'
- "mysql -uroot -e 'SELECT * FROM users WHERE 1' pollex"
Expand Down
23 changes: 15 additions & 8 deletions app/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
<?php

function tranformsDotCloud()
{
$cloudConfig = json_decode(file_get_contents("/home/dotcloud/environment.json"),true);

return array(
'driver' => 'pdo_mysql',
'dbname' => 'pollex',
'host' => $cloudConfig['DOTCLOUD_DB_MYSQL_HOST'],
'user' => $cloudConfig['DOTCLOUD_DATA_MYSQL_LOGIN'],
'password' => $cloudConfig['DOTCLOUD_DATA_MYSQL_PASSWORD'],
'port' => $cloudConfig['DOTCLOUD_DATA_MYSQL_PORT'],
);
}

return array(
// database settings
'db' => array(
'prod' => array(
'driver' => 'pdo_mysql',
'dbname' => 'pollex',
'host' => '127.0.0.1',
'user' => 'root',
'password' => 'root',
'port' => '3306'
),
'prod' => tranformsDotCloud(),
'dev' => array(
'driver' => 'pdo_mysql',
'dbname' => 'pollex',
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
}],
"require": {
"php": ">=5.3.2",
"silex/silex": "1.0.*",
"silex/silex": "dev-master",
"doctrine/orm": "2.1.*",
"nutwerk/doctrine-orm-provider": "*",
"nutwerk/doctrine-orm-provider": "dev-master",
"symfony/config": "*"
}
}
5 changes: 5 additions & 0 deletions dotcloud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
www:
type: php
prebuild: ./install.sh
data:
type: mysql
3 changes: 3 additions & 0 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
wget http://getcomposer.org/composer.phar
php composer.phar install