Skip to content

Commit

Permalink
docs(helm): added some documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
keskiju committed Sep 18, 2018
1 parent df75563 commit 8bbfedb
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 30 deletions.
61 changes: 31 additions & 30 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,48 +17,49 @@ services:
WORDPRESS_PASSWORD: initial-password-change-it-on-wp-admin-immediately # SHOW ON INFO
MARIADB_HOST: wordpress-template-database
MARIADB_PORT_NUMBER: 3306
# NOTE: For staging database (staging should not contain confidential data)
# WORDPRESS_DATABASE_NAME: wptemplatestag
# WORDPRESS_DATABASE_USER: wptemplatestag
# WORDPRESS_DATABASE_PASSWORD: ueqosGeIZMprSMglgnjq7xCImJ47qg
# NOTE: For staging database
WORDPRESS_DATABASE_NAME: wptemplatestag
WORDPRESS_DATABASE_USER: wptemplatestag
# TODO: fetch password from kubernetes!
WORDPRESS_DATABASE_PASSWORD: ueqosGeIZMprSMglgnjq7xCImJ47qg
# NOTE: For local database
WORDPRESS_DATABASE_NAME: wptemplatelocal
WORDPRESS_DATABASE_USER: wptemplatelocal
WORDPRESS_DATABASE_PASSWORD: secret
# WORDPRESS_DATABASE_NAME: wptemplatelocal
# WORDPRESS_DATABASE_USER: wptemplatelocal
# WORDPRESS_DATABASE_PASSWORD: secret

# NOTE: For staging database
# wordpress-template-database:
# container_name: wordpress-template-database
# image: taitounited/taito-cli:latest
# restart: unless-stopped
# entrypoint: /bin/sh -c "cd /project && taito db-proxy:stag 3306"
# networks:
# - default
# ports:
# - "7587:3306"
# volumes:
# - ".:/project"
# - "${HOME}/.taito:/root/.taito"
# - "${HOME}/.ssh:/root/.ssh"
# environment:
# taito_docker: 'true'

# NOTE: For local database
wordpress-template-database:
container_name: wordpress-template-database
image: mysql:5.7
image: taitounited/taito-cli:latest
restart: unless-stopped
entrypoint: /bin/sh -c "cd /project && taito db-proxy:stag 3306"
networks:
- default
ports:
- "7587:3306"
volumes:
- "./database/init:/docker-entrypoint-initdb.d"
- ".:/project"
- "${HOME}/.taito:/root/.taito"
- "${HOME}/.ssh:/root/.ssh"
environment:
MYSQL_ROOT_PASSWORD: secret
MYSQL_DATABASE: wptemplatelocal
MYSQL_USER: wptemplatelocal
MYSQL_PASSWORD: secret
taito_docker: 'true'

# NOTE: For local database
# wordpress-template-database:
# container_name: wordpress-template-database
# image: mysql:5.7
# restart: unless-stopped
# networks:
# - default
# ports:
# - "7587:3306"
# volumes:
# - "./database/init:/docker-entrypoint-initdb.d"
# environment:
# MYSQL_ROOT_PASSWORD: secret
# MYSQL_DATABASE: wptemplatelocal
# MYSQL_USER: wptemplatelocal
# MYSQL_PASSWORD: secret

networks:
default:
11 changes: 11 additions & 0 deletions scripts/helm/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# helm

This folder contains a reusable helm chart for wordpress sites. [Helm](https://helm.sh/) is a package manager for Kubernetes.

The subchart located in charts/wordpress was forked from https://github.com/bitnami/bitnami-docker-wordpress, but has been modified since:

- Added support for `externalDatabase.passwordSecretName` and `externalDatabase.passwordSecretKey` variables.
- Added support for reading db settings from environment variables: `wordpress/app-entrypoint.sh` and `wordpress/template-env.sh`
- Added support for copying data from container image to pvc on container start:
* Use `/bitnami-pvc` as mount path instead of `/bitnami`.
* Mount volumes only if `persistence.enabled` is true so that we can determine if PVC is enabled during container bootstrap.
* Copy data from container to pvc on container start: `wordpress/app-entrypoint.sh` -> `template-env.sh`

TODO: Either try to merge changes back to original chart or make a simplified custom chart.
13 changes: 13 additions & 0 deletions scripts/helm/charts/wordpress/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright (c) 2015-2018 Bitnami

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

0 comments on commit 8bbfedb

Please sign in to comment.