From 6abe77d42c451052c7ba9ce7e1f5a6b24d14e36d Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Thu, 5 Mar 2020 09:44:56 -0500 Subject: [PATCH 1/3] feat: add optional data-source-tools to deprecate among each project --- docker/data-source-tools/docker-compose.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 docker/data-source-tools/docker-compose.yml diff --git a/docker/data-source-tools/docker-compose.yml b/docker/data-source-tools/docker-compose.yml new file mode 100644 index 0000000..18c0df6 --- /dev/null +++ b/docker/data-source-tools/docker-compose.yml @@ -0,0 +1,17 @@ +version: '2' +services: + phpmyadmin: + image: phpmyadmin/phpmyadmin:latest + container_name: sourcetoad_phpmyadmin + ports: + - 8080:80 + networks: + - st-internal + environment: + PMA_HOSTS: mariadb102,mariadb103 + PMA_USER: root + PMA_PASSWORD: root +networks: + st-internal: + external: + name: st-internal From e9c9314710f123af8d93ce319031827b9ae316f3 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Thu, 5 Mar 2020 09:46:05 -0500 Subject: [PATCH 2/3] docs: add optional notes about data source tools --- README.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d32e079..ceb5210 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ of these services, you likely would not use a docker version of them in producti ## Docker -### devop-tools (data source services / domain tools) +### Required: data source services 1. Execute `git clone git@github.com:sourcetoad/DevopsToolKit.git devop-tools` 2. `cd devop-tools` 3. `cd ./docker/data-source-services/` @@ -35,6 +35,21 @@ of these services, you likely would not use a docker version of them in producti 6. Wait for the terminal to complete executing. 7. You now have Sourcetoad data sources running and logging to the console. +### Optional: data source tools +1. Optionally included is the following tools: + * phpMyAdmin +2. `cd devop-tools` +3. `cd ./docker/data-source-tools/` +4. Execute `docker-compose up --build` +5. Wait for the terminal to complete executing. +6. You know have Sourcetoad data source tools running. + +## phpMyAdmin +If the optional tools are launched, you can find phpMyAdmin at: localhost:8080 + * It supports the following databases... + * mariadb102 + * mariadb103 + ## Examples Inside the `examples` folder you will find example Docker configurations for popular frameworks like Laravel and Yii2. From d4c597756aaaf85cd3ca78bc16698d9aacfaeeb0 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Thu, 5 Mar 2020 09:46:23 -0500 Subject: [PATCH 3/3] build: add "st-internal" to all networks to begin deprecation --- docker/data-source-services/docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/data-source-services/docker-compose.yml b/docker/data-source-services/docker-compose.yml index 4249f7b..aa95eca 100755 --- a/docker/data-source-services/docker-compose.yml +++ b/docker/data-source-services/docker-compose.yml @@ -16,6 +16,7 @@ services: - ./proxy_increase.conf:/etc/nginx/proxy.conf networks: - nginx-proxy + - st-internal postgres95: image: postgres:9.5 container_name: sourcetoad_postgres95 @@ -26,6 +27,7 @@ services: - POSTGRES_PASSWORD=postgres_pass networks: - st-postgres-95 + - st-internal command: "postgres -c logging_collector='on' -c log_directory='/var/log/postgresql' @@ -54,6 +56,7 @@ services: - MYSQL_PASSWORD=mariadb_pass networks: - st-mariadb-102 + - st-internal redis32: image: redis:3.2-alpine command: redis-server --appendonly yes @@ -62,6 +65,7 @@ services: - "6332:6379" networks: - st-redis-32 + - st-internal networks: nginx-proxy: external: