Merge ~sergiodj/ubuntu-docker-images/+git/templates:fix-repo-ownership-name into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main
Proposed by
Sergio Durigan Junior
| Status: | Merged |
|---|---|
| Approved by: | Sergio Durigan Junior |
| Approved revision: | cbdaf7233c7964eabb77dfcb6f6278f50ae6bb3b |
| Merge reported by: | Sergio Durigan Junior |
| Merged at revision: | cbdaf7233c7964eabb77dfcb6f6278f50ae6bb3b |
| Proposed branch: | ~sergiodj/ubuntu-docker-images/+git/templates:fix-repo-ownership-name |
| Merge into: | ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main |
| Diff against target: |
349 lines (+46/-46) 17 files modified
data/apache2.yaml (+4/-4) data/bind9.yaml (+2/-2) data/cassandra.yaml (+1/-1) data/cortex.yaml (+3/-3) data/grafana.yaml (+4/-4) data/kafka.yaml (+1/-1) data/loki.yaml (+3/-3) data/memcached.yaml (+1/-1) data/mysql.yaml (+3/-3) data/nginx.yaml (+4/-4) data/postgres.yaml (+3/-3) data/prometheus-alertmanager.yaml (+3/-3) data/prometheus.yaml (+5/-5) data/redis.yaml (+3/-3) data/squid.yaml (+2/-2) data/telegraf.yaml (+3/-3) data/zookeeper.yaml (+1/-1) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Valentin Viennot (community) | Approve | ||
| Athos Ribeiro | Approve | ||
| Canonical Server Reporter | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
The ownership of the git repositories for the "ubuntu-
This means that we also need to adjust the URLs present in the documentation. For example, the URLs to example configuration files for each image are pointing to the files inside the git repos.
This commit only adjusts the data/*.yaml files. I tried regenerating the documentation but got some exceptions, so I'm leaving this part to Valentin.
To post a comment you must log in.
Revision history for this message
| Athos Ribeiro (athos-ribeiro) : | # |
review:
Approve
Revision history for this message
| Athos Ribeiro (athos-ribeiro) wrote : | # |
Revision history for this message
| Valentin Viennot (valentinviennot) wrote : | # |
Thanks! I included your changes in my MP https:/
review:
Approve
Revision history for this message
| Sergio Durigan Junior (sergiodj) wrote : | # |
Thanks, Valentin and Athos.
I won't merge this because Valentin's MP already contains my changes. When he pushes his branch, this MP should be automatically set to Merged.
Revision history for this message
| Sergio Durigan Junior (sergiodj) wrote : | # |
I think this has been merged elsewhere, so I'm closing it.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | diff --git a/data/apache2.yaml b/data/apache2.yaml | |||
| 2 | index 2f8133c..1040e24 100644 | |||
| 3 | --- a/data/apache2.yaml | |||
| 4 | +++ b/data/apache2.yaml | |||
| 5 | @@ -61,7 +61,7 @@ parameters: | |||
| 6 | 61 | description: Mount and serve a local website. | 61 | description: Mount and serve a local website. |
| 7 | 62 | - type: -v | 62 | - type: -v |
| 8 | 63 | value: /path/to/apache2.conf:/etc/apache2/apache2.conf | 63 | value: /path/to/apache2.conf:/etc/apache2/apache2.conf |
| 10 | 64 | description: Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04)). | 64 | description: Local [configuration file](https://httpd.apache.org/docs/2.4/) `apache2.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04)). |
| 11 | 65 | debug: | 65 | debug: |
| 12 | 66 | - nothing | 66 | - nothing |
| 13 | 67 | microk8s: | 67 | microk8s: |
| 14 | @@ -69,10 +69,10 @@ microk8s: | |||
| 15 | 69 | files: | 69 | files: |
| 16 | 70 | - key: apache2 | 70 | - key: apache2 |
| 17 | 71 | name: apache2.conf | 71 | name: apache2.conf |
| 19 | 72 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04 | 72 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04 |
| 20 | 73 | - key: apache2-site | 73 | - key: apache2-site |
| 21 | 74 | name: index.html | 74 | name: index.html |
| 23 | 75 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04 | 75 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04 |
| 24 | 76 | deploy: | 76 | deploy: |
| 26 | 77 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04 | 77 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04 |
| 27 | 78 | access: You will now be able to connect to the apache2 server on `http://localhost:30080`. | 78 | access: You will now be able to connect to the apache2 server on `http://localhost:30080`. |
| 28 | diff --git a/data/bind9.yaml b/data/bind9.yaml | |||
| 29 | index 4a52e08..d7ab1f2 100644 | |||
| 30 | --- a/data/bind9.yaml | |||
| 31 | +++ b/data/bind9.yaml | |||
| 32 | @@ -49,7 +49,7 @@ parameters: | |||
| 33 | 49 | description: The user which will start the `named` process. | 49 | description: The user which will start the `named` process. |
| 34 | 50 | - type: -v | 50 | - type: -v |
| 35 | 51 | value: /path/to/bind/configuration:/etc/bind/named.conf | 51 | value: /path/to/bind/configuration:/etc/bind/named.conf |
| 37 | 52 | description: Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options?h=9.18-22.04)). | 52 | description: Local [configuration file](https://bind9.readthedocs.io/en/latest/reference.html) `named.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/bind9/plain/examples/caching-nameserver/named.conf.options?h=9.18-22.04)). |
| 38 | 53 | - type: -v | 53 | - type: -v |
| 39 | 54 | value: /path/to/cached/data:/var/cache/bind | 54 | value: /path/to/cached/data:/var/cache/bind |
| 40 | 55 | description: Location where locally cached data can be dumped. | 55 | description: Location where locally cached data can be dumped. |
| 41 | @@ -60,5 +60,5 @@ debug: | |||
| 42 | 60 | - nothing | 60 | - nothing |
| 43 | 61 | microk8s: | 61 | microk8s: |
| 44 | 62 | deploy: | 62 | deploy: |
| 46 | 63 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04 | 63 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04 |
| 47 | 64 | access: You will now be able to connect to the Bind9 server on localhost:30053`. | 64 | access: You will now be able to connect to the Bind9 server on localhost:30053`. |
| 48 | diff --git a/data/cassandra.yaml b/data/cassandra.yaml | |||
| 49 | index 48d9da3..452bf8f 100644 | |||
| 50 | --- a/data/cassandra.yaml | |||
| 51 | +++ b/data/cassandra.yaml | |||
| 52 | @@ -91,5 +91,5 @@ debug: | |||
| 53 | 91 | - nothing | 91 | - nothing |
| 54 | 92 | microk8s: | 92 | microk8s: |
| 55 | 93 | deploy: | 93 | deploy: |
| 57 | 94 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04 | 94 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04 |
| 58 | 95 | access: You can now access the cassandra server on port 9042 (e.g., cqlsh localhost 9042) | 95 | access: You can now access the cassandra server on port 9042 (e.g., cqlsh localhost 9042) |
| 59 | diff --git a/data/cortex.yaml b/data/cortex.yaml | |||
| 60 | index e6aa434..0689a72 100644 | |||
| 61 | --- a/data/cortex.yaml | |||
| 62 | +++ b/data/cortex.yaml | |||
| 63 | @@ -73,7 +73,7 @@ parameters: | |||
| 64 | 73 | description: Expose Cortex on `localhost:32709`. | 73 | description: Expose Cortex on `localhost:32709`. |
| 65 | 74 | - type: -v | 74 | - type: -v |
| 66 | 75 | value: /my/local/cortex.yaml:/etc/cortex/cortex.yaml | 75 | value: /my/local/cortex.yaml:/etc/cortex/cortex.yaml |
| 68 | 76 | description: Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04)). | 76 | description: Local [configuration file](https://cortexmetrics.io/docs/configuration/) `cortex.yaml` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04)). |
| 69 | 77 | debug: | 77 | debug: |
| 70 | 78 | - nothing | 78 | - nothing |
| 71 | 79 | microk8s: | 79 | microk8s: |
| 72 | @@ -81,7 +81,7 @@ microk8s: | |||
| 73 | 81 | files: | 81 | files: |
| 74 | 82 | - key: main-config | 82 | - key: main-config |
| 75 | 83 | name: cortex.yaml | 83 | name: cortex.yaml |
| 77 | 84 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04 | 84 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04 |
| 78 | 85 | deploy: | 85 | deploy: |
| 80 | 86 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04 | 86 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04 |
| 81 | 87 | access: You will now be able to connect to the Cortex server on `localhost:32709`. | 87 | access: You will now be able to connect to the Cortex server on `localhost:32709`. |
| 82 | diff --git a/data/grafana.yaml b/data/grafana.yaml | |||
| 83 | index d000148..227d7e9 100644 | |||
| 84 | --- a/data/grafana.yaml | |||
| 85 | +++ b/data/grafana.yaml | |||
| 86 | @@ -74,16 +74,16 @@ parameters: | |||
| 87 | 74 | debug: None | 74 | debug: None |
| 88 | 75 | microk8s: | 75 | microk8s: |
| 89 | 76 | deploy: | 76 | deploy: |
| 91 | 77 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04 | 77 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04 |
| 92 | 78 | access: You will now be able to connect to the Grafana on `http://localhost:30000`. | 78 | access: You will now be able to connect to the Grafana on `http://localhost:30000`. |
| 93 | 79 | configmap: | 79 | configmap: |
| 94 | 80 | files: | 80 | files: |
| 95 | 81 | - key: grafana-datasource | 81 | - key: grafana-datasource |
| 96 | 82 | name: datasource.yml | 82 | name: datasource.yml |
| 98 | 83 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04 | 83 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04 |
| 99 | 84 | - key: grafana-dashboard-definition | 84 | - key: grafana-dashboard-definition |
| 100 | 85 | name: dashboard.yml | 85 | name: dashboard.yml |
| 102 | 86 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04 | 86 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04 |
| 103 | 87 | - key: grafana-dashboard | 87 | - key: grafana-dashboard |
| 104 | 88 | name: system-stats-dashboard.json | 88 | name: system-stats-dashboard.json |
| 106 | 89 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04 | 89 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04 |
| 107 | diff --git a/data/kafka.yaml b/data/kafka.yaml | |||
| 108 | index c995b23..9cddd71 100644 | |||
| 109 | --- a/data/kafka.yaml | |||
| 110 | +++ b/data/kafka.yaml | |||
| 111 | @@ -44,5 +44,5 @@ debug: | |||
| 112 | 44 | - nothing | 44 | - nothing |
| 113 | 45 | microk8s: | 45 | microk8s: |
| 114 | 46 | deploy: | 46 | deploy: |
| 116 | 47 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04 | 47 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04 |
| 117 | 48 | access: Apache Kafka will be available on the K8s cluster as a `kafka-service` Service. | 48 | access: Apache Kafka will be available on the K8s cluster as a `kafka-service` Service. |
| 118 | diff --git a/data/loki.yaml b/data/loki.yaml | |||
| 119 | index e81e6e8..a24b38c 100644 | |||
| 120 | --- a/data/loki.yaml | |||
| 121 | +++ b/data/loki.yaml | |||
| 122 | @@ -25,7 +25,7 @@ parameters: | |||
| 123 | 25 | description: Expose Grafana Loki on `localhost:3100`. | 25 | description: Expose Grafana Loki on `localhost:3100`. |
| 124 | 26 | - type: -v | 26 | - type: -v |
| 125 | 27 | value: /local/path/to/config:/etc/loki/local-config.yaml | 27 | value: /local/path/to/config:/etc/loki/local-config.yaml |
| 127 | 28 | description: Local Loki Promtail config file. Can be changed using CMD `--config.file=` argument. See an [example file](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config.yaml?h=2.4-22.04). | 28 | description: Local Loki Promtail config file. Can be changed using CMD `--config.file=` argument. See an [example file](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config.yaml?h=2.4-22.04). |
| 128 | 29 | - type: -v | 29 | - type: -v |
| 129 | 30 | value: lokidata:/loki | 30 | value: lokidata:/loki |
| 130 | 31 | description: Persist data in a docker volume named `lokidata`. | 31 | description: Persist data in a docker volume named `lokidata`. |
| 131 | @@ -37,7 +37,7 @@ microk8s: | |||
| 132 | 37 | files: | 37 | files: |
| 133 | 38 | - key: promtail | 38 | - key: promtail |
| 134 | 39 | name: promtail-local-config-k8s.yaml | 39 | name: promtail-local-config-k8s.yaml |
| 136 | 40 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04 | 40 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04 |
| 137 | 41 | deploy: | 41 | deploy: |
| 139 | 42 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04 | 42 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04 |
| 140 | 43 | access: You will now be able to connect to the Loki instance on `http://localhost:31000`. | 43 | access: You will now be able to connect to the Loki instance on `http://localhost:31000`. |
| 141 | diff --git a/data/memcached.yaml b/data/memcached.yaml | |||
| 142 | index 257d74d..5d11bcf 100644 | |||
| 143 | --- a/data/memcached.yaml | |||
| 144 | +++ b/data/memcached.yaml | |||
| 145 | @@ -101,5 +101,5 @@ debug: | |||
| 146 | 101 | In this case you can append the flags themselves or a shell script to the run command. | 101 | In this case you can append the flags themselves or a shell script to the run command. |
| 147 | 102 | microk8s: | 102 | microk8s: |
| 148 | 103 | deploy: | 103 | deploy: |
| 150 | 104 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04 | 104 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04 |
| 151 | 105 | access: Memcached will be listening on port `31211` in your host. | 105 | access: Memcached will be listening on port `31211` in your host. |
| 152 | diff --git a/data/mysql.yaml b/data/mysql.yaml | |||
| 153 | index ad75ce0..03adb5d 100644 | |||
| 154 | --- a/data/mysql.yaml | |||
| 155 | +++ b/data/mysql.yaml | |||
| 156 | @@ -89,7 +89,7 @@ parameters: | |||
| 157 | 89 | description: Persist data instead of initializing a new database every time you launch a new container. | 89 | description: Persist data instead of initializing a new database every time you launch a new container. |
| 158 | 90 | - type: -v | 90 | - type: -v |
| 159 | 91 | value: /path/to/config/files/:/etc/mysql/mysql.conf.d/ | 91 | value: /path/to/config/files/:/etc/mysql/mysql.conf.d/ |
| 161 | 92 | description: Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04)). | 92 | description: Local [configuration files](https://dev.mysql.com/doc/refman/8.0/en/mysql-command-options.html) (try this [example my.cnf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04)). |
| 162 | 93 | debug: | 93 | debug: |
| 163 | 94 | extraparagraph: | | 94 | extraparagraph: | |
| 164 | 95 | #### Initialization Scripts | 95 | #### Initialization Scripts |
| 165 | @@ -110,7 +110,7 @@ microk8s: | |||
| 166 | 110 | files: | 110 | files: |
| 167 | 111 | - key: main-config | 111 | - key: main-config |
| 168 | 112 | name: my-custom.cnf | 112 | name: my-custom.cnf |
| 170 | 113 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04 | 113 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04 |
| 171 | 114 | deploy: | 114 | deploy: |
| 173 | 115 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04 | 115 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04 |
| 174 | 116 | access: You will now be able to connect to the MySQL server on `localhost:30306`. | 116 | access: You will now be able to connect to the MySQL server on `localhost:30306`. |
| 175 | diff --git a/data/nginx.yaml b/data/nginx.yaml | |||
| 176 | index 73febd5..e4219cc 100644 | |||
| 177 | --- a/data/nginx.yaml | |||
| 178 | +++ b/data/nginx.yaml | |||
| 179 | @@ -64,7 +64,7 @@ parameters: | |||
| 180 | 64 | description: Mount template files inside `/etc/nginx/templates`. They will be processed and the results will be placed at `/etc/nginx/conf.d`. (e.g. `listen ${NGINX_PORT};` will generate `listen 80;`). | 64 | description: Mount template files inside `/etc/nginx/templates`. They will be processed and the results will be placed at `/etc/nginx/conf.d`. (e.g. `listen ${NGINX_PORT};` will generate `listen 80;`). |
| 181 | 65 | - type: -v | 65 | - type: -v |
| 182 | 66 | value: /path/to/nginx.conf:/etc/nginx/nginx.conf | 66 | value: /path/to/nginx.conf:/etc/nginx/nginx.conf |
| 184 | 67 | description: Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04)). | 67 | description: Local [configuration file](https://nginx.org/en/docs/) `nginx.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04)). |
| 185 | 68 | debug: | 68 | debug: |
| 186 | 69 | - nothing | 69 | - nothing |
| 187 | 70 | microk8s: | 70 | microk8s: |
| 188 | @@ -72,10 +72,10 @@ microk8s: | |||
| 189 | 72 | files: | 72 | files: |
| 190 | 73 | - key: nginx | 73 | - key: nginx |
| 191 | 74 | name: nginx.conf | 74 | name: nginx.conf |
| 193 | 75 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04 | 75 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04 |
| 194 | 76 | - key: nginx-site | 76 | - key: nginx-site |
| 195 | 77 | name: index.html | 77 | name: index.html |
| 197 | 78 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04 | 78 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04 |
| 198 | 79 | deploy: | 79 | deploy: |
| 200 | 80 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04 | 80 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04 |
| 201 | 81 | access: You will now be able to connect to the nginx server on `http://localhost:31080`. | 81 | access: You will now be able to connect to the nginx server on `http://localhost:31080`. |
| 202 | diff --git a/data/postgres.yaml b/data/postgres.yaml | |||
| 203 | index 375decc..9e3eb74 100644 | |||
| 204 | --- a/data/postgres.yaml | |||
| 205 | +++ b/data/postgres.yaml | |||
| 206 | @@ -80,7 +80,7 @@ parameters: | |||
| 207 | 80 | description: Expose Postgres on `localhost:30432`. | 80 | description: Expose Postgres on `localhost:30432`. |
| 208 | 81 | - type: -v | 81 | - type: -v |
| 209 | 82 | value: /path/to/postgresql.conf:/etc/postgresql/postgresql.conf | 82 | value: /path/to/postgresql.conf:/etc/postgresql/postgresql.conf |
| 211 | 83 | description: Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04)). | 83 | description: Local [configuration file](https://www.postgresql.org/docs/12/index.html) `postgresql.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04)). |
| 212 | 84 | - type: -v | 84 | - type: -v |
| 213 | 85 | value: /path/to/persisted/data:/var/lib/postgresql/data | 85 | value: /path/to/persisted/data:/var/lib/postgresql/data |
| 214 | 86 | description: Persist data instead of initializing a new database every time you launch a new container. | 86 | description: Persist data instead of initializing a new database every time you launch a new container. |
| 215 | @@ -104,7 +104,7 @@ microk8s: | |||
| 216 | 104 | files: | 104 | files: |
| 217 | 105 | - key: main-config | 105 | - key: main-config |
| 218 | 106 | name: postgresql.conf | 106 | name: postgresql.conf |
| 220 | 107 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04 | 107 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04 |
| 221 | 108 | deploy: | 108 | deploy: |
| 223 | 109 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04 | 109 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04 |
| 224 | 110 | access: You will now be able to connect to the Postgres server on `localhost:30306`. | 110 | access: You will now be able to connect to the Postgres server on `localhost:30306`. |
| 225 | diff --git a/data/prometheus-alertmanager.yaml b/data/prometheus-alertmanager.yaml | |||
| 226 | index 234416d..8c01e04 100644 | |||
| 227 | --- a/data/prometheus-alertmanager.yaml | |||
| 228 | +++ b/data/prometheus-alertmanager.yaml | |||
| 229 | @@ -66,7 +66,7 @@ parameters: | |||
| 230 | 66 | description: Expose Prometheus Alertmanager on `localhost:30093`. | 66 | description: Expose Prometheus Alertmanager on `localhost:30093`. |
| 231 | 67 | - type: -v | 67 | - type: -v |
| 232 | 68 | value: /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml | 68 | value: /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml |
| 234 | 69 | description: Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04)). | 69 | description: Local [configuration file](https://www.prometheus.io/docs/alerting/latest/configuration/) `alertmanager.yml` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04)). |
| 235 | 70 | - type: -v | 70 | - type: -v |
| 236 | 71 | value: /path/to/persisted/data:/alertmanager | 71 | value: /path/to/persisted/data:/alertmanager |
| 237 | 72 | description: "Persist data instead of initializing a new database for each newly launched container. **Important note**: the directory you will be using to persist the data needs to belong to `nogroup:nobody`. You can run `chown nogroup:nobody <path_to_persist_data>` before launching your container." | 72 | description: "Persist data instead of initializing a new database for each newly launched container. **Important note**: the directory you will be using to persist the data needs to belong to `nogroup:nobody`. You can run `chown nogroup:nobody <path_to_persist_data>` before launching your container." |
| 238 | @@ -78,7 +78,7 @@ microk8s: | |||
| 239 | 78 | files: | 78 | files: |
| 240 | 79 | - key: alertmanager | 79 | - key: alertmanager |
| 241 | 80 | name: alertmanager.yml | 80 | name: alertmanager.yml |
| 243 | 81 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04 | 81 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04 |
| 244 | 82 | deploy: | 82 | deploy: |
| 246 | 83 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04 | 83 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04 |
| 247 | 84 | access: You will now be able to connect to the Prometheus Alertmanager server on `localhost:30093`. | 84 | access: You will now be able to connect to the Prometheus Alertmanager server on `localhost:30093`. |
| 248 | diff --git a/data/prometheus.yaml b/data/prometheus.yaml | |||
| 249 | index 2ce4e1e..bb5ab1d 100644 | |||
| 250 | --- a/data/prometheus.yaml | |||
| 251 | +++ b/data/prometheus.yaml | |||
| 252 | @@ -80,10 +80,10 @@ parameters: | |||
| 253 | 80 | description: Expose Prometheus server on `localhost:30090`. | 80 | description: Expose Prometheus server on `localhost:30090`. |
| 254 | 81 | - type: -v | 81 | - type: -v |
| 255 | 82 | value: /path/to/prometheus.yml:/etc/prometheus/prometheus.yml | 82 | value: /path/to/prometheus.yml:/etc/prometheus/prometheus.yml |
| 257 | 83 | description: Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04)). | 83 | description: Local [configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `prometheus.yml` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04)). |
| 258 | 84 | - type: -v | 84 | - type: -v |
| 259 | 85 | value: /path/to/alerts.yml:/etc/prometheus/alerts.yml | 85 | value: /path/to/alerts.yml:/etc/prometheus/alerts.yml |
| 261 | 86 | description: Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04)). | 86 | description: Local [alert configuration file](https://prometheus.io/docs/prometheus/2.20/configuration/configuration/) `alerts.yml` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04)). |
| 262 | 87 | debug: | 87 | debug: |
| 263 | 88 | - nothing | 88 | - nothing |
| 264 | 89 | microk8s: | 89 | microk8s: |
| 265 | @@ -91,10 +91,10 @@ microk8s: | |||
| 266 | 91 | files: | 91 | files: |
| 267 | 92 | - key: prometheus | 92 | - key: prometheus |
| 268 | 93 | name: prometheus.yml | 93 | name: prometheus.yml |
| 270 | 94 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04 | 94 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04 |
| 271 | 95 | - key: prometheus-alerts | 95 | - key: prometheus-alerts |
| 272 | 96 | name: alerts.yml | 96 | name: alerts.yml |
| 274 | 97 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04 | 97 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04 |
| 275 | 98 | deploy: | 98 | deploy: |
| 277 | 99 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04 | 99 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04 |
| 278 | 100 | access: You will now be able to connect to the Prometheus on `http://localhost:30090`. | 100 | access: You will now be able to connect to the Prometheus on `http://localhost:30090`. |
| 279 | diff --git a/data/redis.yaml b/data/redis.yaml | |||
| 280 | index 7b6089c..d15a64b 100644 | |||
| 281 | --- a/data/redis.yaml | |||
| 282 | +++ b/data/redis.yaml | |||
| 283 | @@ -81,7 +81,7 @@ parameters: | |||
| 284 | 81 | - type: -v | 81 | - type: -v |
| 285 | 82 | value: /path/to/redis.conf:/etc/redis/redis.conf | 82 | value: /path/to/redis.conf:/etc/redis/redis.conf |
| 286 | 83 | description: > | 83 | description: > |
| 288 | 84 | Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04)). | 84 | Local [configuration file](https://redis.io/topics/config) `redis.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04)). |
| 289 | 85 | **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines. | 85 | **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines. |
| 290 | 86 | debug: | 86 | debug: |
| 291 | 87 | network: | 87 | network: |
| 292 | @@ -102,7 +102,7 @@ microk8s: | |||
| 293 | 102 | files: | 102 | files: |
| 294 | 103 | - key: redis | 103 | - key: redis |
| 295 | 104 | name: redis.conf | 104 | name: redis.conf |
| 297 | 105 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04 | 105 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04 |
| 298 | 106 | deploy: | 106 | deploy: |
| 300 | 107 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04 | 107 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04 |
| 301 | 108 | access: You will now be able to connect to the Redis server on `localhost:30073`. | 108 | access: You will now be able to connect to the Redis server on `localhost:30073`. |
| 302 | diff --git a/data/squid.yaml b/data/squid.yaml | |||
| 303 | index e5c20f6..75c5c9c 100644 | |||
| 304 | --- a/data/squid.yaml | |||
| 305 | +++ b/data/squid.yaml | |||
| 306 | @@ -66,7 +66,7 @@ microk8s: | |||
| 307 | 66 | files: | 66 | files: |
| 308 | 67 | - key: squid | 67 | - key: squid |
| 309 | 68 | name: squid.conf | 68 | name: squid.conf |
| 311 | 69 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04 | 69 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04 |
| 312 | 70 | deploy: | 70 | deploy: |
| 314 | 71 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04 | 71 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04 |
| 315 | 72 | access: You can now access the squid proxy on port 3128 | 72 | access: You can now access the squid proxy on port 3128 |
| 316 | diff --git a/data/telegraf.yaml b/data/telegraf.yaml | |||
| 317 | index aacae43..0aeb54f 100644 | |||
| 318 | --- a/data/telegraf.yaml | |||
| 319 | +++ b/data/telegraf.yaml | |||
| 320 | @@ -61,7 +61,7 @@ parameters: | |||
| 321 | 61 | description: Expose Telegraf on `localhost:30273`. | 61 | description: Expose Telegraf on `localhost:30273`. |
| 322 | 62 | - type: -v | 62 | - type: -v |
| 323 | 63 | value: /path/to/telegraf.conf:/etc/telegraf/telegraf.conf | 63 | value: /path/to/telegraf.conf:/etc/telegraf/telegraf.conf |
| 325 | 64 | description: Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04)). | 64 | description: Local [configuration file](https://docs.influxdata.com/telegraf/) `telegraf.conf` (try [this example](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04)). |
| 326 | 65 | debug: | 65 | debug: |
| 327 | 66 | - nothing | 66 | - nothing |
| 328 | 67 | microk8s: | 67 | microk8s: |
| 329 | @@ -69,7 +69,7 @@ microk8s: | |||
| 330 | 69 | files: | 69 | files: |
| 331 | 70 | - key: main-config | 70 | - key: main-config |
| 332 | 71 | name: telegraf.conf | 71 | name: telegraf.conf |
| 334 | 72 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04 | 72 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04 |
| 335 | 73 | deploy: | 73 | deploy: |
| 337 | 74 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04 | 74 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04 |
| 338 | 75 | access: You will now be able to connect to the Telegraf server on `localhost:30073`. | 75 | access: You will now be able to connect to the Telegraf server on `localhost:30073`. |
| 339 | diff --git a/data/zookeeper.yaml b/data/zookeeper.yaml | |||
| 340 | index 213225a..eb5beef 100644 | |||
| 341 | --- a/data/zookeeper.yaml | |||
| 342 | +++ b/data/zookeeper.yaml | |||
| 343 | @@ -32,5 +32,5 @@ debug: | |||
| 344 | 32 | - nothing | 32 | - nothing |
| 345 | 33 | microk8s: | 33 | microk8s: |
| 346 | 34 | deploy: | 34 | deploy: |
| 348 | 35 | link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04 | 35 | link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04 |
| 349 | 36 | access: Apache Kafka will be available on the K8s cluster as a `kafka-service` Service. | 36 | access: Apache Kafka will be available on the K8s cluster as a `kafka-service` Service. |
Thanks, Sergio!