diff --git a/README.md b/README.md index 6062dca8..b0d1411a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ easy. Contents: | --------- | ----------- | | ansible | build your own Kubernetes cluster | | images | images which are published to Docker Hub | -| k8s | container resources in kubernetes yaml format | +| k8s | kubernetes resources and helm charts | | lib/build | build makefile and tools | | services | non-clustered docker-compose services | | ssl | PKI certificate tools (deprecated by k8s) | @@ -121,4 +121,8 @@ Thank you to the following contributors! * [Alberto Galera](https://github.com/agalera) * [Andrew Eacott](https://github.com/andreweacott) +### Contributing + +If you want to make improvements to this software, see [CONTRIBUTING](https://github.com/instantlinux/docker-tools/blob/main/CONTRIBUTING.md). + Contents created 2017-26 under [Apache 2.0 License](https://www.apache.org/licenses/LICENSE-2.0) by Rich Braun. diff --git a/ansible/requirements.txt b/ansible/requirements.txt index b6c16c0f..ec9f69a2 100644 --- a/ansible/requirements.txt +++ b/ansible/requirements.txt @@ -1,3 +1,3 @@ ansible==12.3.0 ansible-lint==26.1.1 -pip==25.3 +pip==26.0 diff --git a/images/data-sync/helm/values.yaml b/images/data-sync/helm/values.yaml index 03395741..773ea154 100644 --- a/images/data-sync/helm/values.yaml +++ b/images/data-sync/helm/values.yaml @@ -115,9 +115,8 @@ configmap: ignore = Path data-sync/share/artifactory/data/logs/request.log ignore = Path data-sync/share/nagios/var/rw ignore = Path data-sync/share/openldap/data/lock.mdb - ignore = Path data-sync/share/snappymail/data/_data_/_default_/cache + ignore = Path data-sync/share/snappymail/data/_default_/cache ignore = Path data-sync/dos - ignore = Path data-sync/gitlab/data/gitaly ignore = Path data-sync/home/*/.kube/cache ignore = Path data-sync/jira/home/analytics-logs ignore = Path data-sync/jira/home/log/automation-jira-performance.csv diff --git a/images/mysqldump/README.md b/images/mysqldump/README.md index 00ed8aac..20542442 100644 --- a/images/mysqldump/README.md +++ b/images/mysqldump/README.md @@ -12,7 +12,7 @@ a subdirectory "mysql" in volume "backup". ### Usage Before running it, grant access to a mysql user thus: ~~~ - mysql> GRANT SELECT,RELOAD,SUPER,REPLICATION CLIENT ON *.* TO + mysql> GRANT SELECT,RELOAD,REPLICATION CLIENT ON *.* TO '$USER'@'10.%' IDENTIFIED BY '$PSWD'; ~~~ Make sure the named volume "backup" exists, and that diff --git a/k8s/Makefile.versions b/k8s/Makefile.versions index 08528982..128dfa57 100644 --- a/k8s/Makefile.versions +++ b/k8s/Makefile.versions @@ -1,10 +1,4 @@ -# Third-party versions - dockerhub -export VERSION_DASHBOARD ?= 7.10.0 -export VERSION_NGINX ?= 1.29.3-alpine -# deprecated -export VERSION_LOGSPOUT ?= v3.2.14 - -# Third-party versions - other (quay.io, k8s.gcr.io, crunchydata.com) +# Third-party versions export VERSION_CERT_MANAGER ?= 1.19.2 export VERSION_DEFAULTBACKEND ?= 1.5 export VERSION_FLANNEL ?= 0.28.0 diff --git a/k8s/README.md b/k8s/README.md index 7b14e621..8087725f 100644 --- a/k8s/README.md +++ b/k8s/README.md @@ -373,3 +373,6 @@ notes are as of Jan 2019 on version 1.13.1: place what the restore procedure is and where to get the decyption codes. The k8s-cplane ansible playbook here should help. +### Contributing + +If you want to make improvements to this software, see [CONTRIBUTING](https://github.com/instantlinux/docker-tools/blob/main/CONTRIBUTING.md). diff --git a/k8s/helm/wordpress/Chart.yaml b/k8s/helm/wordpress/Chart.yaml index 459ba5e5..e198466f 100644 --- a/k8s/helm/wordpress/Chart.yaml +++ b/k8s/helm/wordpress/Chart.yaml @@ -6,8 +6,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://build.trac.wordpress.org/browser type: application -version: 0.1.4 -appVersion: "6.1.1-php7.4-apache" +version: 0.1.5 +appVersion: "6.9.1-php8.4-apache" dependencies: - name: chartlib version: 0.1.8 diff --git a/k8s/helm/wordpress/values.yaml b/k8s/helm/wordpress/values.yaml index d74b4a64..180d8044 100644 --- a/k8s/helm/wordpress/values.yaml +++ b/k8s/helm/wordpress/values.yaml @@ -54,9 +54,12 @@ volumeMounts: - mountPath: /usr/local/etc/php/conf.d/local-php.ini name: init subPath: local-php.ini -- mountPath: /var/www/html +- mountPath: /var/www/html/wp-config.php name: share - subPath: wordpress/html + subPath: wordpress-ci/html/wp-config.php +- mountPath: /var/www/html/wp-content + name: share + subPath: wordpress/html/wp-content volumes: - name: init configMap: