Merge ~valentinviennot/ubuntu-docker-images:deprecate-21.10 into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main
- Git
- lp:~valentinviennot/ubuntu-docker-images
- deprecate-21.10
- Merge into main
Proposed by
Valentin Viennot
Status: | Needs review |
---|---|
Proposed branch: | ~valentinviennot/ubuntu-docker-images:deprecate-21.10 |
Merge into: | ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main |
Diff against target: |
2958 lines (+676/-299) 71 files modified
data/apache2.yaml (+9/-4) data/bind9.yaml (+7/-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 (+6/-1) data/mysql.yaml (+8/-3) data/nginx.yaml (+9/-4) data/postgres.yaml (+8/-3) data/prometheus-alertmanager.yaml (+3/-3) data/prometheus.yaml (+5/-5) data/redis.yaml (+8/-3) data/squid.yaml (+7/-2) data/telegraf.yaml (+8/-3) data/zookeeper.yaml (+1/-1) docs/docker.io/ubuntu/apache2.md (+15/-7) docs/docker.io/ubuntu/bind9.md (+13/-5) docs/docker.io/ubuntu/cassandra.md (+11/-3) docs/docker.io/ubuntu/cortex.md (+13/-5) docs/docker.io/ubuntu/grafana.md (+12/-4) docs/docker.io/ubuntu/kafka.md (+11/-3) docs/docker.io/ubuntu/loki.md (+13/-5) docs/docker.io/ubuntu/memcached.md (+13/-5) docs/docker.io/ubuntu/mysql.md (+15/-7) docs/docker.io/ubuntu/nginx.md (+15/-7) docs/docker.io/ubuntu/postgres.md (+14/-6) docs/docker.io/ubuntu/prometheus-alertmanager.md (+13/-5) docs/docker.io/ubuntu/prometheus.md (+14/-6) docs/docker.io/ubuntu/redis.md (+15/-7) docs/docker.io/ubuntu/squid.md (+13/-5) docs/docker.io/ubuntu/telegraf.md (+15/-7) docs/docker.io/ubuntu/zookeeper.md (+11/-3) docs/public.ecr.aws/lts/apache2.md (+9/-4) docs/public.ecr.aws/lts/bind9.md (+8/-3) docs/public.ecr.aws/lts/cassandra.md (+7/-2) docs/public.ecr.aws/lts/cortex.md (+9/-4) docs/public.ecr.aws/lts/grafana.md (+8/-3) docs/public.ecr.aws/lts/kafka.md (+7/-2) docs/public.ecr.aws/lts/loki.md (+9/-4) docs/public.ecr.aws/lts/memcached.md (+7/-2) docs/public.ecr.aws/lts/mysql.md (+9/-4) docs/public.ecr.aws/lts/nginx.md (+9/-4) docs/public.ecr.aws/lts/postgres.md (+9/-4) docs/public.ecr.aws/lts/prometheus-alertmanager.md (+9/-4) docs/public.ecr.aws/lts/prometheus.md (+10/-5) docs/public.ecr.aws/lts/redis.md (+9/-4) docs/public.ecr.aws/lts/squid.md (+8/-3) docs/public.ecr.aws/lts/telegraf.md (+9/-4) docs/public.ecr.aws/lts/zookeeper.md (+7/-2) docs/public.ecr.aws/ubuntu/apache2.md (+14/-8) docs/public.ecr.aws/ubuntu/bind9.md (+12/-6) docs/public.ecr.aws/ubuntu/cassandra.md (+9/-3) docs/public.ecr.aws/ubuntu/cortex.md (+11/-5) docs/public.ecr.aws/ubuntu/grafana.md (+10/-4) docs/public.ecr.aws/ubuntu/kafka.md (+9/-3) docs/public.ecr.aws/ubuntu/loki.md (+11/-5) docs/public.ecr.aws/ubuntu/memcached.md (+12/-6) docs/public.ecr.aws/ubuntu/mysql.md (+15/-9) docs/public.ecr.aws/ubuntu/nginx.md (+14/-8) docs/public.ecr.aws/ubuntu/postgres.md (+14/-8) docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md (+11/-5) docs/public.ecr.aws/ubuntu/prometheus.md (+12/-6) docs/public.ecr.aws/ubuntu/redis.md (+15/-9) docs/public.ecr.aws/ubuntu/squid.md (+12/-6) docs/public.ecr.aws/ubuntu/telegraf.md (+14/-8) docs/public.ecr.aws/ubuntu/zookeeper.md (+9/-3) templates/README_DOCKERHUB.md (+4/-1) templates/README_ECR.md (+2/-1) templates/channels_message.md (+6/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Durigan Junior | Approve | ||
Review via email: mp+429492@code.launchpad.net |
Commit message
- Deprecate the 21.10 tracks
- Clarify channels description
- Includes https:/
- Generate new data
Description of the change
To post a comment you must log in.
Unmerged commits
- 120990e... by Valentin Viennot
-
generate new data
Signed-off-by: Valentin Viennot <email address hidden>
- 21c0cd4... by Valentin Viennot
-
update template to clarify
Signed-off-by: Valentin Viennot <email address hidden>
- 4632226... by Valentin Viennot
-
Update data to deprecate 21.10
Signed-off-by: Valentin Viennot <email address hidden>
- cbdaf72... by Sergio Durigan Junior
-
Fix URLs of git repositories (ownership changed)
The ownership of the git repos for the ubuntu-
docker- images project
has recently changed, so we have to adjust the URLs here as well.Signed-off-by: Sergio Durigan Junior <email address hidden>
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..283a035 100644 |
3 | --- a/data/apache2.yaml |
4 | +++ b/data/apache2.yaml |
5 | @@ -16,6 +16,11 @@ releases: |
6 | risk: beta |
7 | version: '2.4.48' |
8 | base: '21.10' |
9 | + deprecated: |
10 | + date: '07/2022' |
11 | + path: |
12 | + track: '2.4' |
13 | + base: '22.04' |
14 | architectures: |
15 | - amd64 |
16 | - arm64 |
17 | @@ -61,7 +66,7 @@ parameters: |
18 | description: Mount and serve a local website. |
19 | - type: -v |
20 | value: /path/to/apache2.conf:/etc/apache2/apache2.conf |
21 | - 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)). |
22 | + 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)). |
23 | debug: |
24 | - nothing |
25 | microk8s: |
26 | @@ -69,10 +74,10 @@ microk8s: |
27 | files: |
28 | - key: apache2 |
29 | name: apache2.conf |
30 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04 |
31 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04 |
32 | - key: apache2-site |
33 | name: index.html |
34 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04 |
35 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04 |
36 | deploy: |
37 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04 |
38 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04 |
39 | access: You will now be able to connect to the apache2 server on `http://localhost:30080`. |
40 | diff --git a/data/bind9.yaml b/data/bind9.yaml |
41 | index 4a52e08..985db2d 100644 |
42 | --- a/data/bind9.yaml |
43 | +++ b/data/bind9.yaml |
44 | @@ -18,6 +18,11 @@ releases: |
45 | risk: beta |
46 | version: '9.16.15' |
47 | base: '21.10' |
48 | + deprecated: |
49 | + date: '07/2022' |
50 | + path: |
51 | + track: '9.18' |
52 | + base: '22.04' |
53 | architectures: |
54 | - amd64 |
55 | - arm64 |
56 | @@ -49,7 +54,7 @@ parameters: |
57 | description: The user which will start the `named` process. |
58 | - type: -v |
59 | value: /path/to/bind/configuration:/etc/bind/named.conf |
60 | - 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)). |
61 | + 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)). |
62 | - type: -v |
63 | value: /path/to/cached/data:/var/cache/bind |
64 | description: Location where locally cached data can be dumped. |
65 | @@ -60,5 +65,5 @@ debug: |
66 | - nothing |
67 | microk8s: |
68 | deploy: |
69 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04 |
70 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04 |
71 | access: You will now be able to connect to the Bind9 server on localhost:30053`. |
72 | diff --git a/data/cassandra.yaml b/data/cassandra.yaml |
73 | index 48d9da3..452bf8f 100644 |
74 | --- a/data/cassandra.yaml |
75 | +++ b/data/cassandra.yaml |
76 | @@ -91,5 +91,5 @@ debug: |
77 | - nothing |
78 | microk8s: |
79 | deploy: |
80 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04 |
81 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04 |
82 | access: You can now access the cassandra server on port 9042 (e.g., cqlsh localhost 9042) |
83 | diff --git a/data/cortex.yaml b/data/cortex.yaml |
84 | index e6aa434..0689a72 100644 |
85 | --- a/data/cortex.yaml |
86 | +++ b/data/cortex.yaml |
87 | @@ -73,7 +73,7 @@ parameters: |
88 | description: Expose Cortex on `localhost:32709`. |
89 | - type: -v |
90 | value: /my/local/cortex.yaml:/etc/cortex/cortex.yaml |
91 | - 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)). |
92 | + 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)). |
93 | debug: |
94 | - nothing |
95 | microk8s: |
96 | @@ -81,7 +81,7 @@ microk8s: |
97 | files: |
98 | - key: main-config |
99 | name: cortex.yaml |
100 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04 |
101 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04 |
102 | deploy: |
103 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04 |
104 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04 |
105 | access: You will now be able to connect to the Cortex server on `localhost:32709`. |
106 | diff --git a/data/grafana.yaml b/data/grafana.yaml |
107 | index d000148..227d7e9 100644 |
108 | --- a/data/grafana.yaml |
109 | +++ b/data/grafana.yaml |
110 | @@ -74,16 +74,16 @@ parameters: |
111 | debug: None |
112 | microk8s: |
113 | deploy: |
114 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04 |
115 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04 |
116 | access: You will now be able to connect to the Grafana on `http://localhost:30000`. |
117 | configmap: |
118 | files: |
119 | - key: grafana-datasource |
120 | name: datasource.yml |
121 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04 |
122 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04 |
123 | - key: grafana-dashboard-definition |
124 | name: dashboard.yml |
125 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04 |
126 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04 |
127 | - key: grafana-dashboard |
128 | name: system-stats-dashboard.json |
129 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04 |
130 | + 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 |
131 | diff --git a/data/kafka.yaml b/data/kafka.yaml |
132 | index c995b23..9cddd71 100644 |
133 | --- a/data/kafka.yaml |
134 | +++ b/data/kafka.yaml |
135 | @@ -44,5 +44,5 @@ debug: |
136 | - nothing |
137 | microk8s: |
138 | deploy: |
139 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04 |
140 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04 |
141 | access: Apache Kafka will be available on the K8s cluster as a `kafka-service` Service. |
142 | diff --git a/data/loki.yaml b/data/loki.yaml |
143 | index e81e6e8..a24b38c 100644 |
144 | --- a/data/loki.yaml |
145 | +++ b/data/loki.yaml |
146 | @@ -25,7 +25,7 @@ parameters: |
147 | description: Expose Grafana Loki on `localhost:3100`. |
148 | - type: -v |
149 | value: /local/path/to/config:/etc/loki/local-config.yaml |
150 | - 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). |
151 | + 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). |
152 | - type: -v |
153 | value: lokidata:/loki |
154 | description: Persist data in a docker volume named `lokidata`. |
155 | @@ -37,7 +37,7 @@ microk8s: |
156 | files: |
157 | - key: promtail |
158 | name: promtail-local-config-k8s.yaml |
159 | - 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 |
160 | + 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 |
161 | deploy: |
162 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04 |
163 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04 |
164 | access: You will now be able to connect to the Loki instance on `http://localhost:31000`. |
165 | diff --git a/data/memcached.yaml b/data/memcached.yaml |
166 | index 257d74d..f0d4542 100644 |
167 | --- a/data/memcached.yaml |
168 | +++ b/data/memcached.yaml |
169 | @@ -16,6 +16,11 @@ releases: |
170 | risk: beta |
171 | version: '1.6.9' |
172 | base: '21.10' |
173 | + deprecated: |
174 | + date: '07/2022' |
175 | + path: |
176 | + track: '1.6' |
177 | + base: '22.04' |
178 | architectures: |
179 | - amd64 |
180 | - arm64 |
181 | @@ -101,5 +106,5 @@ debug: |
182 | In this case you can append the flags themselves or a shell script to the run command. |
183 | microk8s: |
184 | deploy: |
185 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04 |
186 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04 |
187 | access: Memcached will be listening on port `31211` in your host. |
188 | diff --git a/data/mysql.yaml b/data/mysql.yaml |
189 | index ad75ce0..4e9304e 100644 |
190 | --- a/data/mysql.yaml |
191 | +++ b/data/mysql.yaml |
192 | @@ -19,6 +19,11 @@ releases: |
193 | risk: beta |
194 | version: '8.0.27' |
195 | base: '21.10' |
196 | + deprecated: |
197 | + date: '07/2022' |
198 | + path: |
199 | + track: '8.0' |
200 | + base: '22.04' |
201 | architectures: |
202 | - amd64 |
203 | - arm64 |
204 | @@ -89,7 +94,7 @@ parameters: |
205 | description: Persist data instead of initializing a new database every time you launch a new container. |
206 | - type: -v |
207 | value: /path/to/config/files/:/etc/mysql/mysql.conf.d/ |
208 | - 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)). |
209 | + 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)). |
210 | debug: |
211 | extraparagraph: | |
212 | #### Initialization Scripts |
213 | @@ -110,7 +115,7 @@ microk8s: |
214 | files: |
215 | - key: main-config |
216 | name: my-custom.cnf |
217 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04 |
218 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04 |
219 | deploy: |
220 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04 |
221 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04 |
222 | access: You will now be able to connect to the MySQL server on `localhost:30306`. |
223 | diff --git a/data/nginx.yaml b/data/nginx.yaml |
224 | index 73febd5..89e96f0 100644 |
225 | --- a/data/nginx.yaml |
226 | +++ b/data/nginx.yaml |
227 | @@ -16,6 +16,11 @@ releases: |
228 | risk: beta |
229 | version: '1.18.0' |
230 | base: '21.10' |
231 | + deprecated: |
232 | + date: '07/2022' |
233 | + path: |
234 | + track: '1.18' |
235 | + base: '22.04' |
236 | architectures: |
237 | - amd64 |
238 | - arm64 |
239 | @@ -64,7 +69,7 @@ parameters: |
240 | 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;`). |
241 | - type: -v |
242 | value: /path/to/nginx.conf:/etc/nginx/nginx.conf |
243 | - 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)). |
244 | + 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)). |
245 | debug: |
246 | - nothing |
247 | microk8s: |
248 | @@ -72,10 +77,10 @@ microk8s: |
249 | files: |
250 | - key: nginx |
251 | name: nginx.conf |
252 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04 |
253 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04 |
254 | - key: nginx-site |
255 | name: index.html |
256 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04 |
257 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04 |
258 | deploy: |
259 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04 |
260 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04 |
261 | access: You will now be able to connect to the nginx server on `http://localhost:31080`. |
262 | diff --git a/data/postgres.yaml b/data/postgres.yaml |
263 | index 375decc..a6227e2 100644 |
264 | --- a/data/postgres.yaml |
265 | +++ b/data/postgres.yaml |
266 | @@ -16,6 +16,11 @@ releases: |
267 | risk: beta |
268 | version: '13.1' |
269 | base: '21.10' |
270 | + deprecated: |
271 | + date: '07/2022' |
272 | + path: |
273 | + track: '14' |
274 | + base: '22.04' |
275 | architectures: |
276 | - amd64 |
277 | - arm64 |
278 | @@ -80,7 +85,7 @@ parameters: |
279 | description: Expose Postgres on `localhost:30432`. |
280 | - type: -v |
281 | value: /path/to/postgresql.conf:/etc/postgresql/postgresql.conf |
282 | - 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)). |
283 | + 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)). |
284 | - type: -v |
285 | value: /path/to/persisted/data:/var/lib/postgresql/data |
286 | description: Persist data instead of initializing a new database every time you launch a new container. |
287 | @@ -104,7 +109,7 @@ microk8s: |
288 | files: |
289 | - key: main-config |
290 | name: postgresql.conf |
291 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04 |
292 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04 |
293 | deploy: |
294 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04 |
295 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04 |
296 | access: You will now be able to connect to the Postgres server on `localhost:30306`. |
297 | diff --git a/data/prometheus-alertmanager.yaml b/data/prometheus-alertmanager.yaml |
298 | index 234416d..8c01e04 100644 |
299 | --- a/data/prometheus-alertmanager.yaml |
300 | +++ b/data/prometheus-alertmanager.yaml |
301 | @@ -66,7 +66,7 @@ parameters: |
302 | description: Expose Prometheus Alertmanager on `localhost:30093`. |
303 | - type: -v |
304 | value: /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml |
305 | - 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)). |
306 | + 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)). |
307 | - type: -v |
308 | value: /path/to/persisted/data:/alertmanager |
309 | 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." |
310 | @@ -78,7 +78,7 @@ microk8s: |
311 | files: |
312 | - key: alertmanager |
313 | name: alertmanager.yml |
314 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04 |
315 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04 |
316 | deploy: |
317 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04 |
318 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04 |
319 | access: You will now be able to connect to the Prometheus Alertmanager server on `localhost:30093`. |
320 | diff --git a/data/prometheus.yaml b/data/prometheus.yaml |
321 | index 2ce4e1e..bb5ab1d 100644 |
322 | --- a/data/prometheus.yaml |
323 | +++ b/data/prometheus.yaml |
324 | @@ -80,10 +80,10 @@ parameters: |
325 | description: Expose Prometheus server on `localhost:30090`. |
326 | - type: -v |
327 | value: /path/to/prometheus.yml:/etc/prometheus/prometheus.yml |
328 | - 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)). |
329 | + 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)). |
330 | - type: -v |
331 | value: /path/to/alerts.yml:/etc/prometheus/alerts.yml |
332 | - 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)). |
333 | + 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)). |
334 | debug: |
335 | - nothing |
336 | microk8s: |
337 | @@ -91,10 +91,10 @@ microk8s: |
338 | files: |
339 | - key: prometheus |
340 | name: prometheus.yml |
341 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04 |
342 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04 |
343 | - key: prometheus-alerts |
344 | name: alerts.yml |
345 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04 |
346 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04 |
347 | deploy: |
348 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04 |
349 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04 |
350 | access: You will now be able to connect to the Prometheus on `http://localhost:30090`. |
351 | diff --git a/data/redis.yaml b/data/redis.yaml |
352 | index 7b6089c..bbf6465 100644 |
353 | --- a/data/redis.yaml |
354 | +++ b/data/redis.yaml |
355 | @@ -18,6 +18,11 @@ releases: |
356 | base: '21.10' |
357 | version: '6.0.15' |
358 | risk: beta |
359 | + deprecated: |
360 | + date: '07/2022' |
361 | + path: |
362 | + track: '6.2' |
363 | + base: '22.04' |
364 | architectures: |
365 | - amd64 |
366 | - arm64 |
367 | @@ -81,7 +86,7 @@ parameters: |
368 | - type: -v |
369 | value: /path/to/redis.conf:/etc/redis/redis.conf |
370 | description: > |
371 | - 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)). |
372 | + 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)). |
373 | **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines. |
374 | debug: |
375 | network: |
376 | @@ -102,7 +107,7 @@ microk8s: |
377 | files: |
378 | - key: redis |
379 | name: redis.conf |
380 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04 |
381 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04 |
382 | deploy: |
383 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04 |
384 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04 |
385 | access: You will now be able to connect to the Redis server on `localhost:30073`. |
386 | diff --git a/data/squid.yaml b/data/squid.yaml |
387 | index e5c20f6..7a338e8 100644 |
388 | --- a/data/squid.yaml |
389 | +++ b/data/squid.yaml |
390 | @@ -20,6 +20,11 @@ releases: |
391 | risk: beta |
392 | version: '4.13' |
393 | base: '21.10' |
394 | + deprecated: |
395 | + date: '07/2022' |
396 | + path: |
397 | + track: '5.2' |
398 | + base: '22.04' |
399 | architectures: |
400 | - amd64 |
401 | - arm64 |
402 | @@ -66,7 +71,7 @@ microk8s: |
403 | files: |
404 | - key: squid |
405 | name: squid.conf |
406 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04 |
407 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04 |
408 | deploy: |
409 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04 |
410 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04 |
411 | access: You can now access the squid proxy on port 3128 |
412 | diff --git a/data/telegraf.yaml b/data/telegraf.yaml |
413 | index aacae43..ab3262b 100644 |
414 | --- a/data/telegraf.yaml |
415 | +++ b/data/telegraf.yaml |
416 | @@ -15,6 +15,11 @@ releases: |
417 | risk: beta |
418 | version: '1.19.2' |
419 | base: '21.10' |
420 | + deprecated: |
421 | + date: '07/2022' |
422 | + path: |
423 | + track: '1.21' |
424 | + base: '22.04' |
425 | architectures: |
426 | - amd64 |
427 | - arm64 |
428 | @@ -61,7 +66,7 @@ parameters: |
429 | description: Expose Telegraf on `localhost:30273`. |
430 | - type: -v |
431 | value: /path/to/telegraf.conf:/etc/telegraf/telegraf.conf |
432 | - 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)). |
433 | + 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)). |
434 | debug: |
435 | - nothing |
436 | microk8s: |
437 | @@ -69,7 +74,7 @@ microk8s: |
438 | files: |
439 | - key: main-config |
440 | name: telegraf.conf |
441 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04 |
442 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04 |
443 | deploy: |
444 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04 |
445 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04 |
446 | access: You will now be able to connect to the Telegraf server on `localhost:30073`. |
447 | diff --git a/data/zookeeper.yaml b/data/zookeeper.yaml |
448 | index 213225a..eb5beef 100644 |
449 | --- a/data/zookeeper.yaml |
450 | +++ b/data/zookeeper.yaml |
451 | @@ -32,5 +32,5 @@ debug: |
452 | - nothing |
453 | microk8s: |
454 | deploy: |
455 | - link: https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04 |
456 | + link: https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04 |
457 | access: Apache Kafka will be available on the K8s cluster as a `kafka-service` Service. |
458 | diff --git a/docs/docker.io/ubuntu/apache2.md b/docs/docker.io/ubuntu/apache2.md |
459 | index b77a473..54a9389 100644 |
460 | --- a/docs/docker.io/ubuntu/apache2.md |
461 | +++ b/docs/docker.io/ubuntu/apache2.md |
462 | @@ -1,6 +1,9 @@ |
463 | # Apache2 | Ubuntu |
464 | |
465 | -Current Apache2 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache2 or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
466 | +Current Apache2 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
467 | +Receives security updates and tracks the newest combination of Apache2 and Ubuntu. |
468 | +**This repository is free to use and exempted from per-user rate limits.** |
469 | + |
470 | |
471 | |
472 | ## About Apache2 |
473 | @@ -20,11 +23,15 @@ _Tags in italics are not available in ubuntu/apache2 but are shown here for comp |
474 | | Channel Tag | | | Currently | Architectures | |
475 | |---|---|---|---|---| |
476 | | **`2.4-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Apache2 2.4 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
477 | - | `2.4-21.10_beta` | | | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
478 | | `2.4-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Apache2 2.4.41 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
479 | | _`track_risk`_ | |
480 | |
481 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
482 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
483 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
484 | +More risky channels are always implicitly available. |
485 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
486 | +When `stable` is listed, all four are available. |
487 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
488 | |
489 | ### Commercial use and Extended Security Maintenance channels |
490 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
491 | @@ -45,7 +52,7 @@ Access your Apache2 server at `http://localhost:8080`. |
492 | | `-e TZ=UTC` | Timezone. | |
493 | | `-p 8080:80` | Expose Apache2 on `localhost:8080`. | |
494 | | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. | |
495 | -| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | 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)). | |
496 | +| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | 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)). | |
497 | |
498 | |
499 | #### Testing/Debugging |
500 | @@ -68,8 +75,8 @@ docker exec -it apache2-container /bin/bash |
501 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
502 | |
503 | Download |
504 | -[apache2.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04) and |
505 | -[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-22.04_beta`), then: |
506 | +[apache2.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04), [index.html](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04) and |
507 | +[apache2-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-22.04_beta`), then: |
508 | |
509 | ```sh |
510 | kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html |
511 | @@ -96,6 +103,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
512 | |
513 | | Track | Version | EOL | Upgrade Path | |
514 | |---|---|---|---| |
515 | - | ~~2.4-21.04~~ | Apache2 2.4.46 on Ubuntu 21.04 | 01/2022 | 2.4-21.10_beta | |
516 | + | ~~2.4-21.10~~ | Apache2 2.4.48 on Ubuntu 21.10 | 07/2022 | 2.4-22.04_beta | |
517 | + | ~~2.4-21.04~~ | Apache2 2.4.46 on Ubuntu 21.04 | 01/2022 | ~~2.4-21.10~~ | |
518 | | _`track`_ | |
519 | |
520 | diff --git a/docs/docker.io/ubuntu/bind9.md b/docs/docker.io/ubuntu/bind9.md |
521 | index 327f7c7..724f510 100644 |
522 | --- a/docs/docker.io/ubuntu/bind9.md |
523 | +++ b/docs/docker.io/ubuntu/bind9.md |
524 | @@ -1,6 +1,9 @@ |
525 | # Bind9 | Ubuntu |
526 | |
527 | -Current Bind9 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Bind9 or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
528 | +Current Bind9 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
529 | +Receives security updates and tracks the newest combination of Bind9 and Ubuntu. |
530 | +**This repository is free to use and exempted from per-user rate limits.** |
531 | + |
532 | |
533 | |
534 | ## About Bind9 |
535 | @@ -20,11 +23,15 @@ _Tags in italics are not available in ubuntu/bind9 but are shown here for comple |
536 | | Channel Tag | | | Currently | Architectures | |
537 | |---|---|---|---|---| |
538 | | **`9.18-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Bind9 9.18 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
539 | - | `9.16-21.10_beta` | | | Bind9 9.16.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
540 | | `9.16-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Bind9 9.16.1 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
541 | | _`track_risk`_ | |
542 | |
543 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
544 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
545 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
546 | +More risky channels are always implicitly available. |
547 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
548 | +When `stable` is listed, all four are available. |
549 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
550 | |
551 | ### Commercial use and Extended Security Maintenance channels |
552 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
553 | @@ -45,7 +52,7 @@ Access your Bind9 server at `localhost:30053` |
554 | | `-e TZ=UTC` | Timezone. | |
555 | | `-p 30053:53` | Expose bind9 on `localhost:30053`. | |
556 | | `-e BIND9_USER=bind` | The user which will start the `named` process. | |
557 | -| `-v /path/to/bind/configuration:/etc/bind/named.conf` | 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)). | |
558 | +| `-v /path/to/bind/configuration:/etc/bind/named.conf` | 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)). | |
559 | | `-v /path/to/cached/data:/var/cache/bind` | Location where locally cached data can be dumped. | |
560 | | `-v /path/to/resource/records:/var/lib/bind` | Location of Resource Records defining various domain information. | |
561 | |
562 | @@ -70,7 +77,7 @@ docker exec -it bind9-container /bin/bash |
563 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
564 | |
565 | Download |
566 | -[bind9-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `ubuntu/bind9:9.18-22.04_beta`), then: |
567 | +[bind9-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `ubuntu/bind9:9.18-22.04_beta`), then: |
568 | |
569 | ```sh |
570 | kubectl apply -f bind9-deployment.yml |
571 | @@ -96,5 +103,6 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
572 | |
573 | | Track | Version | EOL | Upgrade Path | |
574 | |---|---|---|---| |
575 | + | ~~9.16-21.10~~ | Bind9 9.16.15 on Ubuntu 21.10 | 07/2022 | 9.18-22.04_beta | |
576 | | _`track`_ | |
577 | |
578 | diff --git a/docs/docker.io/ubuntu/cassandra.md b/docs/docker.io/ubuntu/cassandra.md |
579 | index eb04d92..a335b1b 100644 |
580 | --- a/docs/docker.io/ubuntu/cassandra.md |
581 | +++ b/docs/docker.io/ubuntu/cassandra.md |
582 | @@ -1,6 +1,9 @@ |
583 | # Apache Cassandra | Ubuntu |
584 | |
585 | -Current Apache Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache Cassandra or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
586 | +Current Apache Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
587 | +Receives security updates and tracks the newest combination of Apache Cassandra and Ubuntu. |
588 | +**This repository is free to use and exempted from per-user rate limits.** |
589 | + |
590 | |
591 | |
592 | ## About Apache Cassandra |
593 | @@ -22,7 +25,12 @@ _Tags in italics are not available in ubuntu/cassandra but are shown here for co |
594 | | **`4.0-22.04_beta`** | | | Apache Cassandra 4.0 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
595 | | _`track_risk`_ | |
596 | |
597 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
598 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
599 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
600 | +More risky channels are always implicitly available. |
601 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
602 | +When `stable` is listed, all four are available. |
603 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
604 | |
605 | ### Commercial use and Extended Security Maintenance channels |
606 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
607 | @@ -70,7 +78,7 @@ docker exec -it cassandra-container /bin/bash |
608 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
609 | |
610 | Download |
611 | -[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cassandra:4.0-22.04_beta`), then: |
612 | +[cassandra-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cassandra:4.0-22.04_beta`), then: |
613 | |
614 | ```sh |
615 | kubectl apply -f cassandra-deployment.yml |
616 | diff --git a/docs/docker.io/ubuntu/cortex.md b/docs/docker.io/ubuntu/cortex.md |
617 | index 5e618f0..adb61d6 100644 |
618 | --- a/docs/docker.io/ubuntu/cortex.md |
619 | +++ b/docs/docker.io/ubuntu/cortex.md |
620 | @@ -1,6 +1,9 @@ |
621 | # Cortex | Ubuntu |
622 | |
623 | -Current Cortex Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Cortex or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
624 | +Current Cortex Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
625 | +Receives security updates and tracks the newest combination of Cortex and Ubuntu. |
626 | +**This repository is free to use and exempted from per-user rate limits.** |
627 | + |
628 | |
629 | |
630 | ## About Cortex |
631 | @@ -29,7 +32,12 @@ _Tags in italics are not available in ubuntu/cortex but are shown here for compl |
632 | | **`1.11-22.04_beta`** | | | Cortex 1.11 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
633 | | _`track_risk`_ | |
634 | |
635 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
636 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
637 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
638 | +More risky channels are always implicitly available. |
639 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
640 | +When `stable` is listed, all four are available. |
641 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
642 | |
643 | ### Commercial use and Extended Security Maintenance channels |
644 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
645 | @@ -49,7 +57,7 @@ Access your Cortex server at `http://localhost:32709`. |
646 | |---|---| |
647 | | `-e TZ=UTC` | Timezone. | |
648 | | `-p 32709:9009` | Expose Cortex on `localhost:32709`. | |
649 | -| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | 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)). | |
650 | +| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | 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)). | |
651 | |
652 | |
653 | #### Testing/Debugging |
654 | @@ -72,8 +80,8 @@ docker exec -it cortex-container /bin/bash |
655 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
656 | |
657 | Download |
658 | -[cortex.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04) and |
659 | -[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cortex:1.11-22.04_beta`), then: |
660 | +[cortex.yaml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04) and |
661 | +[cortex-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cortex:1.11-22.04_beta`), then: |
662 | |
663 | ```sh |
664 | kubectl create configmap cortex-config --from-file=main-config=cortex.yaml |
665 | diff --git a/docs/docker.io/ubuntu/grafana.md b/docs/docker.io/ubuntu/grafana.md |
666 | index e92143e..b202456 100644 |
667 | --- a/docs/docker.io/ubuntu/grafana.md |
668 | +++ b/docs/docker.io/ubuntu/grafana.md |
669 | @@ -1,6 +1,9 @@ |
670 | # Grafana™ software | Ubuntu |
671 | |
672 | -Current Grafana™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
673 | +Current Grafana™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
674 | +Receives security updates and tracks the newest combination of Grafana™ software and Ubuntu. |
675 | +**This repository is free to use and exempted from per-user rate limits.** |
676 | + |
677 | |
678 | |
679 | ## About Grafana™ software |
680 | @@ -22,7 +25,12 @@ _Tags in italics are not available in ubuntu/grafana but are shown here for comp |
681 | | **`8.2-22.04_beta`** | | | Grafana™ software 8.2 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
682 | | _`track_risk`_ | |
683 | |
684 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
685 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
686 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
687 | +More risky channels are always implicitly available. |
688 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
689 | +When `stable` is listed, all four are available. |
690 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
691 | |
692 | ### Commercial use and Extended Security Maintenance channels |
693 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
694 | @@ -66,8 +74,8 @@ docker exec -it grafana-container /bin/bash |
695 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
696 | |
697 | Download |
698 | -[datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04) and |
699 | -[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:8.2-22.04_beta`), then: |
700 | +[datasource.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04), [dashboard.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04), [system-stats-dashboard.json](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04) and |
701 | +[grafana-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:8.2-22.04_beta`), then: |
702 | |
703 | ```sh |
704 | kubectl create configmap grafana-config --from-file=grafana-datasource=datasource.yml --from-file=grafana-dashboard-definition=dashboard.yml --from-file=grafana-dashboard=system-stats-dashboard.json |
705 | diff --git a/docs/docker.io/ubuntu/kafka.md b/docs/docker.io/ubuntu/kafka.md |
706 | index 2e6880d..2cec666 100644 |
707 | --- a/docs/docker.io/ubuntu/kafka.md |
708 | +++ b/docs/docker.io/ubuntu/kafka.md |
709 | @@ -1,6 +1,9 @@ |
710 | # Apache Kafka | Ubuntu |
711 | |
712 | -Current Apache Kafka Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache Kafka or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
713 | +Current Apache Kafka Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
714 | +Receives security updates and tracks the newest combination of Apache Kafka and Ubuntu. |
715 | +**This repository is free to use and exempted from per-user rate limits.** |
716 | + |
717 | |
718 | |
719 | ## About Apache Kafka |
720 | @@ -22,7 +25,12 @@ _Tags in italics are not available in ubuntu/kafka but are shown here for comple |
721 | | **`3.1-22.04_beta`** | | | Apache Kafka 3.1.0 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
722 | | _`track_risk`_ | |
723 | |
724 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
725 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
726 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
727 | +More risky channels are always implicitly available. |
728 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
729 | +When `stable` is listed, all four are available. |
730 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
731 | |
732 | ### Commercial use and Extended Security Maintenance channels |
733 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
734 | @@ -70,7 +78,7 @@ docker exec -it kafka-container /bin/bash |
735 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
736 | |
737 | Download |
738 | -[kafka-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.kafka.image` in `kafka-deployment.yml` to your chosen channel tag (e.g. `ubuntu/kafka:3.1-22.04_beta`), then: |
739 | +[kafka-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.kafka.image` in `kafka-deployment.yml` to your chosen channel tag (e.g. `ubuntu/kafka:3.1-22.04_beta`), then: |
740 | |
741 | ```sh |
742 | kubectl apply -f kafka-deployment.yml |
743 | diff --git a/docs/docker.io/ubuntu/loki.md b/docs/docker.io/ubuntu/loki.md |
744 | index bfc31b2..b07ed80 100644 |
745 | --- a/docs/docker.io/ubuntu/loki.md |
746 | +++ b/docs/docker.io/ubuntu/loki.md |
747 | @@ -1,6 +1,9 @@ |
748 | # Grafana Loki™ software | Ubuntu |
749 | |
750 | -Current Grafana Loki™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana Loki™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
751 | +Current Grafana Loki™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
752 | +Receives security updates and tracks the newest combination of Grafana Loki™ software and Ubuntu. |
753 | +**This repository is free to use and exempted from per-user rate limits.** |
754 | + |
755 | |
756 | |
757 | ## About Grafana Loki™ software |
758 | @@ -22,7 +25,12 @@ _Tags in italics are not available in ubuntu/loki but are shown here for complet |
759 | | **`2.4-22.04_beta`** | | | Grafana Loki™ software 2.4.2 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
760 | | _`track_risk`_ | |
761 | |
762 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
763 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
764 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
765 | +More risky channels are always implicitly available. |
766 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
767 | +When `stable` is listed, all four are available. |
768 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
769 | |
770 | ### Commercial use and Extended Security Maintenance channels |
771 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
772 | @@ -42,7 +50,7 @@ You can now use your Loki instance exposed at `http://localhost:3100`. |
773 | |---|---| |
774 | | `-e TZ=UTC` | Timezone. | |
775 | | `-p 3100:3100` | Expose Grafana Loki on `localhost:3100`. | |
776 | -| `-v /local/path/to/config:/etc/loki/local-config.yaml` | 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). | |
777 | +| `-v /local/path/to/config:/etc/loki/local-config.yaml` | 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). | |
778 | | `-v lokidata:/loki` | Persist data in a docker volume named `lokidata`. | |
779 | |
780 | |
781 | @@ -66,8 +74,8 @@ docker exec -it loki-container /bin/bash |
782 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
783 | |
784 | Download |
785 | -[promtail-local-config-k8s.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04) and |
786 | -[loki-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04) and set `containers.loki.image` in `loki-deployment.yml` to your chosen channel tag (e.g. `ubuntu/loki:2.4-22.04_beta`), then: |
787 | +[promtail-local-config-k8s.yaml](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) and |
788 | +[loki-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04) and set `containers.loki.image` in `loki-deployment.yml` to your chosen channel tag (e.g. `ubuntu/loki:2.4-22.04_beta`), then: |
789 | |
790 | ```sh |
791 | kubectl create configmap promtail-config --from-file=promtail=promtail-local-config-k8s.yaml |
792 | diff --git a/docs/docker.io/ubuntu/memcached.md b/docs/docker.io/ubuntu/memcached.md |
793 | index 29d33e1..3e170b9 100644 |
794 | --- a/docs/docker.io/ubuntu/memcached.md |
795 | +++ b/docs/docker.io/ubuntu/memcached.md |
796 | @@ -1,6 +1,9 @@ |
797 | # Memcached | Ubuntu |
798 | |
799 | -Current Memcached Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Memcached or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
800 | +Current Memcached Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
801 | +Receives security updates and tracks the newest combination of Memcached and Ubuntu. |
802 | +**This repository is free to use and exempted from per-user rate limits.** |
803 | + |
804 | |
805 | |
806 | ## About Memcached |
807 | @@ -20,11 +23,15 @@ _Tags in italics are not available in ubuntu/memcached but are shown here for co |
808 | | Channel Tag | | | Currently | Architectures | |
809 | |---|---|---|---|---| |
810 | | **`1.6-22.04_beta`** | | | Memcached 1.6 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
811 | - | `1.6-21.10_beta` | | | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
812 | | `1.5-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Memcached 1.5.22 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
813 | | _`track_risk`_ | |
814 | |
815 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
816 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
817 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
818 | +More risky channels are always implicitly available. |
819 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
820 | +When `stable` is listed, all four are available. |
821 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
822 | |
823 | ### Commercial use and Extended Security Maintenance channels |
824 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
825 | @@ -99,7 +106,7 @@ In this case you can append the flags themselves or a shell script to the run co |
826 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
827 | |
828 | Download |
829 | -[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.6-22.04_beta`), then: |
830 | +[memcached-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.6-22.04_beta`), then: |
831 | |
832 | ```sh |
833 | kubectl apply -f memcached-deployment.yml |
834 | @@ -125,6 +132,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
835 | |
836 | | Track | Version | EOL | Upgrade Path | |
837 | |---|---|---|---| |
838 | - | ~~1.6-21.04~~ | Memcached 1.6.9 on Ubuntu 21.04 | 01/2022 | 1.6-21.10_beta | |
839 | + | ~~1.6-21.10~~ | Memcached 1.6.9 on Ubuntu 21.10 | 07/2022 | 1.6-22.04_beta | |
840 | + | ~~1.6-21.04~~ | Memcached 1.6.9 on Ubuntu 21.04 | 01/2022 | ~~1.6-21.10~~ | |
841 | | _`track`_ | |
842 | |
843 | diff --git a/docs/docker.io/ubuntu/mysql.md b/docs/docker.io/ubuntu/mysql.md |
844 | index e1b2916..8f17bfa 100644 |
845 | --- a/docs/docker.io/ubuntu/mysql.md |
846 | +++ b/docs/docker.io/ubuntu/mysql.md |
847 | @@ -1,6 +1,9 @@ |
848 | # MySQL™ software | Ubuntu |
849 | |
850 | -Current MySQL™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer MySQL™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
851 | +Current MySQL™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
852 | +Receives security updates and tracks the newest combination of MySQL™ software and Ubuntu. |
853 | +**This repository is free to use and exempted from per-user rate limits.** |
854 | + |
855 | |
856 | |
857 | ## About MySQL™ software |
858 | @@ -20,11 +23,15 @@ _Tags in italics are not available in ubuntu/mysql but are shown here for comple |
859 | | Channel Tag | | | Currently | Architectures | |
860 | |---|---|---|---|---| |
861 | | **`8.0-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | MySQL™ software 8.0 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
862 | - | `8.0-21.10_beta` | | | MySQL™ software 8.0.27 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
863 | | `8.0-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | MySQL™ software 8.0.22 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
864 | | _`track_risk`_ | |
865 | |
866 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
867 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
868 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
869 | +More risky channels are always implicitly available. |
870 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
871 | +When `stable` is listed, all four are available. |
872 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
873 | |
874 | ### Commercial use and Extended Security Maintenance channels |
875 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
876 | @@ -53,7 +60,7 @@ Access your MySQL server at `localhost:30306`. |
877 | | `-e MYSQL_INITSB_SKIP_TZINFO=yes` | Timezone data is automatically loaded via entrypoint script, set this variable to any non-empty value to disable it. | |
878 | | `-p 30306:3306` | Expose MySQL server on `localhost:30306`. | |
879 | | `-v /path/to/data:/var/lib/mysql` | Persist data instead of initializing a new database every time you launch a new container. | |
880 | -| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | 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)). | |
881 | +| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | 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)). | |
882 | |
883 | #### Initialization Scripts |
884 | |
885 | @@ -94,8 +101,8 @@ The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged i |
886 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
887 | |
888 | Download |
889 | -[my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04) and |
890 | -[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `ubuntu/mysql:8.0-22.04_beta`), then: |
891 | +[my-custom.cnf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04) and |
892 | +[mysql-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `ubuntu/mysql:8.0-22.04_beta`), then: |
893 | |
894 | ```sh |
895 | kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf |
896 | @@ -122,6 +129,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
897 | |
898 | | Track | Version | EOL | Upgrade Path | |
899 | |---|---|---|---| |
900 | - | ~~8.0-21.04~~ | MySQL™ software 8.0.27 on Ubuntu 21.04 | 01/2022 | 8.0-21.10_beta | |
901 | + | ~~8.0-21.10~~ | MySQL™ software 8.0.27 on Ubuntu 21.10 | 07/2022 | 8.0-22.04_beta | |
902 | + | ~~8.0-21.04~~ | MySQL™ software 8.0.27 on Ubuntu 21.04 | 01/2022 | ~~8.0-21.10~~ | |
903 | | _`track`_ | |
904 | |
905 | diff --git a/docs/docker.io/ubuntu/nginx.md b/docs/docker.io/ubuntu/nginx.md |
906 | index e83354c..955f720 100644 |
907 | --- a/docs/docker.io/ubuntu/nginx.md |
908 | +++ b/docs/docker.io/ubuntu/nginx.md |
909 | @@ -1,6 +1,9 @@ |
910 | # Nginx | Ubuntu |
911 | |
912 | -Current Nginx Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Nginx or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
913 | +Current Nginx Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
914 | +Receives security updates and tracks the newest combination of Nginx and Ubuntu. |
915 | +**This repository is free to use and exempted from per-user rate limits.** |
916 | + |
917 | |
918 | |
919 | ## About Nginx |
920 | @@ -20,11 +23,15 @@ _Tags in italics are not available in ubuntu/nginx but are shown here for comple |
921 | | Channel Tag | | | Currently | Architectures | |
922 | |---|---|---|---|---| |
923 | | **`1.18-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Nginx 1.18 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
924 | - | `1.18-21.10_beta` | | | Nginx 1.18.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
925 | | `1.18-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Nginx 1.18.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
926 | | _`track_risk`_ | |
927 | |
928 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
929 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
930 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
931 | +More risky channels are always implicitly available. |
932 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
933 | +When `stable` is listed, all four are available. |
934 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
935 | |
936 | ### Commercial use and Extended Security Maintenance channels |
937 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
938 | @@ -46,7 +53,7 @@ Access your Nginx server at `http://localhost:8080`. |
939 | | `-p 8080:80` | Expose Nginx on `localhost:8080`. | |
940 | | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. | |
941 | | `-v /path/to/conf.template:/etc/nginx/templates/conf.template` | 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;`). | |
942 | -| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | 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)). | |
943 | +| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | 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)). | |
944 | |
945 | |
946 | #### Testing/Debugging |
947 | @@ -69,8 +76,8 @@ docker exec -it nginx-container /bin/bash |
948 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
949 | |
950 | Download |
951 | -[nginx.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04) and |
952 | -[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-22.04_beta`), then: |
953 | +[nginx.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04), [index.html](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04) and |
954 | +[nginx-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-22.04_beta`), then: |
955 | |
956 | ```sh |
957 | kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html |
958 | @@ -97,6 +104,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
959 | |
960 | | Track | Version | EOL | Upgrade Path | |
961 | |---|---|---|---| |
962 | - | ~~1.18-21.04~~ | Nginx 1.18.0 on Ubuntu 21.04 | 01/2022 | 1.18-21.10_beta | |
963 | + | ~~1.18-21.10~~ | Nginx 1.18.0 on Ubuntu 21.10 | 07/2022 | 1.18-22.04_beta | |
964 | + | ~~1.18-21.04~~ | Nginx 1.18.0 on Ubuntu 21.04 | 01/2022 | ~~1.18-21.10~~ | |
965 | | _`track`_ | |
966 | |
967 | diff --git a/docs/docker.io/ubuntu/postgres.md b/docs/docker.io/ubuntu/postgres.md |
968 | index 7cb092c..9f95cf0 100644 |
969 | --- a/docs/docker.io/ubuntu/postgres.md |
970 | +++ b/docs/docker.io/ubuntu/postgres.md |
971 | @@ -1,6 +1,9 @@ |
972 | # Postgres | Ubuntu |
973 | |
974 | -Current Postgres Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Postgres or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
975 | +Current Postgres Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
976 | +Receives security updates and tracks the newest combination of Postgres and Ubuntu. |
977 | +**This repository is free to use and exempted from per-user rate limits.** |
978 | + |
979 | |
980 | |
981 | ## About Postgres |
982 | @@ -20,11 +23,15 @@ _Tags in italics are not available in ubuntu/postgres but are shown here for com |
983 | | Channel Tag | | | Currently | Architectures | |
984 | |---|---|---|---|---| |
985 | | **`14-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Postgres 14 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
986 | - | `13-21.10_beta` | | | Postgres 13.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
987 | | `12-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
988 | | _`track_risk`_ | |
989 | |
990 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
991 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
992 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
993 | +More risky channels are always implicitly available. |
994 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
995 | +When `stable` is listed, all four are available. |
996 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
997 | |
998 | ### Commercial use and Extended Security Maintenance channels |
999 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1000 | @@ -51,7 +58,7 @@ Access your PostgreSQL server at `localhost:30432`. |
1001 | | `-e POSTGRES_HOST_AUTH_METHOD=trust` | Set the `auth-method` for `host` connections for `all` databases, `all` users, and `all` addresses. The following will be added to the `pg_hba.conf` if this option is passed: `host all all all $POSTGRES_HOST_AUTH_METHOD`. | |
1002 | | `-e PGDATA=/path/to/location` | Set the location of the database files. The default is `/var/lib/postgresql/data`. | |
1003 | | `-p 30432:5432` | Expose Postgres on `localhost:30432`. | |
1004 | -| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | 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)). | |
1005 | +| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | 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)). | |
1006 | | `-v /path/to/persisted/data:/var/lib/postgresql/data` | Persist data instead of initializing a new database every time you launch a new container. | |
1007 | |
1008 | #### Initialization Scripts |
1009 | @@ -93,8 +100,8 @@ The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged i |
1010 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1011 | |
1012 | Download |
1013 | -[postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04) and |
1014 | -[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `ubuntu/postgres:14-22.04_beta`), then: |
1015 | +[postgresql.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04) and |
1016 | +[postgres-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `ubuntu/postgres:14-22.04_beta`), then: |
1017 | |
1018 | ```sh |
1019 | kubectl create configmap postgres-config --from-file=main-config=postgresql.conf |
1020 | @@ -121,6 +128,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
1021 | |
1022 | | Track | Version | EOL | Upgrade Path | |
1023 | |---|---|---|---| |
1024 | + | ~~13-21.10~~ | Postgres 13.1 on Ubuntu 21.10 | 07/2022 | 14-22.04_beta | |
1025 | | ~~13-21.04~~ | Postgres 13.1 on Ubuntu 21.04 | 01/2022 | ~~13.1-21.10~~ | |
1026 | | _`track`_ | |
1027 | |
1028 | diff --git a/docs/docker.io/ubuntu/prometheus-alertmanager.md b/docs/docker.io/ubuntu/prometheus-alertmanager.md |
1029 | index a06fffe..6f8562a 100644 |
1030 | --- a/docs/docker.io/ubuntu/prometheus-alertmanager.md |
1031 | +++ b/docs/docker.io/ubuntu/prometheus-alertmanager.md |
1032 | @@ -1,6 +1,9 @@ |
1033 | # Prometheus Alertmanager | Ubuntu |
1034 | |
1035 | -Current Prometheus Alertmanager Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus Alertmanager or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
1036 | +Current Prometheus Alertmanager Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
1037 | +Receives security updates and tracks the newest combination of Prometheus Alertmanager and Ubuntu. |
1038 | +**This repository is free to use and exempted from per-user rate limits.** |
1039 | + |
1040 | |
1041 | |
1042 | ## About Prometheus Alertmanager |
1043 | @@ -22,7 +25,12 @@ _Tags in italics are not available in ubuntu/prometheus-alertmanager but are sho |
1044 | | **`0.23-22.04_beta`** | | | Prometheus Alertmanager 0.23 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1045 | | _`track_risk`_ | |
1046 | |
1047 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1048 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1049 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1050 | +More risky channels are always implicitly available. |
1051 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1052 | +When `stable` is listed, all four are available. |
1053 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1054 | |
1055 | ### Commercial use and Extended Security Maintenance channels |
1056 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1057 | @@ -42,7 +50,7 @@ Access your Prometheus Alertmanager server at `localhost:30093`. |
1058 | |---|---| |
1059 | | `-e TZ=UTC` | Timezone. | |
1060 | | `-p 30093:9093` | Expose Prometheus Alertmanager on `localhost:30093`. | |
1061 | -| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | 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)). | |
1062 | +| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | 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)). | |
1063 | | `-v /path/to/persisted/data:/alertmanager` | 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. | |
1064 | |
1065 | |
1066 | @@ -66,8 +74,8 @@ docker exec -it prometheus-alertmanager-container /bin/bash |
1067 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1068 | |
1069 | Download |
1070 | -[alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04) and |
1071 | -[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus-alertmanager:0.23-22.04_beta`), then: |
1072 | +[alertmanager.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04) and |
1073 | +[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus-alertmanager:0.23-22.04_beta`), then: |
1074 | |
1075 | ```sh |
1076 | kubectl create configmap alertmanager-config --from-file=alertmanager=alertmanager.yml |
1077 | diff --git a/docs/docker.io/ubuntu/prometheus.md b/docs/docker.io/ubuntu/prometheus.md |
1078 | index 52e94f1..ea2d8c6 100644 |
1079 | --- a/docs/docker.io/ubuntu/prometheus.md |
1080 | +++ b/docs/docker.io/ubuntu/prometheus.md |
1081 | @@ -1,6 +1,9 @@ |
1082 | # Prometheus | Ubuntu |
1083 | |
1084 | -Current Prometheus Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
1085 | +Current Prometheus Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
1086 | +Receives security updates and tracks the newest combination of Prometheus and Ubuntu. |
1087 | +**This repository is free to use and exempted from per-user rate limits.** |
1088 | + |
1089 | |
1090 | |
1091 | ## About Prometheus |
1092 | @@ -22,7 +25,12 @@ _Tags in italics are not available in ubuntu/prometheus but are shown here for c |
1093 | | **`2.33-22.04_beta`** | | | Prometheus 2.33 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1094 | | _`track_risk`_ | |
1095 | |
1096 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1097 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1098 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1099 | +More risky channels are always implicitly available. |
1100 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1101 | +When `stable` is listed, all four are available. |
1102 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1103 | |
1104 | ### Commercial use and Extended Security Maintenance channels |
1105 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1106 | @@ -42,8 +50,8 @@ Access your Prometheus server at `localhost:30090`. |
1107 | |---|---| |
1108 | | `-e TZ=UTC` | Timezone. | |
1109 | | `-p 30090:9090` | Expose Prometheus server on `localhost:30090`. | |
1110 | -| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | 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)). | |
1111 | -| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | 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)). | |
1112 | +| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | 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)). | |
1113 | +| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | 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)). | |
1114 | |
1115 | |
1116 | #### Testing/Debugging |
1117 | @@ -66,8 +74,8 @@ docker exec -it prometheus-container /bin/bash |
1118 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1119 | |
1120 | Download |
1121 | -[prometheus.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04) and |
1122 | -[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus:2.33-22.04_beta`), then: |
1123 | +[prometheus.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04), [alerts.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04) and |
1124 | +[prometheus-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus:2.33-22.04_beta`), then: |
1125 | |
1126 | ```sh |
1127 | kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml |
1128 | diff --git a/docs/docker.io/ubuntu/redis.md b/docs/docker.io/ubuntu/redis.md |
1129 | index 34330ab..112c4ce 100644 |
1130 | --- a/docs/docker.io/ubuntu/redis.md |
1131 | +++ b/docs/docker.io/ubuntu/redis.md |
1132 | @@ -1,6 +1,9 @@ |
1133 | # Redis™ software | Ubuntu |
1134 | |
1135 | -Current Redis™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Redis™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
1136 | +Current Redis™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
1137 | +Receives security updates and tracks the newest combination of Redis™ software and Ubuntu. |
1138 | +**This repository is free to use and exempted from per-user rate limits.** |
1139 | + |
1140 | |
1141 | |
1142 | ## About Redis™ software |
1143 | @@ -20,10 +23,14 @@ _Tags in italics are not available in ubuntu/redis but are shown here for comple |
1144 | | Channel Tag | | | Currently | Architectures | |
1145 | |---|---|---|---|---| |
1146 | | **`6.2-22.04_beta`** | | | Redis™ software 6.2 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1147 | - | `6.0-21.10_beta` | | | Redis™ software 6.0.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
1148 | | _`track_risk`_ | |
1149 | |
1150 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1151 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1152 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1153 | +More risky channels are always implicitly available. |
1154 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1155 | +When `stable` is listed, all four are available. |
1156 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1157 | |
1158 | ### Commercial use and Extended Security Maintenance channels |
1159 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1160 | @@ -48,7 +55,7 @@ Access your Redis server at `localhost:30073`. |
1161 | | `-e REDIS_ALLOW_REMOTE_CONNECTIONS=yes` | Set to `no` to disallow remote connections to `redis-server` (i.e., make `redis-server` listen to `127.0.0.1` only). | |
1162 | | `-e REDIS_EXTRA_FLAGS` | Specify extra flags to be passed to `redis-server` when initializing it. | |
1163 | | `-p 30073:6379` | Expose redis on `localhost:30073`. | |
1164 | -| `-v /path/to/redis.conf:/etc/redis/redis.conf` | 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)). **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines. |
1165 | +| `-v /path/to/redis.conf:/etc/redis/redis.conf` | 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)). **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines. |
1166 | | |
1167 | |
1168 | |
1169 | @@ -88,8 +95,8 @@ redis:6379> |
1170 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1171 | |
1172 | Download |
1173 | -[redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and |
1174 | -[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.2-22.04_beta`), then: |
1175 | +[redis.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and |
1176 | +[redis-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.2-22.04_beta`), then: |
1177 | |
1178 | ```sh |
1179 | kubectl create configmap redis-config --from-file=redis=redis.conf |
1180 | @@ -116,7 +123,8 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
1181 | |
1182 | | Track | Version | EOL | Upgrade Path | |
1183 | |---|---|---|---| |
1184 | - | ~~6.0-21.04~~ | Redis™ software 6.0.11 on Ubuntu 21.04 | 01/2022 | 6.0-21.10_beta | |
1185 | + | ~~6.0-21.10~~ | Redis™ software 6.0.15 on Ubuntu 21.10 | 07/2022 | 6.2-22.04_beta | |
1186 | + | ~~6.0-21.04~~ | Redis™ software 6.0.11 on Ubuntu 21.04 | 01/2022 | ~~6.0-21.10~~ | |
1187 | | ~~5.0-20.04~~ | Redis™ software 5.0.7 on Ubuntu 20.04 LTS | 01/2021 | ~~6.0-21.04~~ | |
1188 | | _`track`_ | |
1189 | |
1190 | diff --git a/docs/docker.io/ubuntu/squid.md b/docs/docker.io/ubuntu/squid.md |
1191 | index 15c055f..8023c71 100644 |
1192 | --- a/docs/docker.io/ubuntu/squid.md |
1193 | +++ b/docs/docker.io/ubuntu/squid.md |
1194 | @@ -1,6 +1,9 @@ |
1195 | # Squid | Ubuntu |
1196 | |
1197 | -Current Squid Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Squid or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
1198 | +Current Squid Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
1199 | +Receives security updates and tracks the newest combination of Squid and Ubuntu. |
1200 | +**This repository is free to use and exempted from per-user rate limits.** |
1201 | + |
1202 | |
1203 | |
1204 | ## About Squid |
1205 | @@ -20,11 +23,15 @@ _Tags in italics are not available in ubuntu/squid but are shown here for comple |
1206 | | Channel Tag | | | Currently | Architectures | |
1207 | |---|---|---|---|---| |
1208 | | **`5.2-22.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Squid 5.2 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1209 | - | `4.13-21.10_beta` | | | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
1210 | | `4.10-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Squid 4.10 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1211 | | _`track_risk`_ | |
1212 | |
1213 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1214 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1215 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1216 | +More risky channels are always implicitly available. |
1217 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1218 | +When `stable` is listed, all four are available. |
1219 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1220 | |
1221 | ### Commercial use and Extended Security Maintenance channels |
1222 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1223 | @@ -70,8 +77,8 @@ docker exec -it squid-container /bin/bash |
1224 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1225 | |
1226 | Download |
1227 | -[squid.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04) and |
1228 | -[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `ubuntu/squid:5.2-22.04_beta`), then: |
1229 | +[squid.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04) and |
1230 | +[squid-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `ubuntu/squid:5.2-22.04_beta`), then: |
1231 | |
1232 | ```sh |
1233 | kubectl create configmap squid-config --from-file=squid=squid.conf |
1234 | @@ -98,5 +105,6 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
1235 | |
1236 | | Track | Version | EOL | Upgrade Path | |
1237 | |---|---|---|---| |
1238 | + | ~~4.13-21.10~~ | Squid 4.13 on Ubuntu 21.10 | 07/2022 | 5.2-22.04_beta | |
1239 | | _`track`_ | |
1240 | |
1241 | diff --git a/docs/docker.io/ubuntu/telegraf.md b/docs/docker.io/ubuntu/telegraf.md |
1242 | index cfb8f51..cae8c16 100644 |
1243 | --- a/docs/docker.io/ubuntu/telegraf.md |
1244 | +++ b/docs/docker.io/ubuntu/telegraf.md |
1245 | @@ -1,6 +1,9 @@ |
1246 | # Telegraf™ software | Ubuntu |
1247 | |
1248 | -Current Telegraf™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Telegraf™ software or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
1249 | +Current Telegraf™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
1250 | +Receives security updates and tracks the newest combination of Telegraf™ software and Ubuntu. |
1251 | +**This repository is free to use and exempted from per-user rate limits.** |
1252 | + |
1253 | |
1254 | |
1255 | ## About Telegraf™ software |
1256 | @@ -20,10 +23,14 @@ _Tags in italics are not available in ubuntu/telegraf but are shown here for com |
1257 | | Channel Tag | | | Currently | Architectures | |
1258 | |---|---|---|---|---| |
1259 | | **`1.21-22.04_beta`** | | | Telegraf™ software 1.21 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1260 | - | `1.19-21.10_beta` | | | Telegraf™ software 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
1261 | | _`track_risk`_ | |
1262 | |
1263 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1264 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1265 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1266 | +More risky channels are always implicitly available. |
1267 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1268 | +When `stable` is listed, all four are available. |
1269 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1270 | |
1271 | ### Commercial use and Extended Security Maintenance channels |
1272 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1273 | @@ -43,7 +50,7 @@ Access your Telegraf server at `localhost:30273`. |
1274 | |---|---| |
1275 | | `-e TZ=UTC` | Timezone. | |
1276 | | `-p 30273:9273` | Expose Telegraf on `localhost:30273`. | |
1277 | -| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | 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)). | |
1278 | +| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | 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)). | |
1279 | |
1280 | |
1281 | #### Testing/Debugging |
1282 | @@ -66,8 +73,8 @@ docker exec -it telegraf-container /bin/bash |
1283 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1284 | |
1285 | Download |
1286 | -[telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and |
1287 | -[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.21-22.04_beta`), then: |
1288 | +[telegraf.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and |
1289 | +[telegraf-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.21-22.04_beta`), then: |
1290 | |
1291 | ```sh |
1292 | kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf |
1293 | @@ -94,7 +101,8 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
1294 | |
1295 | | Track | Version | EOL | Upgrade Path | |
1296 | |---|---|---|---| |
1297 | - | ~~1.17-21.04~~ | Telegraf™ software 1.17.2 on Ubuntu 21.04 | 01/2022 | 1.19-21.10_beta | |
1298 | + | ~~1.19-21.10~~ | Telegraf™ software 1.19.2 on Ubuntu 21.10 | 07/2022 | 1.21-22.04_beta | |
1299 | + | ~~1.17-21.04~~ | Telegraf™ software 1.17.2 on Ubuntu 21.04 | 01/2022 | ~~1.19-21.10~~ | |
1300 | | ~~1.15-20.04~~ | Telegraf™ software 1.15.2 on Ubuntu 20.04 LTS | 01/2021 | ~~1.17-21.04~~ | |
1301 | | _`track`_ | |
1302 | |
1303 | diff --git a/docs/docker.io/ubuntu/zookeeper.md b/docs/docker.io/ubuntu/zookeeper.md |
1304 | index 98180d0..abcf9ed 100644 |
1305 | --- a/docs/docker.io/ubuntu/zookeeper.md |
1306 | +++ b/docs/docker.io/ubuntu/zookeeper.md |
1307 | @@ -1,6 +1,9 @@ |
1308 | # Apache ZooKeeper | Ubuntu |
1309 | |
1310 | -Current Apache ZooKeeper Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache ZooKeeper or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
1311 | +Current Apache ZooKeeper Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
1312 | +Receives security updates and tracks the newest combination of Apache ZooKeeper and Ubuntu. |
1313 | +**This repository is free to use and exempted from per-user rate limits.** |
1314 | + |
1315 | |
1316 | |
1317 | ## About Apache ZooKeeper |
1318 | @@ -22,7 +25,12 @@ _Tags in italics are not available in ubuntu/zookeeper but are shown here for co |
1319 | | **`3.1-22.04_beta`** | | | Apache ZooKeeper 3.1.0 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1320 | | _`track_risk`_ | |
1321 | |
1322 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1323 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1324 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1325 | +More risky channels are always implicitly available. |
1326 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1327 | +When `stable` is listed, all four are available. |
1328 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1329 | |
1330 | ### Commercial use and Extended Security Maintenance channels |
1331 | If your usage includes commercial redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1332 | @@ -65,7 +73,7 @@ docker exec -it zookeeper-container /bin/bash |
1333 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1334 | |
1335 | Download |
1336 | -[zookeeper-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.zookeeper.image` in `zookeeper-deployment.yml` to your chosen channel tag (e.g. `ubuntu/zookeeper:3.1-22.04_beta`), then: |
1337 | +[zookeeper-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.zookeeper.image` in `zookeeper-deployment.yml` to your chosen channel tag (e.g. `ubuntu/zookeeper:3.1-22.04_beta`), then: |
1338 | |
1339 | ```sh |
1340 | kubectl apply -f zookeeper-deployment.yml |
1341 | diff --git a/docs/public.ecr.aws/lts/apache2.md b/docs/public.ecr.aws/lts/apache2.md |
1342 | index 93dc477..31e002a 100644 |
1343 | --- a/docs/public.ecr.aws/lts/apache2.md |
1344 | +++ b/docs/public.ecr.aws/lts/apache2.md |
1345 | @@ -24,7 +24,12 @@ Up to 10 years customer security maintenance `from canonical/apache2`. [Request |
1346 | | `2.4-20.04_beta` | 04/2025 | 04/2030 | Apache2 2.4.41 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1347 | | _`track_risk`_ | |
1348 | |
1349 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1350 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1351 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1352 | +More risky channels are always implicitly available. |
1353 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1354 | +When `stable` is listed, all four are available. |
1355 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1356 | |
1357 | ### Commercial use and Extended Security Maintenance channels |
1358 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1359 | @@ -48,7 +53,7 @@ Access your Apache2 server at `http://localhost:8080`. |
1360 | | `-e TZ=UTC` | Timezone. | |
1361 | | `-p 8080:80` | Expose Apache2 on `localhost:8080`. | |
1362 | | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. | |
1363 | -| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | 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)). | |
1364 | +| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | 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)). | |
1365 | |
1366 | |
1367 | #### Testing/Debugging |
1368 | @@ -71,8 +76,8 @@ docker exec -it apache2-container /bin/bash |
1369 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1370 | |
1371 | Download |
1372 | -[apache2.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04) and |
1373 | -[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/apache2:2.4-22.04_beta`), then: |
1374 | +[apache2.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04), [index.html](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04) and |
1375 | +[apache2-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/apache2:2.4-22.04_beta`), then: |
1376 | |
1377 | ```sh |
1378 | kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html |
1379 | diff --git a/docs/public.ecr.aws/lts/bind9.md b/docs/public.ecr.aws/lts/bind9.md |
1380 | index f30b9e1..1ddc90e 100644 |
1381 | --- a/docs/public.ecr.aws/lts/bind9.md |
1382 | +++ b/docs/public.ecr.aws/lts/bind9.md |
1383 | @@ -24,7 +24,12 @@ Up to 10 years customer security maintenance `from canonical/bind9`. [Request ac |
1384 | | `9.16-20.04_beta` | 04/2025 | 04/2030 | Bind9 9.16.1 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1385 | | _`track_risk`_ | |
1386 | |
1387 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1388 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1389 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1390 | +More risky channels are always implicitly available. |
1391 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1392 | +When `stable` is listed, all four are available. |
1393 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1394 | |
1395 | ### Commercial use and Extended Security Maintenance channels |
1396 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1397 | @@ -48,7 +53,7 @@ Access your Bind9 server at `localhost:30053` |
1398 | | `-e TZ=UTC` | Timezone. | |
1399 | | `-p 30053:53` | Expose bind9 on `localhost:30053`. | |
1400 | | `-e BIND9_USER=bind` | The user which will start the `named` process. | |
1401 | -| `-v /path/to/bind/configuration:/etc/bind/named.conf` | 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)). | |
1402 | +| `-v /path/to/bind/configuration:/etc/bind/named.conf` | 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)). | |
1403 | | `-v /path/to/cached/data:/var/cache/bind` | Location where locally cached data can be dumped. | |
1404 | | `-v /path/to/resource/records:/var/lib/bind` | Location of Resource Records defining various domain information. | |
1405 | |
1406 | @@ -73,7 +78,7 @@ docker exec -it bind9-container /bin/bash |
1407 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1408 | |
1409 | Download |
1410 | -[bind9-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/bind9:9.18-22.04_beta`), then: |
1411 | +[bind9-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/bind9:9.18-22.04_beta`), then: |
1412 | |
1413 | ```sh |
1414 | kubectl apply -f bind9-deployment.yml |
1415 | diff --git a/docs/public.ecr.aws/lts/cassandra.md b/docs/public.ecr.aws/lts/cassandra.md |
1416 | index f342728..233b1d1 100644 |
1417 | --- a/docs/public.ecr.aws/lts/cassandra.md |
1418 | +++ b/docs/public.ecr.aws/lts/cassandra.md |
1419 | @@ -22,7 +22,12 @@ Up to 10 years customer security maintenance `from canonical/cassandra`. [Reques |
1420 | |---|---|---|---|---| |
1421 | | _`track_risk`_ | |
1422 | |
1423 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1424 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1425 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1426 | +More risky channels are always implicitly available. |
1427 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1428 | +When `stable` is listed, all four are available. |
1429 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1430 | |
1431 | ### Commercial use and Extended Security Maintenance channels |
1432 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1433 | @@ -73,7 +78,7 @@ docker exec -it cassandra-container /bin/bash |
1434 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1435 | |
1436 | Download |
1437 | -[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/cassandra:latest`), then: |
1438 | +[cassandra-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/cassandra:latest`), then: |
1439 | |
1440 | ```sh |
1441 | kubectl apply -f cassandra-deployment.yml |
1442 | diff --git a/docs/public.ecr.aws/lts/cortex.md b/docs/public.ecr.aws/lts/cortex.md |
1443 | index 22ff38a..80e8469 100644 |
1444 | --- a/docs/public.ecr.aws/lts/cortex.md |
1445 | +++ b/docs/public.ecr.aws/lts/cortex.md |
1446 | @@ -29,7 +29,12 @@ Up to 10 years customer security maintenance `from canonical/cortex`. [Request a |
1447 | |---|---|---|---|---| |
1448 | | _`track_risk`_ | |
1449 | |
1450 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1451 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1452 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1453 | +More risky channels are always implicitly available. |
1454 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1455 | +When `stable` is listed, all four are available. |
1456 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1457 | |
1458 | ### Commercial use and Extended Security Maintenance channels |
1459 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1460 | @@ -52,7 +57,7 @@ Access your Cortex server at `http://localhost:32709`. |
1461 | |---|---| |
1462 | | `-e TZ=UTC` | Timezone. | |
1463 | | `-p 32709:9009` | Expose Cortex on `localhost:32709`. | |
1464 | -| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | 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)). | |
1465 | +| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | 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)). | |
1466 | |
1467 | |
1468 | #### Testing/Debugging |
1469 | @@ -75,8 +80,8 @@ docker exec -it cortex-container /bin/bash |
1470 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1471 | |
1472 | Download |
1473 | -[cortex.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04) and |
1474 | -[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/cortex:latest`), then: |
1475 | +[cortex.yaml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04) and |
1476 | +[cortex-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/cortex:latest`), then: |
1477 | |
1478 | ```sh |
1479 | kubectl create configmap cortex-config --from-file=main-config=cortex.yaml |
1480 | diff --git a/docs/public.ecr.aws/lts/grafana.md b/docs/public.ecr.aws/lts/grafana.md |
1481 | index eee018e..4c9656a 100644 |
1482 | --- a/docs/public.ecr.aws/lts/grafana.md |
1483 | +++ b/docs/public.ecr.aws/lts/grafana.md |
1484 | @@ -22,7 +22,12 @@ Up to 10 years customer security maintenance `from canonical/grafana`. [Request |
1485 | |---|---|---|---|---| |
1486 | | _`track_risk`_ | |
1487 | |
1488 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1489 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1490 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1491 | +More risky channels are always implicitly available. |
1492 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1493 | +When `stable` is listed, all four are available. |
1494 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1495 | |
1496 | ### Commercial use and Extended Security Maintenance channels |
1497 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1498 | @@ -69,8 +74,8 @@ docker exec -it grafana-container /bin/bash |
1499 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1500 | |
1501 | Download |
1502 | -[datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04) and |
1503 | -[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/grafana:latest`), then: |
1504 | +[datasource.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04), [dashboard.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04), [system-stats-dashboard.json](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04) and |
1505 | +[grafana-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/grafana:latest`), then: |
1506 | |
1507 | ```sh |
1508 | kubectl create configmap grafana-config --from-file=grafana-datasource=datasource.yml --from-file=grafana-dashboard-definition=dashboard.yml --from-file=grafana-dashboard=system-stats-dashboard.json |
1509 | diff --git a/docs/public.ecr.aws/lts/kafka.md b/docs/public.ecr.aws/lts/kafka.md |
1510 | index b5a607c..c4b0144 100644 |
1511 | --- a/docs/public.ecr.aws/lts/kafka.md |
1512 | +++ b/docs/public.ecr.aws/lts/kafka.md |
1513 | @@ -22,7 +22,12 @@ Up to 10 years customer security maintenance `from canonical/kafka`. [Request ac |
1514 | |---|---|---|---|---| |
1515 | | _`track_risk`_ | |
1516 | |
1517 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1518 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1519 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1520 | +More risky channels are always implicitly available. |
1521 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1522 | +When `stable` is listed, all four are available. |
1523 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1524 | |
1525 | ### Commercial use and Extended Security Maintenance channels |
1526 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1527 | @@ -73,7 +78,7 @@ docker exec -it kafka-container /bin/bash |
1528 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1529 | |
1530 | Download |
1531 | -[kafka-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.kafka.image` in `kafka-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/kafka:latest`), then: |
1532 | +[kafka-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.kafka.image` in `kafka-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/kafka:latest`), then: |
1533 | |
1534 | ```sh |
1535 | kubectl apply -f kafka-deployment.yml |
1536 | diff --git a/docs/public.ecr.aws/lts/loki.md b/docs/public.ecr.aws/lts/loki.md |
1537 | index ecf492d..b20e29d 100644 |
1538 | --- a/docs/public.ecr.aws/lts/loki.md |
1539 | +++ b/docs/public.ecr.aws/lts/loki.md |
1540 | @@ -22,7 +22,12 @@ Up to 10 years customer security maintenance `from canonical/loki`. [Request acc |
1541 | |---|---|---|---|---| |
1542 | | _`track_risk`_ | |
1543 | |
1544 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1545 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1546 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1547 | +More risky channels are always implicitly available. |
1548 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1549 | +When `stable` is listed, all four are available. |
1550 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1551 | |
1552 | ### Commercial use and Extended Security Maintenance channels |
1553 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1554 | @@ -45,7 +50,7 @@ You can now use your Loki instance exposed at `http://localhost:3100`. |
1555 | |---|---| |
1556 | | `-e TZ=UTC` | Timezone. | |
1557 | | `-p 3100:3100` | Expose Grafana Loki on `localhost:3100`. | |
1558 | -| `-v /local/path/to/config:/etc/loki/local-config.yaml` | 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). | |
1559 | +| `-v /local/path/to/config:/etc/loki/local-config.yaml` | 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). | |
1560 | | `-v lokidata:/loki` | Persist data in a docker volume named `lokidata`. | |
1561 | |
1562 | |
1563 | @@ -69,8 +74,8 @@ docker exec -it loki-container /bin/bash |
1564 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1565 | |
1566 | Download |
1567 | -[promtail-local-config-k8s.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04) and |
1568 | -[loki-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04) and set `containers.loki.image` in `loki-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/loki:latest`), then: |
1569 | +[promtail-local-config-k8s.yaml](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) and |
1570 | +[loki-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04) and set `containers.loki.image` in `loki-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/loki:latest`), then: |
1571 | |
1572 | ```sh |
1573 | kubectl create configmap promtail-config --from-file=promtail=promtail-local-config-k8s.yaml |
1574 | diff --git a/docs/public.ecr.aws/lts/memcached.md b/docs/public.ecr.aws/lts/memcached.md |
1575 | index f1682e8..8bd56f1 100644 |
1576 | --- a/docs/public.ecr.aws/lts/memcached.md |
1577 | +++ b/docs/public.ecr.aws/lts/memcached.md |
1578 | @@ -23,7 +23,12 @@ Up to 10 years customer security maintenance `from canonical/memcached`. [Reques |
1579 | | **`1.5-20.04_beta`** | 04/2025 | 04/2030 | Memcached 1.5.22 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1580 | | _`track_risk`_ | |
1581 | |
1582 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1583 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1584 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1585 | +More risky channels are always implicitly available. |
1586 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1587 | +When `stable` is listed, all four are available. |
1588 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1589 | |
1590 | ### Commercial use and Extended Security Maintenance channels |
1591 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1592 | @@ -101,7 +106,7 @@ In this case you can append the flags themselves or a shell script to the run co |
1593 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1594 | |
1595 | Download |
1596 | -[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/memcached:1.5-20.04_beta`), then: |
1597 | +[memcached-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/memcached:1.5-20.04_beta`), then: |
1598 | |
1599 | ```sh |
1600 | kubectl apply -f memcached-deployment.yml |
1601 | diff --git a/docs/public.ecr.aws/lts/mysql.md b/docs/public.ecr.aws/lts/mysql.md |
1602 | index 86d8d62..b9360f1 100644 |
1603 | --- a/docs/public.ecr.aws/lts/mysql.md |
1604 | +++ b/docs/public.ecr.aws/lts/mysql.md |
1605 | @@ -24,7 +24,12 @@ Up to 10 years customer security maintenance `from canonical/mysql`. [Request ac |
1606 | | `8.0-20.04_beta` | 04/2025 | 04/2030 | MySQL™ software 8.0.22 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1607 | | _`track_risk`_ | |
1608 | |
1609 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1610 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1611 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1612 | +More risky channels are always implicitly available. |
1613 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1614 | +When `stable` is listed, all four are available. |
1615 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1616 | |
1617 | ### Commercial use and Extended Security Maintenance channels |
1618 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1619 | @@ -56,7 +61,7 @@ Access your MySQL server at `localhost:30306`. |
1620 | | `-e MYSQL_INITSB_SKIP_TZINFO=yes` | Timezone data is automatically loaded via entrypoint script, set this variable to any non-empty value to disable it. | |
1621 | | `-p 30306:3306` | Expose MySQL server on `localhost:30306`. | |
1622 | | `-v /path/to/data:/var/lib/mysql` | Persist data instead of initializing a new database every time you launch a new container. | |
1623 | -| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | 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)). | |
1624 | +| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | 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)). | |
1625 | |
1626 | #### Initialization Scripts |
1627 | |
1628 | @@ -97,8 +102,8 @@ The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged i |
1629 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1630 | |
1631 | Download |
1632 | -[my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04) and |
1633 | -[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/mysql:8.0-22.04_beta`), then: |
1634 | +[my-custom.cnf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04) and |
1635 | +[mysql-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/mysql:8.0-22.04_beta`), then: |
1636 | |
1637 | ```sh |
1638 | kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf |
1639 | diff --git a/docs/public.ecr.aws/lts/nginx.md b/docs/public.ecr.aws/lts/nginx.md |
1640 | index d9a2b7e..723259b 100644 |
1641 | --- a/docs/public.ecr.aws/lts/nginx.md |
1642 | +++ b/docs/public.ecr.aws/lts/nginx.md |
1643 | @@ -24,7 +24,12 @@ Up to 10 years customer security maintenance `from canonical/nginx`. [Request ac |
1644 | | `1.18-20.04_beta` | 04/2025 | 04/2030 | Nginx 1.18.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1645 | | _`track_risk`_ | |
1646 | |
1647 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1648 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1649 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1650 | +More risky channels are always implicitly available. |
1651 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1652 | +When `stable` is listed, all four are available. |
1653 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1654 | |
1655 | ### Commercial use and Extended Security Maintenance channels |
1656 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1657 | @@ -49,7 +54,7 @@ Access your Nginx server at `http://localhost:8080`. |
1658 | | `-p 8080:80` | Expose Nginx on `localhost:8080`. | |
1659 | | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. | |
1660 | | `-v /path/to/conf.template:/etc/nginx/templates/conf.template` | 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;`). | |
1661 | -| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | 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)). | |
1662 | +| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | 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)). | |
1663 | |
1664 | |
1665 | #### Testing/Debugging |
1666 | @@ -72,8 +77,8 @@ docker exec -it nginx-container /bin/bash |
1667 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1668 | |
1669 | Download |
1670 | -[nginx.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04) and |
1671 | -[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/nginx:1.18-22.04_beta`), then: |
1672 | +[nginx.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04), [index.html](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04) and |
1673 | +[nginx-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/nginx:1.18-22.04_beta`), then: |
1674 | |
1675 | ```sh |
1676 | kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html |
1677 | diff --git a/docs/public.ecr.aws/lts/postgres.md b/docs/public.ecr.aws/lts/postgres.md |
1678 | index fe2a004..3f6383b 100644 |
1679 | --- a/docs/public.ecr.aws/lts/postgres.md |
1680 | +++ b/docs/public.ecr.aws/lts/postgres.md |
1681 | @@ -24,7 +24,12 @@ Up to 10 years customer security maintenance `from canonical/postgres`. [Request |
1682 | | `12-20.04_beta` | 04/2025 | 04/2030 | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1683 | | _`track_risk`_ | |
1684 | |
1685 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1686 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1687 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1688 | +More risky channels are always implicitly available. |
1689 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1690 | +When `stable` is listed, all four are available. |
1691 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1692 | |
1693 | ### Commercial use and Extended Security Maintenance channels |
1694 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1695 | @@ -54,7 +59,7 @@ Access your PostgreSQL server at `localhost:30432`. |
1696 | | `-e POSTGRES_HOST_AUTH_METHOD=trust` | Set the `auth-method` for `host` connections for `all` databases, `all` users, and `all` addresses. The following will be added to the `pg_hba.conf` if this option is passed: `host all all all $POSTGRES_HOST_AUTH_METHOD`. | |
1697 | | `-e PGDATA=/path/to/location` | Set the location of the database files. The default is `/var/lib/postgresql/data`. | |
1698 | | `-p 30432:5432` | Expose Postgres on `localhost:30432`. | |
1699 | -| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | 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)). | |
1700 | +| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | 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)). | |
1701 | | `-v /path/to/persisted/data:/var/lib/postgresql/data` | Persist data instead of initializing a new database every time you launch a new container. | |
1702 | |
1703 | #### Initialization Scripts |
1704 | @@ -96,8 +101,8 @@ The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged i |
1705 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1706 | |
1707 | Download |
1708 | -[postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04) and |
1709 | -[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/postgres:14-22.04_beta`), then: |
1710 | +[postgresql.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04) and |
1711 | +[postgres-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/postgres:14-22.04_beta`), then: |
1712 | |
1713 | ```sh |
1714 | kubectl create configmap postgres-config --from-file=main-config=postgresql.conf |
1715 | diff --git a/docs/public.ecr.aws/lts/prometheus-alertmanager.md b/docs/public.ecr.aws/lts/prometheus-alertmanager.md |
1716 | index abaebf4..807cdec 100644 |
1717 | --- a/docs/public.ecr.aws/lts/prometheus-alertmanager.md |
1718 | +++ b/docs/public.ecr.aws/lts/prometheus-alertmanager.md |
1719 | @@ -22,7 +22,12 @@ Up to 10 years customer security maintenance `from canonical/prometheus-alertman |
1720 | |---|---|---|---|---| |
1721 | | _`track_risk`_ | |
1722 | |
1723 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1724 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1725 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1726 | +More risky channels are always implicitly available. |
1727 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1728 | +When `stable` is listed, all four are available. |
1729 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1730 | |
1731 | ### Commercial use and Extended Security Maintenance channels |
1732 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1733 | @@ -45,7 +50,7 @@ Access your Prometheus Alertmanager server at `localhost:30093`. |
1734 | |---|---| |
1735 | | `-e TZ=UTC` | Timezone. | |
1736 | | `-p 30093:9093` | Expose Prometheus Alertmanager on `localhost:30093`. | |
1737 | -| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | 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)). | |
1738 | +| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | 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)). | |
1739 | | `-v /path/to/persisted/data:/alertmanager` | 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. | |
1740 | |
1741 | |
1742 | @@ -69,8 +74,8 @@ docker exec -it prometheus-alertmanager-container /bin/bash |
1743 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1744 | |
1745 | Download |
1746 | -[alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04) and |
1747 | -[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/prometheus-alertmanager:latest`), then: |
1748 | +[alertmanager.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04) and |
1749 | +[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/prometheus-alertmanager:latest`), then: |
1750 | |
1751 | ```sh |
1752 | kubectl create configmap alertmanager-config --from-file=alertmanager=alertmanager.yml |
1753 | diff --git a/docs/public.ecr.aws/lts/prometheus.md b/docs/public.ecr.aws/lts/prometheus.md |
1754 | index d33d6d3..d3c3543 100644 |
1755 | --- a/docs/public.ecr.aws/lts/prometheus.md |
1756 | +++ b/docs/public.ecr.aws/lts/prometheus.md |
1757 | @@ -22,7 +22,12 @@ Up to 10 years customer security maintenance `from canonical/prometheus`. [Reque |
1758 | |---|---|---|---|---| |
1759 | | _`track_risk`_ | |
1760 | |
1761 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1762 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1763 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1764 | +More risky channels are always implicitly available. |
1765 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1766 | +When `stable` is listed, all four are available. |
1767 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1768 | |
1769 | ### Commercial use and Extended Security Maintenance channels |
1770 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1771 | @@ -45,8 +50,8 @@ Access your Prometheus server at `localhost:30090`. |
1772 | |---|---| |
1773 | | `-e TZ=UTC` | Timezone. | |
1774 | | `-p 30090:9090` | Expose Prometheus server on `localhost:30090`. | |
1775 | -| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | 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)). | |
1776 | -| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | 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)). | |
1777 | +| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | 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)). | |
1778 | +| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | 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)). | |
1779 | |
1780 | |
1781 | #### Testing/Debugging |
1782 | @@ -69,8 +74,8 @@ docker exec -it prometheus-container /bin/bash |
1783 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1784 | |
1785 | Download |
1786 | -[prometheus.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04) and |
1787 | -[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/prometheus:latest`), then: |
1788 | +[prometheus.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04), [alerts.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04) and |
1789 | +[prometheus-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/prometheus:latest`), then: |
1790 | |
1791 | ```sh |
1792 | kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml |
1793 | diff --git a/docs/public.ecr.aws/lts/redis.md b/docs/public.ecr.aws/lts/redis.md |
1794 | index 67893e5..710da56 100644 |
1795 | --- a/docs/public.ecr.aws/lts/redis.md |
1796 | +++ b/docs/public.ecr.aws/lts/redis.md |
1797 | @@ -22,7 +22,12 @@ Up to 10 years customer security maintenance `from canonical/redis`. [Request ac |
1798 | |---|---|---|---|---| |
1799 | | _`track_risk`_ | |
1800 | |
1801 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1802 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1803 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1804 | +More risky channels are always implicitly available. |
1805 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1806 | +When `stable` is listed, all four are available. |
1807 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1808 | |
1809 | ### Commercial use and Extended Security Maintenance channels |
1810 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1811 | @@ -50,7 +55,7 @@ Access your Redis server at `localhost:30073`. |
1812 | | `-e REDIS_ALLOW_REMOTE_CONNECTIONS=yes` | Set to `no` to disallow remote connections to `redis-server` (i.e., make `redis-server` listen to `127.0.0.1` only). | |
1813 | | `-e REDIS_EXTRA_FLAGS` | Specify extra flags to be passed to `redis-server` when initializing it. | |
1814 | | `-p 30073:6379` | Expose redis on `localhost:30073`. | |
1815 | -| `-v /path/to/redis.conf:/etc/redis/redis.conf` | 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)). **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines. |
1816 | +| `-v /path/to/redis.conf:/etc/redis/redis.conf` | 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)). **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines. |
1817 | | |
1818 | |
1819 | |
1820 | @@ -90,8 +95,8 @@ redis:6379> |
1821 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1822 | |
1823 | Download |
1824 | -[redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and |
1825 | -[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/redis:latest`), then: |
1826 | +[redis.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and |
1827 | +[redis-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/redis:latest`), then: |
1828 | |
1829 | ```sh |
1830 | kubectl create configmap redis-config --from-file=redis=redis.conf |
1831 | diff --git a/docs/public.ecr.aws/lts/squid.md b/docs/public.ecr.aws/lts/squid.md |
1832 | index 5ab66a1..3ae08b9 100644 |
1833 | --- a/docs/public.ecr.aws/lts/squid.md |
1834 | +++ b/docs/public.ecr.aws/lts/squid.md |
1835 | @@ -24,7 +24,12 @@ Up to 10 years customer security maintenance `from canonical/squid`. [Request ac |
1836 | | `4.10-20.04_beta` | 04/2025 | 04/2030 | Squid 4.10 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1837 | | _`track_risk`_ | |
1838 | |
1839 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1840 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1841 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1842 | +More risky channels are always implicitly available. |
1843 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1844 | +When `stable` is listed, all four are available. |
1845 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1846 | |
1847 | ### Commercial use and Extended Security Maintenance channels |
1848 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1849 | @@ -73,8 +78,8 @@ docker exec -it squid-container /bin/bash |
1850 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1851 | |
1852 | Download |
1853 | -[squid.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04) and |
1854 | -[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/squid:5.2-22.04_beta`), then: |
1855 | +[squid.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04) and |
1856 | +[squid-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/squid:5.2-22.04_beta`), then: |
1857 | |
1858 | ```sh |
1859 | kubectl create configmap squid-config --from-file=squid=squid.conf |
1860 | diff --git a/docs/public.ecr.aws/lts/telegraf.md b/docs/public.ecr.aws/lts/telegraf.md |
1861 | index a3bb9d5..3ff4ab8 100644 |
1862 | --- a/docs/public.ecr.aws/lts/telegraf.md |
1863 | +++ b/docs/public.ecr.aws/lts/telegraf.md |
1864 | @@ -22,7 +22,12 @@ Up to 10 years customer security maintenance `from canonical/telegraf`. [Request |
1865 | |---|---|---|---|---| |
1866 | | _`track_risk`_ | |
1867 | |
1868 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1869 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1870 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1871 | +More risky channels are always implicitly available. |
1872 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1873 | +When `stable` is listed, all four are available. |
1874 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1875 | |
1876 | ### Commercial use and Extended Security Maintenance channels |
1877 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1878 | @@ -45,7 +50,7 @@ Access your Telegraf server at `localhost:30273`. |
1879 | |---|---| |
1880 | | `-e TZ=UTC` | Timezone. | |
1881 | | `-p 30273:9273` | Expose Telegraf on `localhost:30273`. | |
1882 | -| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | 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)). | |
1883 | +| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | 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)). | |
1884 | |
1885 | |
1886 | #### Testing/Debugging |
1887 | @@ -68,8 +73,8 @@ docker exec -it telegraf-container /bin/bash |
1888 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1889 | |
1890 | Download |
1891 | -[telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and |
1892 | -[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/telegraf:latest`), then: |
1893 | +[telegraf.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and |
1894 | +[telegraf-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/telegraf:latest`), then: |
1895 | |
1896 | ```sh |
1897 | kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf |
1898 | diff --git a/docs/public.ecr.aws/lts/zookeeper.md b/docs/public.ecr.aws/lts/zookeeper.md |
1899 | index 9a6c415..b6692b4 100644 |
1900 | --- a/docs/public.ecr.aws/lts/zookeeper.md |
1901 | +++ b/docs/public.ecr.aws/lts/zookeeper.md |
1902 | @@ -22,7 +22,12 @@ Up to 10 years customer security maintenance `from canonical/zookeeper`. [Reques |
1903 | |---|---|---|---|---| |
1904 | | _`track_risk`_ | |
1905 | |
1906 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1907 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1908 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1909 | +More risky channels are always implicitly available. |
1910 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1911 | +When `stable` is listed, all four are available. |
1912 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1913 | |
1914 | ### Commercial use and Extended Security Maintenance channels |
1915 | If your usage includes redistribution or requires unavailable channels/versions, please [get in touch with the Canonical team](https://ubuntu.com/security/docker-images#get-in-touch) (or using rocks@canonical.com). |
1916 | @@ -68,7 +73,7 @@ docker exec -it zookeeper-container /bin/bash |
1917 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1918 | |
1919 | Download |
1920 | -[zookeeper-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.zookeeper.image` in `zookeeper-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/zookeeper:latest`), then: |
1921 | +[zookeeper-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.zookeeper.image` in `zookeeper-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/lts/zookeeper:latest`), then: |
1922 | |
1923 | ```sh |
1924 | kubectl apply -f zookeeper-deployment.yml |
1925 | diff --git a/docs/public.ecr.aws/ubuntu/apache2.md b/docs/public.ecr.aws/ubuntu/apache2.md |
1926 | index f247eb4..011ec2b 100644 |
1927 | --- a/docs/public.ecr.aws/ubuntu/apache2.md |
1928 | +++ b/docs/public.ecr.aws/ubuntu/apache2.md |
1929 | @@ -1,6 +1,7 @@ |
1930 | # Apache2 | Ubuntu |
1931 | |
1932 | -Current Apache2 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache2 or Ubuntu release. |
1933 | +Current Apache2 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
1934 | +Receives security updates and tracks the newest combination of Apache2 and Ubuntu. |
1935 | For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/apache2](https://gallery.ecr.aws/lts/apache2). |
1936 | |
1937 | ## About Apache2 |
1938 | @@ -18,7 +19,6 @@ Up to 10 years customer security maintenance `from canonical/apache2`. [Request |
1939 | | Channel Tag | | | Currently | Architectures | |
1940 | |---|---|---|---|---| |
1941 | | _**`2.4-22.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1942 | - | `2.4-21.10_beta` | [](https://gallery.ecr.aws/lts/apache2) | [](https://gallery.ecr.aws/lts/apache2) | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
1943 | | _`track_risk`_ | |
1944 | |
1945 | _The following tags are not available in public.ecr.aws/ubuntu/apache2 but are shown here for completeness:_ |
1946 | @@ -30,7 +30,12 @@ _The following tags are not available in public.ecr.aws/ubuntu/apache2 but are s |
1947 | | _`track_risk`_ | |
1948 | |
1949 | |
1950 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1951 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
1952 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
1953 | +More risky channels are always implicitly available. |
1954 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
1955 | +When `stable` is listed, all four are available. |
1956 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
1957 | |
1958 | |
1959 | ### Commercial use and Extended Security Maintenance channels |
1960 | @@ -41,7 +46,8 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
1961 | |
1962 | | Track | Version | EOL | Upgrade Path | |
1963 | |---|---|---|---| |
1964 | - | ~~2.4-21.04~~ | Apache2 2.4.46 on Ubuntu 21.04 | 01/2022 | 2.4-21.10_beta | |
1965 | + | ~~2.4-21.10~~ | Apache2 2.4.48 on Ubuntu 21.10 | 07/2022 | 2.4-22.04_beta | |
1966 | + | ~~2.4-21.04~~ | Apache2 2.4.46 on Ubuntu 21.04 | 01/2022 | ~~2.4-21.10~~ | |
1967 | | _`track`_ | |
1968 | |
1969 | |
1970 | @@ -50,7 +56,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
1971 | Launch this image locally: |
1972 | |
1973 | ```sh |
1974 | -docker run -d --name apache2-container -e TZ=UTC -p 8080:80 public.ecr.aws/ubuntu/apache2:2.4-21.04 |
1975 | +docker run -d --name apache2-container -e TZ=UTC -p 8080:80 public.ecr.aws/ubuntu/apache2:2.4-21.10 |
1976 | ``` |
1977 | Access your Apache2 server at `http://localhost:8080`. |
1978 | |
1979 | @@ -61,7 +67,7 @@ Access your Apache2 server at `http://localhost:8080`. |
1980 | | `-e TZ=UTC` | Timezone. | |
1981 | | `-p 8080:80` | Expose Apache2 on `localhost:8080`. | |
1982 | | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. | |
1983 | -| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | 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)). | |
1984 | +| `-v /path/to/apache2.conf:/etc/apache2/apache2.conf` | 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)). | |
1985 | |
1986 | |
1987 | #### Testing/Debugging |
1988 | @@ -84,8 +90,8 @@ docker exec -it apache2-container /bin/bash |
1989 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
1990 | |
1991 | Download |
1992 | -[apache2.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04) and |
1993 | -[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/apache2:2.4-21.04`), then: |
1994 | +[apache2.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf?h=2.4-22.04), [index.html](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html?h=2.4-22.04) and |
1995 | +[apache2-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml?h=2.4-22.04) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/apache2:2.4-21.10`), then: |
1996 | |
1997 | ```sh |
1998 | kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html |
1999 | diff --git a/docs/public.ecr.aws/ubuntu/bind9.md b/docs/public.ecr.aws/ubuntu/bind9.md |
2000 | index 3533670..00f6911 100644 |
2001 | --- a/docs/public.ecr.aws/ubuntu/bind9.md |
2002 | +++ b/docs/public.ecr.aws/ubuntu/bind9.md |
2003 | @@ -1,6 +1,7 @@ |
2004 | # Bind9 | Ubuntu |
2005 | |
2006 | -Current Bind9 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Bind9 or Ubuntu release. |
2007 | +Current Bind9 Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2008 | +Receives security updates and tracks the newest combination of Bind9 and Ubuntu. |
2009 | For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/bind9](https://gallery.ecr.aws/lts/bind9). |
2010 | |
2011 | ## About Bind9 |
2012 | @@ -18,7 +19,6 @@ Up to 10 years customer security maintenance `from canonical/bind9`. [Request ac |
2013 | | Channel Tag | | | Currently | Architectures | |
2014 | |---|---|---|---|---| |
2015 | | _**`9.18-22.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | Bind9 9.18 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
2016 | - | `9.16-21.10_beta` | [](https://gallery.ecr.aws/lts/bind9) | [](https://gallery.ecr.aws/lts/bind9) | Bind9 9.16.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
2017 | | _`track_risk`_ | |
2018 | |
2019 | _The following tags are not available in public.ecr.aws/ubuntu/bind9 but are shown here for completeness:_ |
2020 | @@ -30,7 +30,12 @@ _The following tags are not available in public.ecr.aws/ubuntu/bind9 but are sho |
2021 | | _`track_risk`_ | |
2022 | |
2023 | |
2024 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2025 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2026 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2027 | +More risky channels are always implicitly available. |
2028 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2029 | +When `stable` is listed, all four are available. |
2030 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2031 | |
2032 | |
2033 | ### Commercial use and Extended Security Maintenance channels |
2034 | @@ -41,6 +46,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2035 | |
2036 | | Track | Version | EOL | Upgrade Path | |
2037 | |---|---|---|---| |
2038 | + | ~~9.16-21.10~~ | Bind9 9.16.15 on Ubuntu 21.10 | 07/2022 | 9.18-22.04_beta | |
2039 | | _`track`_ | |
2040 | |
2041 | |
2042 | @@ -49,7 +55,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2043 | Launch this image locally: |
2044 | |
2045 | ```sh |
2046 | -docker run -d --name bind9-container -e TZ=UTC -p 30053:53 public.ecr.aws/ubuntu/bind9:9.18-22.04_beta |
2047 | +docker run -d --name bind9-container -e TZ=UTC -p 30053:53 public.ecr.aws/ubuntu/bind9:9.16-21.10 |
2048 | ``` |
2049 | Access your Bind9 server at `localhost:30053` |
2050 | |
2051 | @@ -60,7 +66,7 @@ Access your Bind9 server at `localhost:30053` |
2052 | | `-e TZ=UTC` | Timezone. | |
2053 | | `-p 30053:53` | Expose bind9 on `localhost:30053`. | |
2054 | | `-e BIND9_USER=bind` | The user which will start the `named` process. | |
2055 | -| `-v /path/to/bind/configuration:/etc/bind/named.conf` | 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)). | |
2056 | +| `-v /path/to/bind/configuration:/etc/bind/named.conf` | 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)). | |
2057 | | `-v /path/to/cached/data:/var/cache/bind` | Location where locally cached data can be dumped. | |
2058 | | `-v /path/to/resource/records:/var/lib/bind` | Location of Resource Records defining various domain information. | |
2059 | |
2060 | @@ -85,7 +91,7 @@ docker exec -it bind9-container /bin/bash |
2061 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2062 | |
2063 | Download |
2064 | -[bind9-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/bind9:9.18-22.04_beta`), then: |
2065 | +[bind9-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml?h=9.18-22.04) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/bind9:9.16-21.10`), then: |
2066 | |
2067 | ```sh |
2068 | kubectl apply -f bind9-deployment.yml |
2069 | diff --git a/docs/public.ecr.aws/ubuntu/cassandra.md b/docs/public.ecr.aws/ubuntu/cassandra.md |
2070 | index 748f0fe..5f3aece 100644 |
2071 | --- a/docs/public.ecr.aws/ubuntu/cassandra.md |
2072 | +++ b/docs/public.ecr.aws/ubuntu/cassandra.md |
2073 | @@ -1,6 +1,7 @@ |
2074 | # Apache Cassandra | Ubuntu |
2075 | |
2076 | -Current Apache Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache Cassandra or Ubuntu release. |
2077 | +Current Apache Cassandra Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2078 | +Receives security updates and tracks the newest combination of Apache Cassandra and Ubuntu. |
2079 | |
2080 | ## About Apache Cassandra |
2081 | |
2082 | @@ -20,7 +21,12 @@ Up to 10 years customer security maintenance `from canonical/cassandra`. [Reques |
2083 | | _`track_risk`_ | |
2084 | |
2085 | |
2086 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2087 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2088 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2089 | +More risky channels are always implicitly available. |
2090 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2091 | +When `stable` is listed, all four are available. |
2092 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2093 | |
2094 | |
2095 | ### Commercial use and Extended Security Maintenance channels |
2096 | @@ -80,7 +86,7 @@ docker exec -it cassandra-container /bin/bash |
2097 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2098 | |
2099 | Download |
2100 | -[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cassandra:4.0-21.10`), then: |
2101 | +[cassandra-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml?h=4.0-22.04) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cassandra:4.0-21.10`), then: |
2102 | |
2103 | ```sh |
2104 | kubectl apply -f cassandra-deployment.yml |
2105 | diff --git a/docs/public.ecr.aws/ubuntu/cortex.md b/docs/public.ecr.aws/ubuntu/cortex.md |
2106 | index 2fac18a..cbcaa01 100644 |
2107 | --- a/docs/public.ecr.aws/ubuntu/cortex.md |
2108 | +++ b/docs/public.ecr.aws/ubuntu/cortex.md |
2109 | @@ -1,6 +1,7 @@ |
2110 | # Cortex | Ubuntu |
2111 | |
2112 | -Current Cortex Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Cortex or Ubuntu release. |
2113 | +Current Cortex Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2114 | +Receives security updates and tracks the newest combination of Cortex and Ubuntu. |
2115 | |
2116 | ## About Cortex |
2117 | |
2118 | @@ -27,7 +28,12 @@ Up to 10 years customer security maintenance `from canonical/cortex`. [Request a |
2119 | | _`track_risk`_ | |
2120 | |
2121 | |
2122 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2123 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2124 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2125 | +More risky channels are always implicitly available. |
2126 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2127 | +When `stable` is listed, all four are available. |
2128 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2129 | |
2130 | |
2131 | ### Commercial use and Extended Security Maintenance channels |
2132 | @@ -59,7 +65,7 @@ Access your Cortex server at `http://localhost:32709`. |
2133 | |---|---| |
2134 | | `-e TZ=UTC` | Timezone. | |
2135 | | `-p 32709:9009` | Expose Cortex on `localhost:32709`. | |
2136 | -| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | 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)). | |
2137 | +| `-v /my/local/cortex.yaml:/etc/cortex/cortex.yaml` | 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)). | |
2138 | |
2139 | |
2140 | #### Testing/Debugging |
2141 | @@ -82,8 +88,8 @@ docker exec -it cortex-container /bin/bash |
2142 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2143 | |
2144 | Download |
2145 | -[cortex.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04) and |
2146 | -[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cortex:1.10-21.10`), then: |
2147 | +[cortex.yaml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml?h=1.11-22.04) and |
2148 | +[cortex-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml?h=1.11-22.04) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cortex:1.10-21.10`), then: |
2149 | |
2150 | ```sh |
2151 | kubectl create configmap cortex-config --from-file=main-config=cortex.yaml |
2152 | diff --git a/docs/public.ecr.aws/ubuntu/grafana.md b/docs/public.ecr.aws/ubuntu/grafana.md |
2153 | index 1108fcb..bdede4f 100644 |
2154 | --- a/docs/public.ecr.aws/ubuntu/grafana.md |
2155 | +++ b/docs/public.ecr.aws/ubuntu/grafana.md |
2156 | @@ -1,6 +1,7 @@ |
2157 | # Grafana™ software | Ubuntu |
2158 | |
2159 | -Current Grafana™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana™ software or Ubuntu release. |
2160 | +Current Grafana™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2161 | +Receives security updates and tracks the newest combination of Grafana™ software and Ubuntu. |
2162 | |
2163 | ## About Grafana™ software |
2164 | |
2165 | @@ -20,7 +21,12 @@ Up to 10 years customer security maintenance `from canonical/grafana`. [Request |
2166 | | _`track_risk`_ | |
2167 | |
2168 | |
2169 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2170 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2171 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2172 | +More risky channels are always implicitly available. |
2173 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2174 | +When `stable` is listed, all four are available. |
2175 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2176 | |
2177 | |
2178 | ### Commercial use and Extended Security Maintenance channels |
2179 | @@ -76,8 +82,8 @@ docker exec -it grafana-container /bin/bash |
2180 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2181 | |
2182 | Download |
2183 | -[datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04) and |
2184 | -[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/grafana:8.1-21.10`), then: |
2185 | +[datasource.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml?h=8.2-22.04), [dashboard.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml?h=8.2-22.04), [system-stats-dashboard.json](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json?h=8.2-22.04) and |
2186 | +[grafana-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml?h=8.2-22.04) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/grafana:8.1-21.10`), then: |
2187 | |
2188 | ```sh |
2189 | kubectl create configmap grafana-config --from-file=grafana-datasource=datasource.yml --from-file=grafana-dashboard-definition=dashboard.yml --from-file=grafana-dashboard=system-stats-dashboard.json |
2190 | diff --git a/docs/public.ecr.aws/ubuntu/kafka.md b/docs/public.ecr.aws/ubuntu/kafka.md |
2191 | index 59a4554..761c2bb 100644 |
2192 | --- a/docs/public.ecr.aws/ubuntu/kafka.md |
2193 | +++ b/docs/public.ecr.aws/ubuntu/kafka.md |
2194 | @@ -1,6 +1,7 @@ |
2195 | # Apache Kafka | Ubuntu |
2196 | |
2197 | -Current Apache Kafka Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache Kafka or Ubuntu release. |
2198 | +Current Apache Kafka Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2199 | +Receives security updates and tracks the newest combination of Apache Kafka and Ubuntu. |
2200 | |
2201 | ## About Apache Kafka |
2202 | |
2203 | @@ -20,7 +21,12 @@ Up to 10 years customer security maintenance `from canonical/kafka`. [Request ac |
2204 | | _`track_risk`_ | |
2205 | |
2206 | |
2207 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2208 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2209 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2210 | +More risky channels are always implicitly available. |
2211 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2212 | +When `stable` is listed, all four are available. |
2213 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2214 | |
2215 | |
2216 | ### Commercial use and Extended Security Maintenance channels |
2217 | @@ -77,7 +83,7 @@ docker exec -it kafka-container /bin/bash |
2218 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2219 | |
2220 | Download |
2221 | -[kafka-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.kafka.image` in `kafka-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/kafka:3.1-22.04_beta`), then: |
2222 | +[kafka-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.kafka.image` in `kafka-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/kafka:3.1-22.04_beta`), then: |
2223 | |
2224 | ```sh |
2225 | kubectl apply -f kafka-deployment.yml |
2226 | diff --git a/docs/public.ecr.aws/ubuntu/loki.md b/docs/public.ecr.aws/ubuntu/loki.md |
2227 | index 4346232..11adcdd 100644 |
2228 | --- a/docs/public.ecr.aws/ubuntu/loki.md |
2229 | +++ b/docs/public.ecr.aws/ubuntu/loki.md |
2230 | @@ -1,6 +1,7 @@ |
2231 | # Grafana Loki™ software | Ubuntu |
2232 | |
2233 | -Current Grafana Loki™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Grafana Loki™ software or Ubuntu release. |
2234 | +Current Grafana Loki™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2235 | +Receives security updates and tracks the newest combination of Grafana Loki™ software and Ubuntu. |
2236 | |
2237 | ## About Grafana Loki™ software |
2238 | |
2239 | @@ -20,7 +21,12 @@ Up to 10 years customer security maintenance `from canonical/loki`. [Request acc |
2240 | | _`track_risk`_ | |
2241 | |
2242 | |
2243 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2244 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2245 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2246 | +More risky channels are always implicitly available. |
2247 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2248 | +When `stable` is listed, all four are available. |
2249 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2250 | |
2251 | |
2252 | ### Commercial use and Extended Security Maintenance channels |
2253 | @@ -49,7 +55,7 @@ You can now use your Loki instance exposed at `http://localhost:3100`. |
2254 | |---|---| |
2255 | | `-e TZ=UTC` | Timezone. | |
2256 | | `-p 3100:3100` | Expose Grafana Loki on `localhost:3100`. | |
2257 | -| `-v /local/path/to/config:/etc/loki/local-config.yaml` | 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). | |
2258 | +| `-v /local/path/to/config:/etc/loki/local-config.yaml` | 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). | |
2259 | | `-v lokidata:/loki` | Persist data in a docker volume named `lokidata`. | |
2260 | |
2261 | |
2262 | @@ -73,8 +79,8 @@ docker exec -it loki-container /bin/bash |
2263 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2264 | |
2265 | Download |
2266 | -[promtail-local-config-k8s.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/config/promtail-local-config-k8s.yaml?h=2.4-22.04) and |
2267 | -[loki-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04) and set `containers.loki.image` in `loki-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/loki:2.4-22.04_beta`), then: |
2268 | +[promtail-local-config-k8s.yaml](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) and |
2269 | +[loki-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/loki/plain/examples/loki-deployment.yml?h=2.4-22.04) and set `containers.loki.image` in `loki-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/loki:2.4-22.04_beta`), then: |
2270 | |
2271 | ```sh |
2272 | kubectl create configmap promtail-config --from-file=promtail=promtail-local-config-k8s.yaml |
2273 | diff --git a/docs/public.ecr.aws/ubuntu/memcached.md b/docs/public.ecr.aws/ubuntu/memcached.md |
2274 | index 213ef3c..9791e8b 100644 |
2275 | --- a/docs/public.ecr.aws/ubuntu/memcached.md |
2276 | +++ b/docs/public.ecr.aws/ubuntu/memcached.md |
2277 | @@ -1,6 +1,7 @@ |
2278 | # Memcached | Ubuntu |
2279 | |
2280 | -Current Memcached Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Memcached or Ubuntu release. |
2281 | +Current Memcached Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2282 | +Receives security updates and tracks the newest combination of Memcached and Ubuntu. |
2283 | For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/memcached](https://gallery.ecr.aws/lts/memcached). |
2284 | |
2285 | ## About Memcached |
2286 | @@ -18,7 +19,6 @@ Up to 10 years customer security maintenance `from canonical/memcached`. [Reques |
2287 | | Channel Tag | | | Currently | Architectures | |
2288 | |---|---|---|---|---| |
2289 | | **`1.6-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/memcached) | [](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
2290 | - | `1.6-21.10_beta` | [](https://gallery.ecr.aws/lts/memcached) | [](https://gallery.ecr.aws/lts/memcached) | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
2291 | | _`track_risk`_ | |
2292 | |
2293 | _The following tags are not available in public.ecr.aws/ubuntu/memcached but are shown here for completeness:_ |
2294 | @@ -29,7 +29,12 @@ _The following tags are not available in public.ecr.aws/ubuntu/memcached but are |
2295 | | _`track_risk`_ | |
2296 | |
2297 | |
2298 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2299 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2300 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2301 | +More risky channels are always implicitly available. |
2302 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2303 | +When `stable` is listed, all four are available. |
2304 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2305 | |
2306 | |
2307 | ### Commercial use and Extended Security Maintenance channels |
2308 | @@ -40,7 +45,8 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2309 | |
2310 | | Track | Version | EOL | Upgrade Path | |
2311 | |---|---|---|---| |
2312 | - | ~~1.6-21.04~~ | Memcached 1.6.9 on Ubuntu 21.04 | 01/2022 | 1.6-21.10_beta | |
2313 | + | ~~1.6-21.10~~ | Memcached 1.6.9 on Ubuntu 21.10 | 07/2022 | 1.6-22.04_beta | |
2314 | + | ~~1.6-21.04~~ | Memcached 1.6.9 on Ubuntu 21.04 | 01/2022 | ~~1.6-21.10~~ | |
2315 | | _`track`_ | |
2316 | |
2317 | |
2318 | @@ -49,7 +55,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2319 | Launch this image locally: |
2320 | |
2321 | ```sh |
2322 | -docker run -d --name memcached-container -e TZ=UTC public.ecr.aws/ubuntu/memcached:1.6-21.04 |
2323 | +docker run -d --name memcached-container -e TZ=UTC public.ecr.aws/ubuntu/memcached:1.6-21.10 |
2324 | ``` |
2325 | |
2326 | #### Parameters |
2327 | @@ -114,7 +120,7 @@ In this case you can append the flags themselves or a shell script to the run co |
2328 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2329 | |
2330 | Download |
2331 | -[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/memcached:1.6-21.04`), then: |
2332 | +[memcached-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml?h=1.6-22.04) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/memcached:1.6-21.10`), then: |
2333 | |
2334 | ```sh |
2335 | kubectl apply -f memcached-deployment.yml |
2336 | diff --git a/docs/public.ecr.aws/ubuntu/mysql.md b/docs/public.ecr.aws/ubuntu/mysql.md |
2337 | index 42fe55e..cfb5213 100644 |
2338 | --- a/docs/public.ecr.aws/ubuntu/mysql.md |
2339 | +++ b/docs/public.ecr.aws/ubuntu/mysql.md |
2340 | @@ -1,6 +1,7 @@ |
2341 | # MySQL™ software | Ubuntu |
2342 | |
2343 | -Current MySQL™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer MySQL™ software or Ubuntu release. |
2344 | +Current MySQL™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2345 | +Receives security updates and tracks the newest combination of MySQL™ software and Ubuntu. |
2346 | For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/mysql](https://gallery.ecr.aws/lts/mysql). |
2347 | |
2348 | ## About MySQL™ software |
2349 | @@ -18,7 +19,6 @@ Up to 10 years customer security maintenance `from canonical/mysql`. [Request ac |
2350 | | Channel Tag | | | Currently | Architectures | |
2351 | |---|---|---|---|---| |
2352 | | _**`8.0-22.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
2353 | - | `8.0-21.10_beta` | [](https://gallery.ecr.aws/lts/mysql) | [](https://gallery.ecr.aws/lts/mysql) | MySQL™ software 8.0.27 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
2354 | | _`track_risk`_ | |
2355 | |
2356 | _The following tags are not available in public.ecr.aws/ubuntu/mysql but are shown here for completeness:_ |
2357 | @@ -30,7 +30,12 @@ _The following tags are not available in public.ecr.aws/ubuntu/mysql but are sho |
2358 | | _`track_risk`_ | |
2359 | |
2360 | |
2361 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2362 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2363 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2364 | +More risky channels are always implicitly available. |
2365 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2366 | +When `stable` is listed, all four are available. |
2367 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2368 | |
2369 | |
2370 | ### Commercial use and Extended Security Maintenance channels |
2371 | @@ -41,7 +46,8 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2372 | |
2373 | | Track | Version | EOL | Upgrade Path | |
2374 | |---|---|---|---| |
2375 | - | ~~8.0-21.04~~ | MySQL™ software 8.0.27 on Ubuntu 21.04 | 01/2022 | 8.0-21.10_beta | |
2376 | + | ~~8.0-21.10~~ | MySQL™ software 8.0.27 on Ubuntu 21.10 | 07/2022 | 8.0-22.04_beta | |
2377 | + | ~~8.0-21.04~~ | MySQL™ software 8.0.27 on Ubuntu 21.04 | 01/2022 | ~~8.0-21.10~~ | |
2378 | | _`track`_ | |
2379 | |
2380 | |
2381 | @@ -50,7 +56,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2382 | Launch this image locally: |
2383 | |
2384 | ```sh |
2385 | -docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ public.ecr.aws/ubuntu/mysql:8.0-21.04 |
2386 | +docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ public.ecr.aws/ubuntu/mysql:8.0-21.10 |
2387 | ``` |
2388 | Access your MySQL server at `localhost:30306`. |
2389 | |
2390 | @@ -69,7 +75,7 @@ Access your MySQL server at `localhost:30306`. |
2391 | | `-e MYSQL_INITSB_SKIP_TZINFO=yes` | Timezone data is automatically loaded via entrypoint script, set this variable to any non-empty value to disable it. | |
2392 | | `-p 30306:3306` | Expose MySQL server on `localhost:30306`. | |
2393 | | `-v /path/to/data:/var/lib/mysql` | Persist data instead of initializing a new database every time you launch a new container. | |
2394 | -| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | 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)). | |
2395 | +| `-v /path/to/config/files/:/etc/mysql/mysql.conf.d/` | 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)). | |
2396 | |
2397 | #### Initialization Scripts |
2398 | |
2399 | @@ -101,7 +107,7 @@ This image also includes the `mysql` client for interactive container use: |
2400 | ```sh |
2401 | $ docker network create mysql-network |
2402 | $ docker network connect mysql-network mysql-container |
2403 | -$ docker run -it --rm --network mysql-network public.ecr.aws/ubuntu/mysql:8.0-21.04 mysql -hmysql-container -uroot -p |
2404 | +$ docker run -it --rm --network mysql-network public.ecr.aws/ubuntu/mysql:8.0-21.10 mysql -hmysql-container -uroot -p |
2405 | ``` |
2406 | The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged in and can enjoy your new instance. |
2407 | |
2408 | @@ -110,8 +116,8 @@ The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged i |
2409 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2410 | |
2411 | Download |
2412 | -[my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04) and |
2413 | -[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/mysql:8.0-21.04`), then: |
2414 | +[my-custom.cnf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf?h=8.0-22.04) and |
2415 | +[mysql-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml?h=8.0-22.04) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/mysql:8.0-21.10`), then: |
2416 | |
2417 | ```sh |
2418 | kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf |
2419 | diff --git a/docs/public.ecr.aws/ubuntu/nginx.md b/docs/public.ecr.aws/ubuntu/nginx.md |
2420 | index e34f14b..b8f0bd3 100644 |
2421 | --- a/docs/public.ecr.aws/ubuntu/nginx.md |
2422 | +++ b/docs/public.ecr.aws/ubuntu/nginx.md |
2423 | @@ -1,6 +1,7 @@ |
2424 | # Nginx | Ubuntu |
2425 | |
2426 | -Current Nginx Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Nginx or Ubuntu release. |
2427 | +Current Nginx Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2428 | +Receives security updates and tracks the newest combination of Nginx and Ubuntu. |
2429 | For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/nginx](https://gallery.ecr.aws/lts/nginx). |
2430 | |
2431 | ## About Nginx |
2432 | @@ -18,7 +19,6 @@ Up to 10 years customer security maintenance `from canonical/nginx`. [Request ac |
2433 | | Channel Tag | | | Currently | Architectures | |
2434 | |---|---|---|---|---| |
2435 | | _**`1.18-22.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
2436 | - | `1.18-21.10_beta` | [](https://gallery.ecr.aws/lts/nginx) | [](https://gallery.ecr.aws/lts/nginx) | Nginx 1.18.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
2437 | | _`track_risk`_ | |
2438 | |
2439 | _The following tags are not available in public.ecr.aws/ubuntu/nginx but are shown here for completeness:_ |
2440 | @@ -30,7 +30,12 @@ _The following tags are not available in public.ecr.aws/ubuntu/nginx but are sho |
2441 | | _`track_risk`_ | |
2442 | |
2443 | |
2444 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2445 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2446 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2447 | +More risky channels are always implicitly available. |
2448 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2449 | +When `stable` is listed, all four are available. |
2450 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2451 | |
2452 | |
2453 | ### Commercial use and Extended Security Maintenance channels |
2454 | @@ -41,7 +46,8 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2455 | |
2456 | | Track | Version | EOL | Upgrade Path | |
2457 | |---|---|---|---| |
2458 | - | ~~1.18-21.04~~ | Nginx 1.18.0 on Ubuntu 21.04 | 01/2022 | 1.18-21.10_beta | |
2459 | + | ~~1.18-21.10~~ | Nginx 1.18.0 on Ubuntu 21.10 | 07/2022 | 1.18-22.04_beta | |
2460 | + | ~~1.18-21.04~~ | Nginx 1.18.0 on Ubuntu 21.04 | 01/2022 | ~~1.18-21.10~~ | |
2461 | | _`track`_ | |
2462 | |
2463 | |
2464 | @@ -50,7 +56,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2465 | Launch this image locally: |
2466 | |
2467 | ```sh |
2468 | -docker run -d --name nginx-container -e TZ=UTC -p 8080:80 public.ecr.aws/ubuntu/nginx:1.18-21.04 |
2469 | +docker run -d --name nginx-container -e TZ=UTC -p 8080:80 public.ecr.aws/ubuntu/nginx:1.18-21.10 |
2470 | ``` |
2471 | Access your Nginx server at `http://localhost:8080`. |
2472 | |
2473 | @@ -62,7 +68,7 @@ Access your Nginx server at `http://localhost:8080`. |
2474 | | `-p 8080:80` | Expose Nginx on `localhost:8080`. | |
2475 | | `-v /local/path/to/website:/var/www/html` | Mount and serve a local website. | |
2476 | | `-v /path/to/conf.template:/etc/nginx/templates/conf.template` | 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;`). | |
2477 | -| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | 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)). | |
2478 | +| `-v /path/to/nginx.conf:/etc/nginx/nginx.conf` | 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)). | |
2479 | |
2480 | |
2481 | #### Testing/Debugging |
2482 | @@ -85,8 +91,8 @@ docker exec -it nginx-container /bin/bash |
2483 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2484 | |
2485 | Download |
2486 | -[nginx.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04) and |
2487 | -[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/nginx:1.18-21.04`), then: |
2488 | +[nginx.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf?h=1.18-22.04), [index.html](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html?h=1.18-22.04) and |
2489 | +[nginx-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml?h=1.18-22.04) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/nginx:1.18-21.10`), then: |
2490 | |
2491 | ```sh |
2492 | kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html |
2493 | diff --git a/docs/public.ecr.aws/ubuntu/postgres.md b/docs/public.ecr.aws/ubuntu/postgres.md |
2494 | index 9981a38..63c6a58 100644 |
2495 | --- a/docs/public.ecr.aws/ubuntu/postgres.md |
2496 | +++ b/docs/public.ecr.aws/ubuntu/postgres.md |
2497 | @@ -1,6 +1,7 @@ |
2498 | # Postgres | Ubuntu |
2499 | |
2500 | -Current Postgres Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Postgres or Ubuntu release. |
2501 | +Current Postgres Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2502 | +Receives security updates and tracks the newest combination of Postgres and Ubuntu. |
2503 | For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/postgres](https://gallery.ecr.aws/lts/postgres). |
2504 | |
2505 | ## About Postgres |
2506 | @@ -18,7 +19,6 @@ Up to 10 years customer security maintenance `from canonical/postgres`. [Request |
2507 | | Channel Tag | | | Currently | Architectures | |
2508 | |---|---|---|---|---| |
2509 | | _**`14-22.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | Postgres 14 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
2510 | - | `13-21.10_beta` | [](https://gallery.ecr.aws/lts/postgres) | [](https://gallery.ecr.aws/lts/postgres) | Postgres 13.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
2511 | | _`track_risk`_ | |
2512 | |
2513 | _The following tags are not available in public.ecr.aws/ubuntu/postgres but are shown here for completeness:_ |
2514 | @@ -30,7 +30,12 @@ _The following tags are not available in public.ecr.aws/ubuntu/postgres but are |
2515 | | _`track_risk`_ | |
2516 | |
2517 | |
2518 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2519 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2520 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2521 | +More risky channels are always implicitly available. |
2522 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2523 | +When `stable` is listed, all four are available. |
2524 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2525 | |
2526 | |
2527 | ### Commercial use and Extended Security Maintenance channels |
2528 | @@ -41,6 +46,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2529 | |
2530 | | Track | Version | EOL | Upgrade Path | |
2531 | |---|---|---|---| |
2532 | + | ~~13-21.10~~ | Postgres 13.1 on Ubuntu 21.10 | 07/2022 | 14-22.04_beta | |
2533 | | ~~13-21.04~~ | Postgres 13.1 on Ubuntu 21.04 | 01/2022 | ~~13.1-21.10~~ | |
2534 | | _`track`_ | |
2535 | |
2536 | @@ -50,7 +56,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2537 | Launch this image locally: |
2538 | |
2539 | ```sh |
2540 | -docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ public.ecr.aws/ubuntu/postgres:13-21.04 |
2541 | +docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ public.ecr.aws/ubuntu/postgres:13-21.10 |
2542 | ``` |
2543 | Access your PostgreSQL server at `localhost:30432`. |
2544 | |
2545 | @@ -67,7 +73,7 @@ Access your PostgreSQL server at `localhost:30432`. |
2546 | | `-e POSTGRES_HOST_AUTH_METHOD=trust` | Set the `auth-method` for `host` connections for `all` databases, `all` users, and `all` addresses. The following will be added to the `pg_hba.conf` if this option is passed: `host all all all $POSTGRES_HOST_AUTH_METHOD`. | |
2547 | | `-e PGDATA=/path/to/location` | Set the location of the database files. The default is `/var/lib/postgresql/data`. | |
2548 | | `-p 30432:5432` | Expose Postgres on `localhost:30432`. | |
2549 | -| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | 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)). | |
2550 | +| `-v /path/to/postgresql.conf:/etc/postgresql/postgresql.conf` | 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)). | |
2551 | | `-v /path/to/persisted/data:/var/lib/postgresql/data` | Persist data instead of initializing a new database every time you launch a new container. | |
2552 | |
2553 | #### Initialization Scripts |
2554 | @@ -100,7 +106,7 @@ This image also includes the `psql` client for interactive container use: |
2555 | ```sh |
2556 | $ docker network create postgres-network |
2557 | $ docker network connect postgres-network postgres-container |
2558 | -$ docker run -it --rm --network postgres-network public.ecr.aws/ubuntu/postgres:13-21.04 psql -h postgres-container -U postgres |
2559 | +$ docker run -it --rm --network postgres-network public.ecr.aws/ubuntu/postgres:13-21.10 psql -h postgres-container -U postgres |
2560 | ``` |
2561 | The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged in and can enjoy your new instance. |
2562 | |
2563 | @@ -109,8 +115,8 @@ The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged i |
2564 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2565 | |
2566 | Download |
2567 | -[postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04) and |
2568 | -[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/postgres:13-21.04`), then: |
2569 | +[postgresql.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf?h=14-22.04) and |
2570 | +[postgres-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml?h=14-22.04) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/postgres:13-21.10`), then: |
2571 | |
2572 | ```sh |
2573 | kubectl create configmap postgres-config --from-file=main-config=postgresql.conf |
2574 | diff --git a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md |
2575 | index a5b1127..2937695 100644 |
2576 | --- a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md |
2577 | +++ b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md |
2578 | @@ -1,6 +1,7 @@ |
2579 | # Prometheus Alertmanager | Ubuntu |
2580 | |
2581 | -Current Prometheus Alertmanager Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus Alertmanager or Ubuntu release. |
2582 | +Current Prometheus Alertmanager Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2583 | +Receives security updates and tracks the newest combination of Prometheus Alertmanager and Ubuntu. |
2584 | |
2585 | ## About Prometheus Alertmanager |
2586 | |
2587 | @@ -20,7 +21,12 @@ Up to 10 years customer security maintenance `from canonical/prometheus-alertman |
2588 | | _`track_risk`_ | |
2589 | |
2590 | |
2591 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2592 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2593 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2594 | +More risky channels are always implicitly available. |
2595 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2596 | +When `stable` is listed, all four are available. |
2597 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2598 | |
2599 | |
2600 | ### Commercial use and Extended Security Maintenance channels |
2601 | @@ -52,7 +58,7 @@ Access your Prometheus Alertmanager server at `localhost:30093`. |
2602 | |---|---| |
2603 | | `-e TZ=UTC` | Timezone. | |
2604 | | `-p 30093:9093` | Expose Prometheus Alertmanager on `localhost:30093`. | |
2605 | -| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | 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)). | |
2606 | +| `-v /path/to/alertmanager.yml:/etc/prometheus/alertmanager.yml` | 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)). | |
2607 | | `-v /path/to/persisted/data:/alertmanager` | 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. | |
2608 | |
2609 | |
2610 | @@ -76,8 +82,8 @@ docker exec -it prometheus-alertmanager-container /bin/bash |
2611 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2612 | |
2613 | Download |
2614 | -[alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04) and |
2615 | -[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus-alertmanager:0.22-21.10`), then: |
2616 | +[alertmanager.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/config/alertmanager.yml?h=0.23-22.04) and |
2617 | +[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus-alertmanager/plain/examples/alertmanager-deployment.yml?h=0.23-22.04) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus-alertmanager:0.22-21.10`), then: |
2618 | |
2619 | ```sh |
2620 | kubectl create configmap alertmanager-config --from-file=alertmanager=alertmanager.yml |
2621 | diff --git a/docs/public.ecr.aws/ubuntu/prometheus.md b/docs/public.ecr.aws/ubuntu/prometheus.md |
2622 | index 278d4d4..cbfe9a1 100644 |
2623 | --- a/docs/public.ecr.aws/ubuntu/prometheus.md |
2624 | +++ b/docs/public.ecr.aws/ubuntu/prometheus.md |
2625 | @@ -1,6 +1,7 @@ |
2626 | # Prometheus | Ubuntu |
2627 | |
2628 | -Current Prometheus Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Prometheus or Ubuntu release. |
2629 | +Current Prometheus Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2630 | +Receives security updates and tracks the newest combination of Prometheus and Ubuntu. |
2631 | |
2632 | ## About Prometheus |
2633 | |
2634 | @@ -20,7 +21,12 @@ Up to 10 years customer security maintenance `from canonical/prometheus`. [Reque |
2635 | | _`track_risk`_ | |
2636 | |
2637 | |
2638 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2639 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2640 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2641 | +More risky channels are always implicitly available. |
2642 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2643 | +When `stable` is listed, all four are available. |
2644 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2645 | |
2646 | |
2647 | ### Commercial use and Extended Security Maintenance channels |
2648 | @@ -53,8 +59,8 @@ Access your Prometheus server at `localhost:30090`. |
2649 | |---|---| |
2650 | | `-e TZ=UTC` | Timezone. | |
2651 | | `-p 30090:9090` | Expose Prometheus server on `localhost:30090`. | |
2652 | -| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | 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)). | |
2653 | -| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | 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)). | |
2654 | +| `-v /path/to/prometheus.yml:/etc/prometheus/prometheus.yml` | 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)). | |
2655 | +| `-v /path/to/alerts.yml:/etc/prometheus/alerts.yml` | 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)). | |
2656 | |
2657 | |
2658 | #### Testing/Debugging |
2659 | @@ -77,8 +83,8 @@ docker exec -it prometheus-container /bin/bash |
2660 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2661 | |
2662 | Download |
2663 | -[prometheus.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04) and |
2664 | -[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus:2.28-21.10`), then: |
2665 | +[prometheus.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/prometheus.yml?h=2.33-22.04), [alerts.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/config/alerts.yml?h=2.33-22.04) and |
2666 | +[prometheus-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/prometheus/plain/examples/prometheus-deployment.yml?h=2.33-22.04) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus:2.28-21.10`), then: |
2667 | |
2668 | ```sh |
2669 | kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml |
2670 | diff --git a/docs/public.ecr.aws/ubuntu/redis.md b/docs/public.ecr.aws/ubuntu/redis.md |
2671 | index 3d92bd8..83e0972 100644 |
2672 | --- a/docs/public.ecr.aws/ubuntu/redis.md |
2673 | +++ b/docs/public.ecr.aws/ubuntu/redis.md |
2674 | @@ -1,6 +1,7 @@ |
2675 | # Redis™ software | Ubuntu |
2676 | |
2677 | -Current Redis™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Redis™ software or Ubuntu release. |
2678 | +Current Redis™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2679 | +Receives security updates and tracks the newest combination of Redis™ software and Ubuntu. |
2680 | |
2681 | ## About Redis™ software |
2682 | |
2683 | @@ -17,11 +18,15 @@ Up to 10 years customer security maintenance `from canonical/redis`. [Request ac |
2684 | | Channel Tag | | | Currently | Architectures | |
2685 | |---|---|---|---|---| |
2686 | | **`6.2-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/redis) | [](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.2 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
2687 | - | `6.0-21.10_beta` | [](https://gallery.ecr.aws/lts/redis) | [](https://gallery.ecr.aws/lts/redis) | Redis™ software 6.0.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
2688 | | _`track_risk`_ | |
2689 | |
2690 | |
2691 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2692 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2693 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2694 | +More risky channels are always implicitly available. |
2695 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2696 | +When `stable` is listed, all four are available. |
2697 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2698 | |
2699 | |
2700 | ### Commercial use and Extended Security Maintenance channels |
2701 | @@ -32,7 +37,8 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2702 | |
2703 | | Track | Version | EOL | Upgrade Path | |
2704 | |---|---|---|---| |
2705 | - | ~~6.0-21.04~~ | Redis™ software 6.0.11 on Ubuntu 21.04 | 01/2022 | 6.0-21.10_beta | |
2706 | + | ~~6.0-21.10~~ | Redis™ software 6.0.15 on Ubuntu 21.10 | 07/2022 | 6.2-22.04_beta | |
2707 | + | ~~6.0-21.04~~ | Redis™ software 6.0.11 on Ubuntu 21.04 | 01/2022 | ~~6.0-21.10~~ | |
2708 | | ~~5.0-20.04~~ | Redis™ software 5.0.7 on Ubuntu 20.04 LTS | 01/2021 | ~~6.0-21.04~~ | |
2709 | | _`track`_ | |
2710 | |
2711 | @@ -42,7 +48,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2712 | Launch this image locally: |
2713 | |
2714 | ```sh |
2715 | -docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword public.ecr.aws/ubuntu/redis:6.0-21.04 |
2716 | +docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword public.ecr.aws/ubuntu/redis:6.0-21.10 |
2717 | ``` |
2718 | Access your Redis server at `localhost:30073`. |
2719 | |
2720 | @@ -57,7 +63,7 @@ Access your Redis server at `localhost:30073`. |
2721 | | `-e REDIS_ALLOW_REMOTE_CONNECTIONS=yes` | Set to `no` to disallow remote connections to `redis-server` (i.e., make `redis-server` listen to `127.0.0.1` only). | |
2722 | | `-e REDIS_EXTRA_FLAGS` | Specify extra flags to be passed to `redis-server` when initializing it. | |
2723 | | `-p 30073:6379` | Expose redis on `localhost:30073`. | |
2724 | -| `-v /path/to/redis.conf:/etc/redis/redis.conf` | 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)). **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines. |
2725 | +| `-v /path/to/redis.conf:/etc/redis/redis.conf` | 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)). **To enable TLS** mode, comment the `port 6379` line and uncomment the `# port 0` and `# tls-port 6379` lines. |
2726 | | |
2727 | |
2728 | |
2729 | @@ -80,7 +86,7 @@ This image also includes the `redis-cli` client for interactive container use: |
2730 | ```sh |
2731 | $ docker network create redis-network |
2732 | $ docker network connect redis-network redis-container |
2733 | -$ docker run -it --rm --network redis-network public.ecr.aws/ubuntu/redis:6.0-21.04 redis-cli -h redis-container |
2734 | +$ docker run -it --rm --network redis-network public.ecr.aws/ubuntu/redis:6.0-21.10 redis-cli -h redis-container |
2735 | ``` |
2736 | Now you can: |
2737 | ``` |
2738 | @@ -97,8 +103,8 @@ redis:6379> |
2739 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2740 | |
2741 | Download |
2742 | -[redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and |
2743 | -[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/redis:6.0-21.04`), then: |
2744 | +[redis.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf?h=6.2-22.04) and |
2745 | +[redis-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml?h=6.2-22.04) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/redis:6.0-21.10`), then: |
2746 | |
2747 | ```sh |
2748 | kubectl create configmap redis-config --from-file=redis=redis.conf |
2749 | diff --git a/docs/public.ecr.aws/ubuntu/squid.md b/docs/public.ecr.aws/ubuntu/squid.md |
2750 | index 41443da..0e307eb 100644 |
2751 | --- a/docs/public.ecr.aws/ubuntu/squid.md |
2752 | +++ b/docs/public.ecr.aws/ubuntu/squid.md |
2753 | @@ -1,6 +1,7 @@ |
2754 | # Squid | Ubuntu |
2755 | |
2756 | -Current Squid Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Squid or Ubuntu release. |
2757 | +Current Squid Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2758 | +Receives security updates and tracks the newest combination of Squid and Ubuntu. |
2759 | For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/squid](https://gallery.ecr.aws/lts/squid). |
2760 | |
2761 | ## About Squid |
2762 | @@ -18,7 +19,6 @@ Up to 10 years customer security maintenance `from canonical/squid`. [Request ac |
2763 | | Channel Tag | | | Currently | Architectures | |
2764 | |---|---|---|---|---| |
2765 | | _**`5.2-22.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | [![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | Squid 5.2 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
2766 | - | `4.13-21.10_beta` | [](https://gallery.ecr.aws/lts/squid) | [](https://gallery.ecr.aws/lts/squid) | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
2767 | | _`track_risk`_ | |
2768 | |
2769 | _The following tags are not available in public.ecr.aws/ubuntu/squid but are shown here for completeness:_ |
2770 | @@ -30,7 +30,12 @@ _The following tags are not available in public.ecr.aws/ubuntu/squid but are sho |
2771 | | _`track_risk`_ | |
2772 | |
2773 | |
2774 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2775 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2776 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2777 | +More risky channels are always implicitly available. |
2778 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2779 | +When `stable` is listed, all four are available. |
2780 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2781 | |
2782 | |
2783 | ### Commercial use and Extended Security Maintenance channels |
2784 | @@ -41,6 +46,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2785 | |
2786 | | Track | Version | EOL | Upgrade Path | |
2787 | |---|---|---|---| |
2788 | + | ~~4.13-21.10~~ | Squid 4.13 on Ubuntu 21.10 | 07/2022 | 5.2-22.04_beta | |
2789 | | _`track`_ | |
2790 | |
2791 | |
2792 | @@ -49,7 +55,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2793 | Launch this image locally: |
2794 | |
2795 | ```sh |
2796 | -docker run -d --name squid-container -e TZ=UTC -p 3128:3128 public.ecr.aws/ubuntu/squid:5.2-22.04_beta |
2797 | +docker run -d --name squid-container -e TZ=UTC -p 3128:3128 public.ecr.aws/ubuntu/squid:4.13-21.10 |
2798 | ``` |
2799 | Access your Squid proxy at `localhost:3128`. |
2800 | |
2801 | @@ -85,8 +91,8 @@ docker exec -it squid-container /bin/bash |
2802 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2803 | |
2804 | Download |
2805 | -[squid.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04) and |
2806 | -[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/squid:5.2-22.04_beta`), then: |
2807 | +[squid.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf?h=5.2-22.04) and |
2808 | +[squid-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml?h=5.2-22.04) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/squid:4.13-21.10`), then: |
2809 | |
2810 | ```sh |
2811 | kubectl create configmap squid-config --from-file=squid=squid.conf |
2812 | diff --git a/docs/public.ecr.aws/ubuntu/telegraf.md b/docs/public.ecr.aws/ubuntu/telegraf.md |
2813 | index 533a1a6..96faf25 100644 |
2814 | --- a/docs/public.ecr.aws/ubuntu/telegraf.md |
2815 | +++ b/docs/public.ecr.aws/ubuntu/telegraf.md |
2816 | @@ -1,6 +1,7 @@ |
2817 | # Telegraf™ software | Ubuntu |
2818 | |
2819 | -Current Telegraf™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Telegraf™ software or Ubuntu release. |
2820 | +Current Telegraf™ software Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2821 | +Receives security updates and tracks the newest combination of Telegraf™ software and Ubuntu. |
2822 | |
2823 | ## About Telegraf™ software |
2824 | |
2825 | @@ -17,11 +18,15 @@ Up to 10 years customer security maintenance `from canonical/telegraf`. [Request |
2826 | | Channel Tag | | | Currently | Architectures | |
2827 | |---|---|---|---|---| |
2828 | | **`1.21-22.04_beta`** | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/telegraf) | [](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.21 on Ubuntu 22.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
2829 | - | `1.19-21.10_beta` | [](https://gallery.ecr.aws/lts/telegraf) | [](https://gallery.ecr.aws/lts/telegraf) | Telegraf™ software 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
2830 | | _`track_risk`_ | |
2831 | |
2832 | |
2833 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2834 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2835 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2836 | +More risky channels are always implicitly available. |
2837 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2838 | +When `stable` is listed, all four are available. |
2839 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2840 | |
2841 | |
2842 | ### Commercial use and Extended Security Maintenance channels |
2843 | @@ -32,7 +37,8 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2844 | |
2845 | | Track | Version | EOL | Upgrade Path | |
2846 | |---|---|---|---| |
2847 | - | ~~1.17-21.04~~ | Telegraf™ software 1.17.2 on Ubuntu 21.04 | 01/2022 | 1.19-21.10_beta | |
2848 | + | ~~1.19-21.10~~ | Telegraf™ software 1.19.2 on Ubuntu 21.10 | 07/2022 | 1.21-22.04_beta | |
2849 | + | ~~1.17-21.04~~ | Telegraf™ software 1.17.2 on Ubuntu 21.04 | 01/2022 | ~~1.19-21.10~~ | |
2850 | | ~~1.15-20.04~~ | Telegraf™ software 1.15.2 on Ubuntu 20.04 LTS | 01/2021 | ~~1.17-21.04~~ | |
2851 | | _`track`_ | |
2852 | |
2853 | @@ -42,7 +48,7 @@ These channels (tags) are not updated anymore. Please upgrade to newer channels, |
2854 | Launch this image locally: |
2855 | |
2856 | ```sh |
2857 | -docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.17-21.04 |
2858 | +docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.19-21.10 |
2859 | ``` |
2860 | Access your Telegraf server at `localhost:30273`. |
2861 | |
2862 | @@ -52,7 +58,7 @@ Access your Telegraf server at `localhost:30273`. |
2863 | |---|---| |
2864 | | `-e TZ=UTC` | Timezone. | |
2865 | | `-p 30273:9273` | Expose Telegraf on `localhost:30273`. | |
2866 | -| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | 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)). | |
2867 | +| `-v /path/to/telegraf.conf:/etc/telegraf/telegraf.conf` | 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)). | |
2868 | |
2869 | |
2870 | #### Testing/Debugging |
2871 | @@ -75,8 +81,8 @@ docker exec -it telegraf-container /bin/bash |
2872 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2873 | |
2874 | Download |
2875 | -[telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and |
2876 | -[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/telegraf:1.17-21.04`), then: |
2877 | +[telegraf.conf](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf?h=1.21-22.04) and |
2878 | +[telegraf-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml?h=1.21-22.04) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/telegraf:1.19-21.10`), then: |
2879 | |
2880 | ```sh |
2881 | kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf |
2882 | diff --git a/docs/public.ecr.aws/ubuntu/zookeeper.md b/docs/public.ecr.aws/ubuntu/zookeeper.md |
2883 | index 36065d1..f3bfa03 100644 |
2884 | --- a/docs/public.ecr.aws/ubuntu/zookeeper.md |
2885 | +++ b/docs/public.ecr.aws/ubuntu/zookeeper.md |
2886 | @@ -1,6 +1,7 @@ |
2887 | # Apache ZooKeeper | Ubuntu |
2888 | |
2889 | -Current Apache ZooKeeper Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer Apache ZooKeeper or Ubuntu release. |
2890 | +Current Apache ZooKeeper Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2891 | +Receives security updates and tracks the newest combination of Apache ZooKeeper and Ubuntu. |
2892 | |
2893 | ## About Apache ZooKeeper |
2894 | |
2895 | @@ -20,7 +21,12 @@ Up to 10 years customer security maintenance `from canonical/zookeeper`. [Reques |
2896 | | _`track_risk`_ | |
2897 | |
2898 | |
2899 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2900 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2901 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2902 | +More risky channels are always implicitly available. |
2903 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2904 | +When `stable` is listed, all four are available. |
2905 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2906 | |
2907 | |
2908 | ### Commercial use and Extended Security Maintenance channels |
2909 | @@ -72,7 +78,7 @@ docker exec -it zookeeper-container /bin/bash |
2910 | Works with any Kubernetes; if you don't have one, we recommend you [install MicroK8s](https://microk8s.io/) and `microk8s.enable dns storage` then `snap alias microk8s.kubectl kubectl`. |
2911 | |
2912 | Download |
2913 | -[zookeeper-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.zookeeper.image` in `zookeeper-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/zookeeper:3.1-22.04_beta`), then: |
2914 | +[zookeeper-deployment.yml](https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/kafka/plain/examples/kafka-deployment.yml?h=3.1-22.04) and set `containers.zookeeper.image` in `zookeeper-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/zookeeper:3.1-22.04_beta`), then: |
2915 | |
2916 | ```sh |
2917 | kubectl apply -f zookeeper-deployment.yml |
2918 | diff --git a/templates/README_DOCKERHUB.md b/templates/README_DOCKERHUB.md |
2919 | index 5456979..2c756cd 100644 |
2920 | --- a/templates/README_DOCKERHUB.md |
2921 | +++ b/templates/README_DOCKERHUB.md |
2922 | @@ -1,6 +1,9 @@ |
2923 | # ${application} | Ubuntu |
2924 | |
2925 | -Current ${application} Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer ${application} or Ubuntu release. **This repository is free to use and exempted from per-user rate limits.** |
2926 | +Current ${application} Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2927 | +Receives security updates and tracks the newest combination of ${application} and Ubuntu. |
2928 | +**This repository is free to use and exempted from per-user rate limits.** |
2929 | + |
2930 | <% |
2931 | baserepo='ubuntu' |
2932 | tag='latest' |
2933 | diff --git a/templates/README_ECR.md b/templates/README_ECR.md |
2934 | index 5a9b435..8a82ba7 100644 |
2935 | --- a/templates/README_ECR.md |
2936 | +++ b/templates/README_ECR.md |
2937 | @@ -13,7 +13,8 @@ |
2938 | current_releases=[current_releases.pop(0)]+[release for release in current_releases if release not in lts_releases] |
2939 | has_an_lts=len(lts_releases)>0 |
2940 | %> |
2941 | -Current ${application} Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. Receives security updates and rolls to newer ${application} or Ubuntu release. |
2942 | +Current ${application} Docker Image [from Canonical](https://ubuntu.com/security/docker-images), based on Ubuntu. |
2943 | +Receives security updates and tracks the newest combination of ${application} and Ubuntu. |
2944 | % if has_an_lts: |
2945 | For [long-term support (LTS)](https://ubuntu.com/security/docker-images) versions of this image, see [public.ecr.aws/lts/${repo}](https://gallery.ecr.aws/lts/${repo}). |
2946 | % endif |
2947 | diff --git a/templates/channels_message.md b/templates/channels_message.md |
2948 | index 3901cf9..e2c918f 100644 |
2949 | --- a/templates/channels_message.md |
2950 | +++ b/templates/channels_message.md |
2951 | @@ -1 +1,6 @@ |
2952 | -Channel Tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
2953 | +Channel Tag shows the most stable channel for that track. A track is a combination of both the application version and the underlying Ubuntu series, eg `1.0-22.04`. |
2954 | +Channels are ordered from the most stable to the least `stable`, `candidate`, `beta`, `edge`. |
2955 | +More risky channels are always implicitly available. |
2956 | +So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. |
2957 | +When `stable` is listed, all four are available. |
2958 | +Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`. |
Thanks, Valentin.
LGTM, +1.