diff options
| -rw-r--r-- | Applications/phpmyadmin/config.inc.php | 12 | ||||
| -rw-r--r-- | Applications/phpmyadmin/docker-compose-demo.yml | 2 | ||||
| -rw-r--r-- | Services/mariadb/README.md | 2 | ||||
| -rw-r--r-- | Services/postgres/README.md | 2 | ||||
| -rw-r--r-- | docker-compose-images.yml | 140 |
5 files changed, 151 insertions, 7 deletions
diff --git a/Applications/phpmyadmin/config.inc.php b/Applications/phpmyadmin/config.inc.php index 6d46fcc..2c2f991 100644 --- a/Applications/phpmyadmin/config.inc.php +++ b/Applications/phpmyadmin/config.inc.php @@ -25,21 +25,21 @@ $i = 0; /** * First server */ -if(getenv('DB_ENV_MYSQL_USER') != '') { +if(getenv('MARIADB_ENV_MYSQL_USER') != '') { $i++; $cfg['Servers'][$i]['extension'] = 'mysqli'; $cfg['Servers'][$i]['host'] = 'db'; $cfg['Servers'][$i]['controlhost'] = ''; - $cfg['Servers'][$i]['controluser'] = getenv('DB_ENV_MYSQL_USER'); - $cfg['Servers'][$i]['controlpass'] = getenv('DB_ENV_MYSQL_PASSWORD'); + $cfg['Servers'][$i]['controluser'] = getenv('MARIADB_ENV_MYSQL_USER'); + $cfg['Servers'][$i]['controlpass'] = getenv('MARIADB_ENV_MYSQL_PASSWORD'); } -if(getenv('DB2_ENV_MYSQL_USER') != '') { +if(getenv('MARIADB2_ENV_MYSQL_USER') != '') { $i++; $cfg['Servers'][$i]['extension'] = 'mysqli'; $cfg['Servers'][$i]['host'] = 'db2'; $cfg['Servers'][$i]['controlhost'] = ''; - $cfg['Servers'][$i]['controluser'] = getenv('DB2_ENV_MYSQL_USER'); - $cfg['Servers'][$i]['controlpass'] = getenv('DB2_ENV_MYSQL_PASSWORD'); + $cfg['Servers'][$i]['controluser'] = getenv('MARIADB2_ENV_MYSQL_USER'); + $cfg['Servers'][$i]['controlpass'] = getenv('MARIADB2_ENV_MYSQL_PASSWORD'); } /** * phpMyAdmin configuration storage settings. diff --git a/Applications/phpmyadmin/docker-compose-demo.yml b/Applications/phpmyadmin/docker-compose-demo.yml index 8ba0c2c..ee816e7 100644 --- a/Applications/phpmyadmin/docker-compose-demo.yml +++ b/Applications/phpmyadmin/docker-compose-demo.yml @@ -4,7 +4,7 @@ demo_pma: ports: - "81:80" links: - - demo_pma_db:db + - demo_pma_db:mariadb environment: CONTAINER_TYPE: "application" CONTAINER_SERVICE: "phpmyadmin" diff --git a/Services/mariadb/README.md b/Services/mariadb/README.md index 1ab5a12..f940414 100644 --- a/Services/mariadb/README.md +++ b/Services/mariadb/README.md @@ -24,6 +24,8 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora) service: image: startx/sv-mariadb:latest container_name: "service-mariadb" + ports: + - "3306:3306" environment: CONTAINER_TYPE: "service" CONTAINER_SERVICE: "mariadb" diff --git a/Services/postgres/README.md b/Services/postgres/README.md index 62aee5a..d801d74 100644 --- a/Services/postgres/README.md +++ b/Services/postgres/README.md @@ -24,6 +24,8 @@ based on [startx/fedora container](https://hub.docker.com/r/startx/fedora) service: image: startx/sv-postgres:latest container_name: "service-postgres" + ports: + - "5432:5432" environment: CONTAINER_TYPE: "service" CONTAINER_SERVICE: "postgres" diff --git a/docker-compose-images.yml b/docker-compose-images.yml new file mode 100644 index 0000000..c057ef6 --- /dev/null +++ b/docker-compose-images.yml @@ -0,0 +1,140 @@ +fedora_data: + image: startx/fedora + container_name: "fedora_data" + environment: + CONTAINER_TYPE: "os" + CONTAINER_SERVICE: "fedora" + CONTAINER_INSTANCE: "fedora_data" + +fedora_sv_apache: + image: startx/sv-apache + container_name: "fedora_sv_apache" + ports: + - "81:80" + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "apache" + CONTAINER_INSTANCE: "fedora_sv_apache" + volumes_from: + - fedora_data + +fedora_sv_php: + image: startx/sv-php + container_name: "fedora_sv_php" + ports: + - "82:80" + links: + - fedora_sv_mariadb:mariadb + - fedora_sv_postgres:postgres + - fedora_sv_mongo:mongo + - fedora_sv_memcache:memcache + - fedora_sv_ooconv:ooconv + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "php" + CONTAINER_INSTANCE: "fedora_sv_php" + volumes_from: + - fedora_data + +fedora_sv_nodejs: + image: startx/sv-nodejs + container_name: "fedora_sv_nodejs" + ports: + - "83:8000" + links: + - fedora_sv_mariadb:mariadb + - fedora_sv_postgres:postgres + - fedora_sv_mongo:mongo + - fedora_sv_memcache:memcache + - fedora_sv_ooconv:ooconv + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "nodejs" + CONTAINER_INSTANCE: "fedora_sv_nodejs" + volumes_from: + - fedora_data + +fedora_sv_mariadb: + image: startx/sv-mariadb + container_name: "fedora_sv_mariadb" + expose: + - "3306" + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "mariadb" + CONTAINER_INSTANCE: "fedora_sv_mariadb" + MYSQL_USER: "user-test" + MYSQL_PASSWORD: "pwd-test" + MYSQL_DATABASE: "db_test" + volumes_from: + - fedora_data + +fedora_sv_postgres: + image: startx/sv-postgres:latest + container_name: "fedora_sv_postgres" + expose: + - "5432" + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "postgres" + CONTAINER_INSTANCE: "fedora_sv_postgres" + POSTGRESQL_USER: "user-test" + POSTGRESQL_PASSWORD: "pwd-test" + POSTGRESQL_DATABASE: "db_test" + volumes_from: + - fedora_data + +fedora_sv_mongo: + image: startx/sv-mongo + container_name: "fedora_sv_mongo" + expose: + - "27017" + - "28017" + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "mongo" + CONTAINER_INSTANCE: "fedora_sv_mongo" + volumes_from: + - fedora_data + +fedora_sv_ooconv: + image: startx/sv-ooconv + container_name: "fedora_sv_ooconv" + expose: + - "2002" + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "ooconv" + CONTAINER_INSTANCE: "fedora_sv_ooconv" + volumes_from: + - fedora_data + +fedora_sv_memcache: + image: startx/sv-memcache + container_name: "fedora_sv_memcache" + expose: + - "11211" + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "memcache" + CONTAINER_INSTANCE: "fedora_sv_memcache" + volumes_from: + - fedora_data + +#fedora_app_pma: +# image: startx/sv-phpmyadmin +# container_name: "application-phpmyadmin" +# ports: +# - "84:80" +# links: +# - fedora_sv_mariadb:mariadb +# environment: +# CONTAINER_TYPE: "application" +# CONTAINER_SERVICE: "phpmyadmin" +# CONTAINER_INSTANCE: "application-phpmyadmin" +# volumes_from: +# - fedora_data + +#fedora_app_rockmongo: +# build: Applications/rockmongo/ +# container_name: "application-rockmongo"
\ No newline at end of file |