From 15d8c51d28fa2245886b732df5373eedb2dde0cf Mon Sep 17 00:00:00 2001 From: startxfr Date: Mon, 7 Dec 2015 01:42:57 +0100 Subject: update container naming and fix phpmyadmin. --- Applications/phpmyadmin/Dockerfile | 7 ++++--- Applications/phpmyadmin/docker-compose-demo.yml | 22 ++++++++++++++++++++++ Applications/phpmyadmin/docker-compose.yml | 19 +++++++++++++++++-- Services/apache/docker-compose.yml | 2 +- Services/couchbase/docker-compose.yml | 2 +- Services/mariadb/docker-compose.yml | 4 ++-- Services/memcache/docker-compose.yml | 2 +- Services/mongo/docker-compose.yml | 4 ++-- Services/nodejs/docker-compose.yml | 2 +- Services/ooconv/docker-compose.yml | 2 +- Services/php/docker-compose.yml | 2 +- Services/php/run.sh | 1 + Services/postgres/docker-compose.yml | 4 ++-- docker-compose-app.yml | 8 ++++---- docker-compose-sv.yml | 16 ++++++++-------- docker-compose.yml | 24 ++++++++++++------------ 16 files changed, 80 insertions(+), 41 deletions(-) create mode 100644 Applications/phpmyadmin/docker-compose-demo.yml diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile index 21de57a..c080a1e 100644 --- a/Applications/phpmyadmin/Dockerfile +++ b/Applications/phpmyadmin/Dockerfile @@ -5,9 +5,10 @@ RUN cd $TMP_APP_PATH && \ wget -q https://files.phpmyadmin.net/phpMyAdmin/4.5.2/phpMyAdmin-4.5.2-all-languages.zip && \ unzip phpMyAdmin-4.5.2-all-languages.zip && \ rm -f phpMyAdmin-4.5.2-all-languages.zip && \ - mv phpMyAdmin-4.5.2-all-languages pma -COPY config.inc.php $TMP_APP_PATH/pma/config.inc.php -COPY test.php $TMP_APP_PATH/pma/test.php + mv phpMyAdmin-4.5.2-all-languages/* ./ && \ + rm -rf phpMyAdmin-4.5.2-all-languages +COPY config.inc.php $TMP_APP_PATH/config.inc.php +COPY test.php $TMP_APP_PATH/test.php EXPOSE 80 443 VOLUME [$APP_PATH,$LOG_PATH] diff --git a/Applications/phpmyadmin/docker-compose-demo.yml b/Applications/phpmyadmin/docker-compose-demo.yml new file mode 100644 index 0000000..c4b9401 --- /dev/null +++ b/Applications/phpmyadmin/docker-compose-demo.yml @@ -0,0 +1,22 @@ +demo_pma: + image: startx/sv-phpmyadmin + container_name: "demo-pma" + ports: + - "81:80" + links: + - demo_db:db + environment: + CONTAINER_TYPE: "application" + CONTAINER_SERVICE: "phpmyadmin" + CONTAINER_INSTANCE: "demo-pma" + +demo_pma_db: + image: startx/sv-mariadb + container_name: "demo-pma-db" + expose: + - "3306" + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "mariadb" + CONTAINER_INSTANCE: "demo-pma-db" + MYSQL_ROOT_PASSWORD: "secretdemerde" \ No newline at end of file diff --git a/Applications/phpmyadmin/docker-compose.yml b/Applications/phpmyadmin/docker-compose.yml index 9a8d4d9..7f2f747 100644 --- a/Applications/phpmyadmin/docker-compose.yml +++ b/Applications/phpmyadmin/docker-compose.yml @@ -8,12 +8,27 @@ server: ports: - "9215:80" - "9216:443" + links: + - demo_db:db environment: CONTAINER_TYPE: "application" CONTAINER_SERVICE: "phpmyadmin" CONTAINER_INSTANCE: "application-phpmyadmin" SERVER_NAME: "localhost" - DOC_ROOT: "/data/apache" volumes: - "/tmp/container/logs/phpmyadmin:/data/logs/apache_php" - - "/tmp/container/phpmyadmin:/data/apache_php" \ No newline at end of file + - "/tmp/container/phpmyadmin:/data/apache_php" + +demo_db: + image: startx/sv-mariadb + container_name: "service-mariadb" + expose: + - "3306" + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "mariadb" + CONTAINER_INSTANCE: "service-mariadb" + MYSQL_ROOT_PASSWORD: "secretdemerde" + MYSQL_USER: "user-test" + MYSQL_PASSWORD: "pwd-test" + MYSQL_DATABASE: "db_test" \ No newline at end of file diff --git a/Services/apache/docker-compose.yml b/Services/apache/docker-compose.yml index 57bacf0..60e4b4f 100644 --- a/Services/apache/docker-compose.yml +++ b/Services/apache/docker-compose.yml @@ -1,6 +1,6 @@ server: build: ./ - container_name: "apache-server" + container_name: "service-apache" mem_limit: 500m memswap_limit: 500m cpu_shares: 2 diff --git a/Services/couchbase/docker-compose.yml b/Services/couchbase/docker-compose.yml index 1a23ea5..abb01e0 100644 --- a/Services/couchbase/docker-compose.yml +++ b/Services/couchbase/docker-compose.yml @@ -1,6 +1,6 @@ server: build: ./ - container_name: "couchbase-server" + container_name: "service-couchbase" mem_limit: 2g memswap_limit: 3g cpu_shares: 2 diff --git a/Services/mariadb/docker-compose.yml b/Services/mariadb/docker-compose.yml index 29242d7..f1a39ca 100644 --- a/Services/mariadb/docker-compose.yml +++ b/Services/mariadb/docker-compose.yml @@ -1,6 +1,6 @@ server: build: ./ - container_name: "mariadb-server" + container_name: "service-mariadb" mem_limit: 1g memswap_limit: 1g cpu_shares: 8 @@ -10,7 +10,7 @@ server: environment: CONTAINER_TYPE: "service" CONTAINER_SERVICE: "mariadb" - CONTAINER_INSTANCE: "sx-mariadb" + CONTAINER_INSTANCE: "service-mariadb" MYSQL_ROOT_PASSWORD: "secretdemerde" MYSQL_USER: "user-test" MYSQL_PASSWORD: "pwd-test" diff --git a/Services/memcache/docker-compose.yml b/Services/memcache/docker-compose.yml index a61086d..8368855 100644 --- a/Services/memcache/docker-compose.yml +++ b/Services/memcache/docker-compose.yml @@ -1,6 +1,6 @@ server: build: ./ - container_name: "memcache-server" + container_name: "service-memcache" mem_limit: 2g memswap_limit: 3g cpu_shares: 2 diff --git a/Services/mongo/docker-compose.yml b/Services/mongo/docker-compose.yml index 881d75c..427771d 100644 --- a/Services/mongo/docker-compose.yml +++ b/Services/mongo/docker-compose.yml @@ -1,6 +1,6 @@ server: build: ./ - container_name: "mongo-server" + container_name: "service-mongo" mem_limit: 2g memswap_limit: 2g cpu_shares: 10 @@ -11,7 +11,7 @@ server: environment: CONTAINER_TYPE: "service" CONTAINER_SERVICE: "mongo" - CONTAINER_INSTANCE: "sx-mongo" + CONTAINER_INSTANCE: "service-mongo" volumes: - "/tmp/container/logs/mongodb:/data/logs/mongodb" - "/tmp/container/mongodb:/data/mongodb" \ No newline at end of file diff --git a/Services/nodejs/docker-compose.yml b/Services/nodejs/docker-compose.yml index 2ae018b..b366f76 100644 --- a/Services/nodejs/docker-compose.yml +++ b/Services/nodejs/docker-compose.yml @@ -1,6 +1,6 @@ server: build: ./ - container_name: "nodejs-server" + container_name: "service-nodejs" mem_limit: 1g memswap_limit: 1g cpu_shares: 5 diff --git a/Services/ooconv/docker-compose.yml b/Services/ooconv/docker-compose.yml index 64c9f57..b22e23a 100644 --- a/Services/ooconv/docker-compose.yml +++ b/Services/ooconv/docker-compose.yml @@ -1,6 +1,6 @@ server: build: ./ - container_name: "ooconv-server" + container_name: "service-ooconv" mem_limit: 2g memswap_limit: 2g cpu_shares: 8 diff --git a/Services/php/docker-compose.yml b/Services/php/docker-compose.yml index 22b7585..fe532d9 100644 --- a/Services/php/docker-compose.yml +++ b/Services/php/docker-compose.yml @@ -1,6 +1,6 @@ server: build: ./ - container_name: "php-server" + container_name: "service-php" mem_limit: 1g memswap_limit: 1g cpu_shares: 5 diff --git a/Services/php/run.sh b/Services/php/run.sh index 657fbba..1e73c2f 100644 --- a/Services/php/run.sh +++ b/Services/php/run.sh @@ -53,6 +53,7 @@ function begin_php_config { # End configuration process just before starting daemon function end_php_config { echo "=> END APACHE + PHP CONFIGURATION" + env | grep _ >> /etc/environment } check_httpd_environment | tee -a $STARTUPLOG diff --git a/Services/postgres/docker-compose.yml b/Services/postgres/docker-compose.yml index ac008c4..5dd37c9 100644 --- a/Services/postgres/docker-compose.yml +++ b/Services/postgres/docker-compose.yml @@ -1,6 +1,6 @@ server: build: ./ - container_name: "postgres-server" + container_name: "service-postgres" mem_limit: 1g memswap_limit: 1g cpu_shares: 8 @@ -10,7 +10,7 @@ server: environment: CONTAINER_TYPE: "service" CONTAINER_SERVICE: "postgresql" - CONTAINER_INSTANCE: "sx-postgresql" + CONTAINER_INSTANCE: "service-postgres" POSTGRESQL_ROOT_PASSWORD: "secretdemerde" POSTGRESQL_USER: "user-test" POSTGRESQL_PASSWORD: "pwd-test" diff --git a/docker-compose-app.yml b/docker-compose-app.yml index 8f942d4..b2fa236 100644 --- a/docker-compose-app.yml +++ b/docker-compose-app.yml @@ -1,7 +1,7 @@ -pma: +fedora_app_pma: build: Applications/phpmyadmin/ - container_name: "startx-app-phpmyadmin" + container_name: "application-phpmyadmin" -rockmongo: +fedora_app_rockmongo: build: Applications/rockmongo/ - container_name: "startx-app-rockmongo" \ No newline at end of file + container_name: "application-rockmongo" \ No newline at end of file diff --git a/docker-compose-sv.yml b/docker-compose-sv.yml index 532ba9e..319f7a4 100644 --- a/docker-compose-sv.yml +++ b/docker-compose-sv.yml @@ -1,39 +1,39 @@ -server_apache: +fedora_sv_apache: extends: file: Services/apache/docker-compose.yml service: server -server_php: +fedora_sv_php: extends: file: Services/php/docker-compose.yml service: server -server_nodejs: +fedora_sv_nodejs: extends: file: Services/nodejs/docker-compose.yml service: server -server_mariadb: +fedora_sv_mariadb: extends: file: Services/mariadb/docker-compose.yml service: server -server_postgres: +fedora_sv_postgres: extends: file: Services/postgres/docker-compose.yml service: server -server_mongo: +fedora_sv_mongo: extends: file: Services/mongo/docker-compose.yml service: server -server_ooconv: +fedora_sv_ooconv: extends: file: Services/ooconv/docker-compose.yml service: server -server_memcache: +fedora_sv_memcache: extends: file: Services/memcache/docker-compose.yml service: server diff --git a/docker-compose.yml b/docker-compose.yml index 92c9cc4..7062fc9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,50 +3,50 @@ fedora: file: OS/docker-compose.yml service: fedora -server_apache: +fedora_sv_apache: extends: file: Services/apache/docker-compose.yml service: server -server_php: +fedora_sv_php: extends: file: Services/php/docker-compose.yml service: server -server_nodejs: +fedora_sv_nodejs: extends: file: Services/nodejs/docker-compose.yml service: server -server_mariadb: +fedora_sv_mariadb: extends: file: Services/mariadb/docker-compose.yml service: server -server_postgres: +fedora_sv_postgres: extends: file: Services/postgres/docker-compose.yml service: server -server_mongo: +fedora_sv_mongo: extends: file: Services/mongo/docker-compose.yml service: server -server_ooconv: +fedora_sv_ooconv: extends: file: Services/ooconv/docker-compose.yml service: server -server_memcache: +fedora_sv_memcache: extends: file: Services/memcache/docker-compose.yml service: server -#pma: +#fedora_app_pma: # build: Applications/phpmyadmin/ -# container_name: "startx-app-phpmyadmin" +# container_name: "application-phpmyadmin" # -#rockmongo: +#fedora_app_rockmongo: # build: Applications/rockmongo/ -# container_name: "startx-app-rockmongo" \ No newline at end of file +# container_name: "application-rockmongo" \ No newline at end of file -- cgit v1.2.1