From 19546bfe9f7b37e20a59160d98dbb4b7c09e6774 Mon Sep 17 00:00:00 2001 From: Salim Ibrahim Date: Fri, 16 Dec 2016 00:47:22 -0500 Subject: [PATCH 1/4] added drupal to community-catalog --- templates/drupal/0/docker-compose.yml | 15 + templates/drupal/0/rancher-compose.yml | 54 ++ templates/drupal/catalogIcon-drupal.svg | 967 ++++++++++++++++++++++++ templates/drupal/config.yml | 6 + 4 files changed, 1042 insertions(+) create mode 100644 templates/drupal/0/docker-compose.yml create mode 100644 templates/drupal/0/rancher-compose.yml create mode 100644 templates/drupal/catalogIcon-drupal.svg create mode 100644 templates/drupal/config.yml diff --git a/templates/drupal/0/docker-compose.yml b/templates/drupal/0/docker-compose.yml new file mode 100644 index 0000000..4de1419 --- /dev/null +++ b/templates/drupal/0/docker-compose.yml @@ -0,0 +1,15 @@ +version: '2' +services: + web: + image: drupal:${drupal_tag} + ports: + - ${public_port}:80 + depends_on: + - db + db: + image: mysql:${mysql_tag} + environment: + MYSQL_DATABASE: ${database} + MYSQL_ROOT_PASSWORD: ${mysql_root_password} + MYSQL_USER: ${mysql_newusr} + MYSQL_PASSWORD: ${mysql_newusr_password} diff --git a/templates/drupal/0/rancher-compose.yml b/templates/drupal/0/rancher-compose.yml new file mode 100644 index 0000000..b73475b --- /dev/null +++ b/templates/drupal/0/rancher-compose.yml @@ -0,0 +1,54 @@ +.catalog: + name: "Drupal" + version: "v0.1.0" + description: "Drupal is an open source CMS powering millions of websites and applications." + uuid: Drupal-0 + minimum_rancher_version: v0.51.0 + questions: + - variable: drupal_tag + description: "docker image tag" + label: "Drupal Image Tag" + required: false + default: "latest" + type: "string" + + - variable: mysql_tag + description: "docker image tag" + label: "MYSQL Image Tag" + required: false + default: "latest" + type: "string" + + - variable: public_port + description: "public port to access the drupal site" + label: "Public Port" + required: true + default: "80" + type: "int" + + - variable: database + description: "database name" + label: "MYSQL_DATABASE" + required: true + type: "string" + + - variable: mysql_root_password + description: "password for root user" + label: "MYSQL_ROOT_PASSWORD" + required: true + type: "string" + + - variable: mysql_newusr + description: "new user name" + label: "MYSQL_USER" + required: false + type: "string" + + - variable: mysql_newusr_password + description: "new user password" + label: "MYSQL_USER_PASSWORD" + required: false + type: "string" + +drupal: + retain_ip: true diff --git a/templates/drupal/catalogIcon-drupal.svg b/templates/drupal/catalogIcon-drupal.svg new file mode 100644 index 0000000..c362f21 --- /dev/null +++ b/templates/drupal/catalogIcon-drupal.svg @@ -0,0 +1,967 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/drupal/config.yml b/templates/drupal/config.yml new file mode 100644 index 0000000..7dc84b4 --- /dev/null +++ b/templates/drupal/config.yml @@ -0,0 +1,6 @@ +name: Drupal +description: | + Drupal is an open source CMS powering millions of websites and applications. +version: v0.1 +category: CMS +maintainer: Salim Ibrahim From cba541bc59bc90796ea8049aae9f18fab65396bb Mon Sep 17 00:00:00 2001 From: Salim Ibrahim Date: Fri, 16 Dec 2016 06:40:02 -0500 Subject: [PATCH 2/4] bugfix: version inconsistent in config and rancher-compose. --- templates/drupal/0/rancher-compose.yml | 2 +- templates/drupal/config.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/drupal/0/rancher-compose.yml b/templates/drupal/0/rancher-compose.yml index b73475b..d42fb83 100644 --- a/templates/drupal/0/rancher-compose.yml +++ b/templates/drupal/0/rancher-compose.yml @@ -1,6 +1,6 @@ .catalog: name: "Drupal" - version: "v0.1.0" + version: "v0.1" description: "Drupal is an open source CMS powering millions of websites and applications." uuid: Drupal-0 minimum_rancher_version: v0.51.0 diff --git a/templates/drupal/config.yml b/templates/drupal/config.yml index 7dc84b4..bb0e086 100644 --- a/templates/drupal/config.yml +++ b/templates/drupal/config.yml @@ -3,4 +3,3 @@ description: | Drupal is an open source CMS powering millions of websites and applications. version: v0.1 category: CMS -maintainer: Salim Ibrahim From 22dc2a4e6924c710eee337bdf7c2d050bdd61a07 Mon Sep 17 00:00:00 2001 From: slimatic Date: Thu, 29 Dec 2016 10:50:15 -0500 Subject: [PATCH 3/4] removed mysql & drupal image variable questions --- templates/drupal/0/rancher-compose.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/templates/drupal/0/rancher-compose.yml b/templates/drupal/0/rancher-compose.yml index d42fb83..12adc41 100644 --- a/templates/drupal/0/rancher-compose.yml +++ b/templates/drupal/0/rancher-compose.yml @@ -5,20 +5,6 @@ uuid: Drupal-0 minimum_rancher_version: v0.51.0 questions: - - variable: drupal_tag - description: "docker image tag" - label: "Drupal Image Tag" - required: false - default: "latest" - type: "string" - - - variable: mysql_tag - description: "docker image tag" - label: "MYSQL Image Tag" - required: false - default: "latest" - type: "string" - - variable: public_port description: "public port to access the drupal site" label: "Public Port" From 556c2549bd0c7c2b180ed3d85b9929ef16ca5e72 Mon Sep 17 00:00:00 2001 From: slimatic Date: Thu, 29 Dec 2016 10:52:15 -0500 Subject: [PATCH 4/4] drupal and mysql images default to latest changed drupal and mysql to images to use latest images. --- templates/drupal/0/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/drupal/0/docker-compose.yml b/templates/drupal/0/docker-compose.yml index 4de1419..4030f32 100644 --- a/templates/drupal/0/docker-compose.yml +++ b/templates/drupal/0/docker-compose.yml @@ -1,13 +1,13 @@ version: '2' services: web: - image: drupal:${drupal_tag} + image: drupal ports: - ${public_port}:80 depends_on: - db db: - image: mysql:${mysql_tag} + image: mysql environment: MYSQL_DATABASE: ${database} MYSQL_ROOT_PASSWORD: ${mysql_root_password}