Skip to content
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

Docker file changes to support seperate containers #60

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Docker file changes to support seperate containers #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions classes/OpenXdmod/Setup/OnDemandDbSetup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ public function handle()
'DB Admin Password:'
);

$xdmod_host = $this->console->prompt(
'XDMoD Server name:',
'xdmod.xdmod_default'
);

try {

$sectionForDatabase = array(
Expand All @@ -67,6 +72,7 @@ public function handle()
'db_port' => $settings[$section . '_port'],
'db_user' => $settings[$section . '_user'],
'db_pass' => $settings[$section . '_pass'],
'xdmod_host'=> $xdmod_host
);

$this->createDatabases(
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "app",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/client.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "client",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/location.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "location",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/normalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "normalized",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/os.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "os",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/page_impressions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "page_impressions",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/request_method.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "request_method",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/request_path.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "request_path",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/reverse_proxy_host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "reverse_proxy_host",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/reverse_proxy_port.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "reverse_proxy_port",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/staging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "staging",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "host",
Expand Down
4 changes: 2 additions & 2 deletions configuration/etl/etl_tables.d/ood/users.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"table_definition": {
"name": "users",
"engine": "InnoDB",
"charset": "utf8mb4",
"collation": "utf8mb4_general_ci",
"charset": "utf8",
"collation": "utf8_unicode_ci",
"columns": [
{
"name": "id",
Expand Down
2 changes: 2 additions & 0 deletions tests/scripts/setup.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ selectMenuOption d

answerQuestion {DB Admin Username} root
providePassword {DB Admin Password:} {}
answerQuestion {XDMoD Server name} xdmod.xdmod_default


provideInput {Do you want to see the output*} {no}

Expand Down