Skip to content

Commit

Permalink
Docker installation
Browse files Browse the repository at this point in the history
  • Loading branch information
@ajlucena78
ajlucena78 committed Jun 4, 2018
1 parent f981be9 commit 122b159
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ notifications:

slack:
rooms:
- ximdexteam:tJAT66V6VSJeHR3H2CDCImnK#ximdex
- ximdexteam:tJAT66V6VSJeHR3H2CDCImnK#travis-ci
5 changes: 3 additions & 2 deletions INSTALLATION.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ Install Ximdex CMS as a docker container or using the web installer on your serv
You should end with a directory (i.e.: ximdex-develop) containing all the Ximdex files and directories.


2. From the Ximdex directory (i.e.: ximdex-develop, where the docker-compose.yml file is locate) run the command:
2. From the Ximdex directory (i.e.: ximdex-develop, where the docker-compose.yml file is locate) run the commands:
```
sudo docker-compose up
sudo docker-compose up composer
sudo docker-compose up ximdex db
```
That will run the containers for Apache2, PHP, MySQL and Ximdex running on the host ximdex:80

Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ services:
# Change this name ( ximdex: ) for your desired host name, for example ( ximdex.mydomain.com: )
ximdex:
image: ximdex/nginx-php:php7
environment:
WEB_DOCUMENT_ROOT: /var/www/html
volumes:
- ./:/var/www/html
links:
Expand All @@ -14,7 +16,7 @@ services:
- 80:80

db:
image: "mysql:5.7"
image: "mariadb:10.2"

# Path where MySQL data will be
volumes:
Expand Down
90 changes: 45 additions & 45 deletions tests/acceptance/MinimumCept.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,101 +22,101 @@

$I->amOnPage('/');

$I->see("Welcome to Ximdex CMS");
$I->see('Welcome to Ximdex CMS');

$I->click("Check configuration");
$I->click('Check configuration');

$I->wait(3);

$I->click("Start installation");
$I->click('Start installation');

$I->waitForText("Installing Database", 3);
$I->waitForText('Installing Database', 3);

$I->fillField("host", "db");
$I->fillField("root_user", "ximdex");
$I->fillField("root_pass", "ximdex");
$I->fillField("name", "ximdex");
$I->fillField('host', 'db');
$I->fillField('root_user', 'ximdex');
$I->fillField('root_pass', 'ximdex');
$I->fillField('name', 'ximdex');

$I->click("Create Database");
$I->click('Create Database');

$I->wait(15);

$I->see("Set the password for this admin user");
$I->see('Set the password for this admin user');

$I->fillField("pass", "ximdex");
$I->fillField("pass2", "ximdex");
$I->fillField('pass', 'ximdex');
$I->fillField('pass2', 'ximdex');

$I->click("Save settings");
$I->click('Save settings');

$I->wait(3);

$I->see("Installing Ximdex CMS's default modules");
$I->see('Installing Ximdex CMS\'s default modules');

$I->click("Install modules");
$I->click('Install modules');

$I->waitForText("Xowl configuration (optional)", 10);
$I->waitForText('Xowl configuration (optional)', 10);

$I->click("Continue");
$I->click('Continue');

$I->waitForText("Installation finished!", 3);
$I->waitForText('Installation finished!', 3);

$I->click("Get started");
$I->click('Get started');

$I->see("User");
$I->see("Password");
$I->see('User');
$I->see('Password');

$I->fillField("user", "ximdex");
$I->fillField("password", "ximdex");
$I->fillField('user', 'ximdex');
$I->fillField('password', 'ximdex');

$I->click("Sign in");
$I->click('Sign in');

$I->waitForText("WELCOME TO XIMDEX CMS, XIMDEX!", 3);
$I->waitForText('WELCOME TO XIMDEX CMS, XIMDEX!', 3);

$I->wantTo('Ensure that publish works');

$I->waitForText("Hello ximdex, first time here?", 3, "#tourcontrols");
$I->waitForText('Hello ximdex, first time here?', 3, '#tourcontrols');

$I->click("#canceltour");
$I->click('#canceltour');

function reload($I)
{
$I->click("#angular-tree > div.ui-tabs.ui-widget.ui-widget-content.ui-corner-all.tabs-container.hbox-panel.ng-isolate-scope > div.ui-tabs.ui-widget.ui-widget-content.ui-corner-all.tabs-container > div > div.browser-view.ui-tabs-panel.ui-widget-content.ui-corner-bottom.tab-pane.ng-scope.active > div.ng-scope > xim-tree > div > div.xim-treeview-btnreload.ui-corner-all.ui-state-default.ng-binding");
$I->click('#angular-tree > div.ui-tabs.ui-widget.ui-widget-content.ui-corner-all.tabs-container.hbox-panel.ng-isolate-scope > div.ui-tabs.ui-widget.ui-widget-content.ui-corner-all.tabs-container > div > div.browser-view.ui-tabs-panel.ui-widget-content.ui-corner-bottom.tab-pane.ng-scope.active > div.ng-scope > xim-tree > div > div.xim-treeview-btnreload.ui-corner-all.ui-state-default.ng-binding');
}

$I->click("//span[contains(text(),'Picasso')]", "#angular-tree");
$I->click('//span[contains(text(),\'Picasso\')]', '#angular-tree');
reload($I);
$I->waitForText("Picasso_Server", 3, "#angular-tree");
$I->waitForText('Picasso_Server', 3, '#angular-tree');

$I->click("//span[contains(text(),'Picasso_Server')]", "#angular-tree");
$I->click('//span[contains(text(),\'Picasso_Server\')]', '#angular-tree');
reload($I);
$I->waitForText("documents", 3, "#angular-tree");
$I->waitForText('documents', 3, '#angular-tree');

$I->click("//span[contains(text(),'documents')]", "#angular-tree");
$I->click('//span[contains(text(),\'documents\')]', '#angular-tree');
reload($I);
$I->waitForText("picasso", 3, "#angular-tree");
$I->waitForText('picasso', 3, '#angular-tree');

$I->click("//span[contains(text(),'picasso')]", "#angular-tree");
$I->click('//span[contains(text(),\'picasso\')]', '#angular-tree');
reload($I);
$I->waitForText("picasso-iden", 3, "#angular-tree");
$I->waitForText('picasso-iden', 3, '#angular-tree');

// Open picasso-iden menu
$I->click("//*[@id=\"angular-tree\"]/div[1]/div[2]/div/div[1]/div[2]/xim-tree/div/div[2]/ul/li/tree-node/span/ul/li/span/ul/li[5]/span/ul/li[3]/span/ul/li[1]/span/ul/li/span/div/span[2]");
$I->click('//*[@id="angular-tree"]/div[1]/div[2]/div/div[1]/div[2]/xim-tree/div/div[2]/ul/li/tree-node/span/ul/li/span/ul/li[5]/span/ul/li[3]/span/ul/li[1]/span/ul/li/span/div/span[2]');

$I->waitForText("Publish", 3, "body > div.xim-actions-menu.destroy-on-click.noselect.xim-actions-menu-list");
$I->waitForText('Publish', 3, 'body > div.xim-actions-menu.destroy-on-click.noselect.xim-actions-menu-list');

$I->click("body > div.xim-actions-menu.destroy-on-click.noselect.xim-actions-menu-list > div.button-container-list.icon.workflow_forward");
$I->click('body > div.xim-actions-menu.destroy-on-click.noselect.xim-actions-menu-list > div.button-container-list.icon.workflow_forward');

$I->wait(3);

$I->click('#all_levels');

$I->click("Publish", "#angular-content");
$I->click('Publish', '#angular-content');

$I->waitForText("State has been successfully changed", 3, "#angular-content");
$I->waitForText('State has been successfully changed', 3, '#angular-content');

function fileExistAndIsNotEmpty($path)
{
Expand All @@ -138,12 +138,12 @@ function fileExistAndIsNotEmpty($path)
}
$I->seeFileFound('picasso-iden-idHTML.html','data/previos');

$I->amOnPage("/data/previos/picasso-iden-idHTML.html");
$I->amOnPage('/data/previos/picasso-iden-idHTML.html');

$I->see("Picasso", ".header");
$I->see("Cubism", ".header");
$I->see('Picasso', '.header');
$I->see('Cubism', '.header');

$I->amOnPage('?action=xmleditor2&method=load&nodeid=10098');
$I->wait(3);
$I->switchToIframe('kupu-editor');
$I->see('Early periods');
$I->see('Early periods');

0 comments on commit 122b159

Please sign in to comment.