Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down Expand Up @@ -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.
2 changes: 1 addition & 1 deletion ansible/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ansible==12.3.0
ansible-lint==26.1.1
pip==25.3
pip==26.0
3 changes: 1 addition & 2 deletions images/data-sync/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/mysqldump/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 1 addition & 7 deletions k8s/Makefile.versions
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions k8s/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
4 changes: 2 additions & 2 deletions k8s/helm/wordpress/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions k8s/helm/wordpress/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading