Merge ~valentinviennot/ubuntu-docker-images:update-21.10 into ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main
- Git
- lp:~valentinviennot/ubuntu-docker-images
- update-21.10
- Merge into main
Proposed by
Valentin Viennot
Status: | Merged |
---|---|
Merged at revision: | f27050461edcad318d7fdbd44aeab1d312c5acd9 |
Proposed branch: | ~valentinviennot/ubuntu-docker-images:update-21.10 |
Merge into: | ~ubuntu-docker-images/ubuntu-docker-images/+git/templates:main |
Diff against target: |
1062 lines (+124/-100) 42 files modified
data/apache2.yaml (+1/-1) data/cortex.yaml (+1/-1) data/grafana.yaml (+1/-1) data/memcached.yaml (+1/-1) data/mysql.yaml (+1/-1) data/nginx.yaml (+1/-1) data/postgres.yaml (+1/-1) data/prometheus-alertmanager.yaml (+1/-1) data/prometheus.yaml (+1/-1) data/redis.yaml (+1/-1) data/telegraf.yaml (+1/-1) docs/docker.io/ubuntu/apache2.md (+4/-3) docs/docker.io/ubuntu/bind9.md (+4/-3) docs/docker.io/ubuntu/cassandra.md (+4/-3) docs/docker.io/ubuntu/cortex.md (+4/-3) docs/docker.io/ubuntu/grafana.md (+4/-3) docs/docker.io/ubuntu/memcached.md (+4/-3) docs/docker.io/ubuntu/mysql.md (+5/-4) docs/docker.io/ubuntu/nginx.md (+4/-3) docs/docker.io/ubuntu/postgres.md (+6/-5) docs/docker.io/ubuntu/prometheus-alertmanager.md (+4/-3) docs/docker.io/ubuntu/prometheus.md (+4/-3) docs/docker.io/ubuntu/redis.md (+5/-4) docs/docker.io/ubuntu/squid.md (+4/-4) docs/docker.io/ubuntu/telegraf.md (+4/-3) docs/public.ecr.aws/lts/bind9.md (+1/-1) docs/public.ecr.aws/lts/postgres.md (+1/-1) docs/public.ecr.aws/ubuntu/apache2.md (+3/-2) docs/public.ecr.aws/ubuntu/bind9.md (+3/-3) docs/public.ecr.aws/ubuntu/cassandra.md (+4/-3) docs/public.ecr.aws/ubuntu/cortex.md (+4/-3) docs/public.ecr.aws/ubuntu/grafana.md (+4/-3) docs/public.ecr.aws/ubuntu/memcached.md (+3/-2) docs/public.ecr.aws/ubuntu/mysql.md (+3/-2) docs/public.ecr.aws/ubuntu/nginx.md (+3/-2) docs/public.ecr.aws/ubuntu/postgres.md (+4/-3) docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md (+4/-3) docs/public.ecr.aws/ubuntu/prometheus.md (+4/-3) docs/public.ecr.aws/ubuntu/redis.md (+5/-4) docs/public.ecr.aws/ubuntu/squid.md (+2/-3) docs/public.ecr.aws/ubuntu/telegraf.md (+4/-3) templates/README_ECR.md (+1/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Athos Ribeiro | Approve | ||
Sergio Durigan Junior | Approve | ||
Review via email: mp+411414@code.launchpad.net |
Commit message
Update 21.10 docs
Description of the change
- fix escape number in data
- fix link in template
- update docs file with latest template and data
To post a comment you must log in.
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote : | # |
+1
Thanks, Valentin!
review:
Approve
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 d0ddd7f..67a2cee 100644 |
3 | --- a/data/apache2.yaml |
4 | +++ b/data/apache2.yaml |
5 | @@ -6,7 +6,7 @@ releases: |
6 | - track: '2.4' |
7 | risk: beta |
8 | version: '2.4.48' |
9 | - base: 21.10 |
10 | + base: '21.10' |
11 | architectures: |
12 | - amd64 |
13 | - arm64 |
14 | diff --git a/data/cortex.yaml b/data/cortex.yaml |
15 | index 74bbe0a..670a870 100644 |
16 | --- a/data/cortex.yaml |
17 | +++ b/data/cortex.yaml |
18 | @@ -13,7 +13,7 @@ releases: |
19 | - track: "1.10" |
20 | risk: beta |
21 | version: "1.10.0" |
22 | - base: 21.10 |
23 | + base: '21.10' |
24 | architectures: |
25 | - amd64 |
26 | - arm64 |
27 | diff --git a/data/grafana.yaml b/data/grafana.yaml |
28 | index e01abc0..e0b70ef 100644 |
29 | --- a/data/grafana.yaml |
30 | +++ b/data/grafana.yaml |
31 | @@ -7,7 +7,7 @@ releases: |
32 | - track: '8.1' |
33 | risk: beta |
34 | version: '8.1.0' |
35 | - base: 21.10 |
36 | + base: '21.10' |
37 | architectures: |
38 | - amd64 |
39 | - arm64 |
40 | diff --git a/data/memcached.yaml b/data/memcached.yaml |
41 | index 97dd683..92878c0 100644 |
42 | --- a/data/memcached.yaml |
43 | +++ b/data/memcached.yaml |
44 | @@ -7,7 +7,7 @@ releases: |
45 | - track: '1.6' |
46 | risk: beta |
47 | version: '1.6.9' |
48 | - base: 21.10 |
49 | + base: '21.10' |
50 | architectures: |
51 | - amd64 |
52 | - arm64 |
53 | diff --git a/data/mysql.yaml b/data/mysql.yaml |
54 | index 93672a5..e27cbe9 100644 |
55 | --- a/data/mysql.yaml |
56 | +++ b/data/mysql.yaml |
57 | @@ -9,7 +9,7 @@ releases: |
58 | - track: '8.0' |
59 | risk: beta |
60 | version: '8.0.27' |
61 | - base: 21.10 |
62 | + base: '21.10' |
63 | architectures: |
64 | - amd64 |
65 | - arm64 |
66 | diff --git a/data/nginx.yaml b/data/nginx.yaml |
67 | index 1bed121..52ff9dd 100644 |
68 | --- a/data/nginx.yaml |
69 | +++ b/data/nginx.yaml |
70 | @@ -6,7 +6,7 @@ releases: |
71 | - track: '1.18' |
72 | risk: beta |
73 | version: '1.18.0' |
74 | - base: 21.10 |
75 | + base: '21.10' |
76 | architectures: |
77 | - amd64 |
78 | - arm64 |
79 | diff --git a/data/postgres.yaml b/data/postgres.yaml |
80 | index 916f4a7..2d294bc 100644 |
81 | --- a/data/postgres.yaml |
82 | +++ b/data/postgres.yaml |
83 | @@ -6,7 +6,7 @@ releases: |
84 | - track: '13.1' |
85 | risk: beta |
86 | version: '13.1' |
87 | - base: 21.10 |
88 | + base: '21.10' |
89 | architectures: |
90 | - amd64 |
91 | - arm64 |
92 | diff --git a/data/prometheus-alertmanager.yaml b/data/prometheus-alertmanager.yaml |
93 | index 62e38f7..fea2458 100644 |
94 | --- a/data/prometheus-alertmanager.yaml |
95 | +++ b/data/prometheus-alertmanager.yaml |
96 | @@ -6,7 +6,7 @@ releases: |
97 | - track: '0.22' |
98 | risk: beta |
99 | version: '0.22.0' |
100 | - base: 21.10 |
101 | + base: '21.10' |
102 | architectures: |
103 | - amd64 |
104 | - arm64 |
105 | diff --git a/data/prometheus.yaml b/data/prometheus.yaml |
106 | index 7b0e61e..666e936 100644 |
107 | --- a/data/prometheus.yaml |
108 | +++ b/data/prometheus.yaml |
109 | @@ -6,7 +6,7 @@ releases: |
110 | - track: '2.28' |
111 | risk: beta |
112 | version: '2.28.1' |
113 | - base: 21.10 |
114 | + base: '21.10' |
115 | architectures: |
116 | - amd64 |
117 | - arm64 |
118 | diff --git a/data/redis.yaml b/data/redis.yaml |
119 | index 212336d..17a94d7 100644 |
120 | --- a/data/redis.yaml |
121 | +++ b/data/redis.yaml |
122 | @@ -7,7 +7,7 @@ description: > |
123 | Read more on the [Redis website](https://redis.io/topics/introduction). |
124 | releases: |
125 | - track: "6.0" |
126 | - base: 21.10 |
127 | + base: '21.10' |
128 | version: "6.0.15" |
129 | risk: beta |
130 | architectures: |
131 | diff --git a/data/telegraf.yaml b/data/telegraf.yaml |
132 | index 75225ea..dd8304a 100644 |
133 | --- a/data/telegraf.yaml |
134 | +++ b/data/telegraf.yaml |
135 | @@ -6,7 +6,7 @@ releases: |
136 | - track: "1.19" |
137 | risk: beta |
138 | version: "1.19.2" |
139 | - base: 21.10 |
140 | + base: '21.10' |
141 | architectures: |
142 | - amd64 |
143 | - arm64 |
144 | diff --git a/docs/docker.io/ubuntu/apache2.md b/docs/docker.io/ubuntu/apache2.md |
145 | index cc18fdf..d182c60 100644 |
146 | --- a/docs/docker.io/ubuntu/apache2.md |
147 | +++ b/docs/docker.io/ubuntu/apache2.md |
148 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/apache2 but are shown here for comp |
149 | |
150 | | Channel Tag | | | Currently | Architectures | |
151 | |---|---|---|---|---| |
152 | - | **`2.4-21.04_beta`** | | | Apache2 2.4 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
153 | + | **`2.4-21.10_beta`** | | | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
154 | + | `2.4-21.04_beta` | | | Apache2 2.4.46 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
155 | | `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` | |
156 | | _`track_risk`_ | |
157 | |
158 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
159 | Launch this image locally: |
160 | |
161 | ```sh |
162 | -docker run -d --name apache2-container -e TZ=UTC -p 8080:80 ubuntu/apache2:2.4-21.04_beta |
163 | +docker run -d --name apache2-container -e TZ=UTC -p 8080:80 ubuntu/apache2:2.4-21.10_beta |
164 | ``` |
165 | Access your Apache2 server at `http://localhost:8080`. |
166 | |
167 | @@ -70,7 +71,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
168 | |
169 | Download |
170 | [apache2.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html) and |
171 | -[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-21.04_beta`), then: |
172 | +[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-21.10_beta`), then: |
173 | |
174 | ```sh |
175 | kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html |
176 | diff --git a/docs/docker.io/ubuntu/bind9.md b/docs/docker.io/ubuntu/bind9.md |
177 | index f2e3258..5da6754 100644 |
178 | --- a/docs/docker.io/ubuntu/bind9.md |
179 | +++ b/docs/docker.io/ubuntu/bind9.md |
180 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/bind9 but are shown here for comple |
181 | |
182 | | Channel Tag | | | Currently | Architectures | |
183 | |---|---|---|---|---| |
184 | - | **`9.16-20.04_beta`** | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | Bind9 9.16.15 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
185 | + | **`9.16-21.10_beta`** | | | Bind9 9.16.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
186 | + | `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` | |
187 | | _`track_risk`_ | |
188 | |
189 | 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`. |
190 | @@ -34,7 +35,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
191 | Launch this image locally: |
192 | |
193 | ```sh |
194 | -docker run -d --name bind9-container -e TZ=UTC -p 30053:53 ubuntu/bind9:9.16-20.04_beta |
195 | +docker run -d --name bind9-container -e TZ=UTC -p 30053:53 ubuntu/bind9:9.16-21.10_beta |
196 | ``` |
197 | Access your Bind9 server at `localhost:30053` |
198 | |
199 | @@ -69,7 +70,7 @@ docker exec -it bind9-container /bin/bash |
200 | 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`. |
201 | |
202 | Download |
203 | -[bind9-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `ubuntu/bind9:9.16-20.04_beta`), then: |
204 | +[bind9-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/bind9/plain/examples/bind9-deployment.yml) and set `containers.bind9.image` in `bind9-deployment.yml` to your chosen channel tag (e.g. `ubuntu/bind9:9.16-21.10_beta`), then: |
205 | |
206 | ```sh |
207 | kubectl apply -f bind9-deployment.yml |
208 | diff --git a/docs/docker.io/ubuntu/cassandra.md b/docs/docker.io/ubuntu/cassandra.md |
209 | index 400f771..926e5ba 100644 |
210 | --- a/docs/docker.io/ubuntu/cassandra.md |
211 | +++ b/docs/docker.io/ubuntu/cassandra.md |
212 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/cassandra but are shown here for co |
213 | |
214 | | Channel Tag | | | Currently | Architectures | |
215 | |---|---|---|---|---| |
216 | - | **`4.0-21.04_beta`** | | | Cassandra 4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
217 | + | **`4.0-21.10_beta`** | | | Cassandra 4.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
218 | + | `4.0-21.04_beta` | | | Cassandra 4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
219 | | `4.0-20.04_beta` | | | Cassandra 4.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
220 | | _`track_risk`_ | |
221 | |
222 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
223 | Launch this image locally: |
224 | |
225 | ```sh |
226 | -docker run -d --name cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 ubuntu/cassandra:4.0-21.04_beta |
227 | +docker run -d --name cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 ubuntu/cassandra:4.0-21.10_beta |
228 | ``` |
229 | Access your Cassandra server with `cqlsh localhost 9042`. |
230 | |
231 | @@ -73,7 +74,7 @@ docker exec -it cassandra-container /bin/bash |
232 | 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`. |
233 | |
234 | Download |
235 | -[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cassandra:4.0-21.04_beta`), then: |
236 | +[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cassandra:4.0-21.10_beta`), then: |
237 | |
238 | ```sh |
239 | kubectl apply -f cassandra-deployment.yml |
240 | diff --git a/docs/docker.io/ubuntu/cortex.md b/docs/docker.io/ubuntu/cortex.md |
241 | index a2d0b20..083243c 100644 |
242 | --- a/docs/docker.io/ubuntu/cortex.md |
243 | +++ b/docs/docker.io/ubuntu/cortex.md |
244 | @@ -28,7 +28,8 @@ _Tags in italics are not available in ubuntu/cortex but are shown here for compl |
245 | |
246 | | Channel Tag | | | Currently | Architectures | |
247 | |---|---|---|---|---| |
248 | - | **`1.7-21.04_beta`** | | | Cortex 1.7 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
249 | + | **`1.10-21.10_beta`** | | | Cortex 1.10.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
250 | + | `1.7-21.04_beta` | | | Cortex 1.7.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
251 | | `1.4-20.04_beta` | | | Cortex 1.4.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
252 | | _`track_risk`_ | |
253 | |
254 | @@ -42,7 +43,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
255 | Launch this image locally: |
256 | |
257 | ```sh |
258 | -docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 ubuntu/cortex:1.7-21.04_beta |
259 | +docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 ubuntu/cortex:1.10-21.10_beta |
260 | ``` |
261 | Access your Cortex server at `http://localhost:32709`. |
262 | |
263 | @@ -76,7 +77,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
264 | |
265 | Download |
266 | [cortex.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml) and |
267 | -[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cortex:1.7-21.04_beta`), then: |
268 | +[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `ubuntu/cortex:1.10-21.10_beta`), then: |
269 | |
270 | ```sh |
271 | kubectl create configmap cortex-config --from-file=main-config=cortex.yaml |
272 | diff --git a/docs/docker.io/ubuntu/grafana.md b/docs/docker.io/ubuntu/grafana.md |
273 | index c1aef62..0bc7613 100644 |
274 | --- a/docs/docker.io/ubuntu/grafana.md |
275 | +++ b/docs/docker.io/ubuntu/grafana.md |
276 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/grafana but are shown here for comp |
277 | |
278 | | Channel Tag | | | Currently | Architectures | |
279 | |---|---|---|---|---| |
280 | - | **`7.4-21.04_beta`** | | | Grafana™ software 7.4 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
281 | + | **`8.1-21.10_beta`** | | | Grafana™ software 8.1.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
282 | + | `7.4-21.04_beta` | | | Grafana™ software 7.4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
283 | | `7.2-20.04_beta` | | | Grafana™ software 7.2.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
284 | | _`track_risk`_ | |
285 | |
286 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
287 | Launch this image locally: |
288 | |
289 | ```sh |
290 | -docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 ubuntu/grafana:7.4-21.04_beta |
291 | +docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 ubuntu/grafana:8.1-21.10_beta |
292 | ``` |
293 | Access your Grafana server at `localhost:30000`. |
294 | |
295 | @@ -70,7 +71,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
296 | |
297 | Download |
298 | [datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json) and |
299 | -[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:7.4-21.04_beta`), then: |
300 | +[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `ubuntu/grafana:8.1-21.10_beta`), then: |
301 | |
302 | ```sh |
303 | 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 |
304 | diff --git a/docs/docker.io/ubuntu/memcached.md b/docs/docker.io/ubuntu/memcached.md |
305 | index b03808f..68067f8 100644 |
306 | --- a/docs/docker.io/ubuntu/memcached.md |
307 | +++ b/docs/docker.io/ubuntu/memcached.md |
308 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/memcached but are shown here for co |
309 | |
310 | | Channel Tag | | | Currently | Architectures | |
311 | |---|---|---|---|---| |
312 | - | **`1.6-21.04_beta`** | | | Memcached 1.6 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
313 | + | **`1.6-21.10_beta`** | | | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
314 | + | `1.6-21.04_beta` | | | Memcached 1.6.9 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
315 | | `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` | |
316 | | _`track_risk`_ | |
317 | |
318 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
319 | Launch this image locally: |
320 | |
321 | ```sh |
322 | -docker run -d --name memcached-container -e TZ=UTC ubuntu/memcached:1.6-21.04_beta |
323 | +docker run -d --name memcached-container -e TZ=UTC ubuntu/memcached:1.6-21.10_beta |
324 | ``` |
325 | |
326 | #### Parameters |
327 | @@ -100,7 +101,7 @@ In this case you can append the flags themselves or a shell script to the run co |
328 | 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`. |
329 | |
330 | Download |
331 | -[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.6-21.04_beta`), then: |
332 | +[memcached-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/memcached/plain/examples/memcached-deployment.yml) and set `containers.memcached.image` in `memcached-deployment.yml` to your chosen channel tag (e.g. `ubuntu/memcached:1.6-21.10_beta`), then: |
333 | |
334 | ```sh |
335 | kubectl apply -f memcached-deployment.yml |
336 | diff --git a/docs/docker.io/ubuntu/mysql.md b/docs/docker.io/ubuntu/mysql.md |
337 | index 5129a97..198db0d 100644 |
338 | --- a/docs/docker.io/ubuntu/mysql.md |
339 | +++ b/docs/docker.io/ubuntu/mysql.md |
340 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/mysql but are shown here for comple |
341 | |
342 | | Channel Tag | | | Currently | Architectures | |
343 | |---|---|---|---|---| |
344 | - | **`8.0-21.04_beta`** | | | MySQL™ 8.0 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` | |
345 | + | **`8.0-21.10_beta`** | | | MySQL™ 8.0.27 on Ubuntu 21.10 | `amd64`, `arm64`, `s390x` | |
346 | + | `8.0-21.04_beta` | | | MySQL™ 8.0.27 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` | |
347 | | `8.0-20.04_beta` | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) | | MySQL™ 8.0.22 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `s390x` | |
348 | | _`track_risk`_ | |
349 | |
350 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
351 | Launch this image locally: |
352 | |
353 | ```sh |
354 | -docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ ubuntu/mysql:8.0-21.04_beta |
355 | +docker run -d --name mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ ubuntu/mysql:8.0-21.10_beta |
356 | ``` |
357 | Access your MySQL server at `localhost:30306`. |
358 | |
359 | @@ -86,7 +87,7 @@ This image also includes the `mysql` client for interactive container use: |
360 | ```sh |
361 | $ docker network create mysql-network |
362 | $ docker network connect mysql-network mysql-container |
363 | -$ docker run -it --rm --network mysql-network ubuntu/mysql:8.0-21.04_beta mysql -hmysql-container -uroot -p |
364 | +$ docker run -it --rm --network mysql-network ubuntu/mysql:8.0-21.10_beta mysql -hmysql-container -uroot -p |
365 | ``` |
366 | The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged in and can enjoy your new instance. |
367 | |
368 | @@ -96,7 +97,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
369 | |
370 | Download |
371 | [my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf) and |
372 | -[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `ubuntu/mysql:8.0-21.04_beta`), then: |
373 | +[mysql-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/mysql-deployment.yml) and set `containers.mysql.image` in `mysql-deployment.yml` to your chosen channel tag (e.g. `ubuntu/mysql:8.0-21.10_beta`), then: |
374 | |
375 | ```sh |
376 | kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf |
377 | diff --git a/docs/docker.io/ubuntu/nginx.md b/docs/docker.io/ubuntu/nginx.md |
378 | index 710e302..52744ba 100644 |
379 | --- a/docs/docker.io/ubuntu/nginx.md |
380 | +++ b/docs/docker.io/ubuntu/nginx.md |
381 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/nginx but are shown here for comple |
382 | |
383 | | Channel Tag | | | Currently | Architectures | |
384 | |---|---|---|---|---| |
385 | - | **`1.18-21.04_beta`** | | | Nginx 1.18 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
386 | + | **`1.18-21.10_beta`** | | | Nginx 1.18.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
387 | + | `1.18-21.04_beta` | | | Nginx 1.18.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
388 | | `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` | |
389 | | _`track_risk`_ | |
390 | |
391 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
392 | Launch this image locally: |
393 | |
394 | ```sh |
395 | -docker run -d --name nginx-container -e TZ=UTC -p 8080:80 ubuntu/nginx:1.18-21.04_beta |
396 | +docker run -d --name nginx-container -e TZ=UTC -p 8080:80 ubuntu/nginx:1.18-21.10_beta |
397 | ``` |
398 | Access your Nginx server at `http://localhost:8080`. |
399 | |
400 | @@ -71,7 +72,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
401 | |
402 | Download |
403 | [nginx.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/nginx.conf), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/config/html/index.html) and |
404 | -[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-21.04_beta`), then: |
405 | +[nginx-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/nginx/plain/examples/nginx-deployment.yml) and set `containers.nginx.image` in `nginx-deployment.yml` to your chosen channel tag (e.g. `ubuntu/nginx:1.18-21.10_beta`), then: |
406 | |
407 | ```sh |
408 | kubectl create configmap nginx-config --from-file=nginx=nginx.conf --from-file=nginx-site=index.html |
409 | diff --git a/docs/docker.io/ubuntu/postgres.md b/docs/docker.io/ubuntu/postgres.md |
410 | index 2ca4ef0..3700600 100644 |
411 | --- a/docs/docker.io/ubuntu/postgres.md |
412 | +++ b/docs/docker.io/ubuntu/postgres.md |
413 | @@ -21,8 +21,9 @@ _Tags in italics are not available in ubuntu/postgres but are shown here for com |
414 | |
415 | | Channel Tag | | | Currently | Architectures | |
416 | |---|---|---|---|---| |
417 | - | **`13.1-21.04_beta`** | | | Postgres 13.1 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` | |
418 | - | `12.4-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`, `s390x` | |
419 | + | **`13.1-21.10_beta`** | | | Postgres 13.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
420 | + | `13.1-21.04_beta` | | | Postgres 13.1 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
421 | + | `12.4-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` | |
422 | | _`track_risk`_ | |
423 | |
424 | 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`. |
425 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
426 | Launch this image locally: |
427 | |
428 | ```sh |
429 | -docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ ubuntu/postgres:13.1-21.04_beta |
430 | +docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ ubuntu/postgres:13.1-21.10_beta |
431 | ``` |
432 | Access your PostgreSQL server at `localhost:30432`. |
433 | |
434 | @@ -85,7 +86,7 @@ This image also includes the `psql` client for interactive container use: |
435 | ```sh |
436 | $ docker network create postgres-network |
437 | $ docker network connect postgres-network postgres-container |
438 | -$ docker run -it --rm --network postgres-network ubuntu/postgres:13.1-21.04_beta psql -h postgres-container -U postgres |
439 | +$ docker run -it --rm --network postgres-network ubuntu/postgres:13.1-21.10_beta psql -h postgres-container -U postgres |
440 | ``` |
441 | The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged in and can enjoy your new instance. |
442 | |
443 | @@ -95,7 +96,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
444 | |
445 | Download |
446 | [postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf) and |
447 | -[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `ubuntu/postgres:13.1-21.04_beta`), then: |
448 | +[postgres-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/postgres-deployment.yml) and set `containers.postgres.image` in `postgres-deployment.yml` to your chosen channel tag (e.g. `ubuntu/postgres:13.1-21.10_beta`), then: |
449 | |
450 | ```sh |
451 | kubectl create configmap postgres-config --from-file=main-config=postgresql.conf |
452 | diff --git a/docs/docker.io/ubuntu/prometheus-alertmanager.md b/docs/docker.io/ubuntu/prometheus-alertmanager.md |
453 | index 89fa94c..2da7cbc 100644 |
454 | --- a/docs/docker.io/ubuntu/prometheus-alertmanager.md |
455 | +++ b/docs/docker.io/ubuntu/prometheus-alertmanager.md |
456 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/prometheus-alertmanager but are sho |
457 | |
458 | | Channel Tag | | | Currently | Architectures | |
459 | |---|---|---|---|---| |
460 | - | **`0.21-21.04_beta`** | | | Prometheus Alertmanager 0.21 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
461 | + | **`0.22-21.10_beta`** | | | Prometheus Alertmanager 0.22.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
462 | + | `0.21-21.04_beta` | | | Prometheus Alertmanager 0.21.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
463 | | `0.21-20.04_beta` | | | Prometheus Alertmanager 0.21.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
464 | | _`track_risk`_ | |
465 | |
466 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
467 | Launch this image locally: |
468 | |
469 | ```sh |
470 | -docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 ubuntu/prometheus-alertmanager:0.21-21.04_beta |
471 | +docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 ubuntu/prometheus-alertmanager:0.22-21.10_beta |
472 | ``` |
473 | Access your Prometheus Alertmanager server at `localhost:30093`. |
474 | |
475 | @@ -70,7 +71,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
476 | |
477 | Download |
478 | [alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml) and |
479 | -[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus-alertmanager:0.21-21.04_beta`), then: |
480 | +[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) and set `containers.prometheus-alertmanager.image` in `prometheus-alertmanager-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus-alertmanager:0.22-21.10_beta`), then: |
481 | |
482 | ```sh |
483 | kubectl create configmap prometheus-alertmanager-config --from-file=alertmanager=alertmanager.yml |
484 | diff --git a/docs/docker.io/ubuntu/prometheus.md b/docs/docker.io/ubuntu/prometheus.md |
485 | index 9bbeb86..d82513b 100644 |
486 | --- a/docs/docker.io/ubuntu/prometheus.md |
487 | +++ b/docs/docker.io/ubuntu/prometheus.md |
488 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/prometheus but are shown here for c |
489 | |
490 | | Channel Tag | | | Currently | Architectures | |
491 | |---|---|---|---|---| |
492 | - | **`2.25-21.04_beta`** | | | Prometheus 2.25 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
493 | + | **`2.28-21.10_beta`** | | | Prometheus 2.28.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
494 | + | `2.25-21.04_beta` | | | Prometheus 2.25.1 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
495 | | `2.20-20.04_beta` | | | Prometheus 2.20.1 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
496 | | _`track_risk`_ | |
497 | |
498 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
499 | Launch this image locally: |
500 | |
501 | ```sh |
502 | -docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 ubuntu/prometheus:2.25-21.04_beta |
503 | +docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 ubuntu/prometheus:2.28-21.10_beta |
504 | ``` |
505 | Access your Prometheus server at `localhost:30090`. |
506 | |
507 | @@ -70,7 +71,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
508 | |
509 | Download |
510 | [prometheus.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml) and |
511 | -[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus:2.25-21.04_beta`), then: |
512 | +[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `ubuntu/prometheus:2.28-21.10_beta`), then: |
513 | |
514 | ```sh |
515 | kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml |
516 | diff --git a/docs/docker.io/ubuntu/redis.md b/docs/docker.io/ubuntu/redis.md |
517 | index 052a0c1..17414c1 100644 |
518 | --- a/docs/docker.io/ubuntu/redis.md |
519 | +++ b/docs/docker.io/ubuntu/redis.md |
520 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/redis but are shown here for comple |
521 | |
522 | | Channel Tag | | | Currently | Architectures | |
523 | |---|---|---|---|---| |
524 | - | **`6.0-21.04_beta`** | | | Redis™ software 6.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
525 | + | **`6.0-21.10_beta`** | | | Redis™ software 6.0.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
526 | + | `6.0-21.04_beta` | | | Redis™ software 6.0.11 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
527 | | `5.0-20.04_beta` | | | Redis™ software 5.0.7 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
528 | | _`track_risk`_ | |
529 | |
530 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
531 | Launch this image locally: |
532 | |
533 | ```sh |
534 | -docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.0-21.04_beta |
535 | +docker run -d --name redis-container -e TZ=UTC -p 30073:6379 -e REDIS_PASSWORD=mypassword ubuntu/redis:6.0-21.10_beta |
536 | ``` |
537 | Access your Redis server at `localhost:30073`. |
538 | |
539 | @@ -72,7 +73,7 @@ This image also includes the `redis-cli` client for interactive container use: |
540 | ```sh |
541 | $ docker network create redis-network |
542 | $ docker network connect redis-network redis-container |
543 | -$ docker run -it --rm --network redis-network ubuntu/redis:6.0-21.04_beta redis-cli -h redis-container |
544 | +$ docker run -it --rm --network redis-network ubuntu/redis:6.0-21.10_beta redis-cli -h redis-container |
545 | ``` |
546 | Now you can: |
547 | ``` |
548 | @@ -90,7 +91,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
549 | |
550 | Download |
551 | [redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf) and |
552 | -[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.0-21.04_beta`), then: |
553 | +[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) and set `containers.redis.image` in `redis-deployment.yml` to your chosen channel tag (e.g. `ubuntu/redis:6.0-21.10_beta`), then: |
554 | |
555 | ```sh |
556 | kubectl create configmap redis-config --from-file=redis=redis.conf |
557 | diff --git a/docs/docker.io/ubuntu/squid.md b/docs/docker.io/ubuntu/squid.md |
558 | index 0e26afa..45b7930 100644 |
559 | --- a/docs/docker.io/ubuntu/squid.md |
560 | +++ b/docs/docker.io/ubuntu/squid.md |
561 | @@ -21,8 +21,8 @@ _Tags in italics are not available in ubuntu/squid but are shown here for comple |
562 | |
563 | | Channel Tag | | | Currently | Architectures | |
564 | |---|---|---|---|---| |
565 | - | **`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` | |
566 | - | `4.13-21.10_edge` | | | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
567 | + | **`4.13-21.10_edge`** | | | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
568 | + | `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` | |
569 | | _`track_risk`_ | |
570 | |
571 | 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`. |
572 | @@ -35,7 +35,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
573 | Launch this image locally: |
574 | |
575 | ```sh |
576 | -docker run -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:4.10-20.04_beta |
577 | +docker run -d --name squid-container -e TZ=UTC -p 3128:3128 ubuntu/squid:4.13-21.10_edge |
578 | ``` |
579 | Access your Squid proxy at `localhost:3128`. |
580 | |
581 | @@ -70,7 +70,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
582 | |
583 | Download |
584 | [squid.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/config/squid.conf) and |
585 | -[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `ubuntu/squid:4.10-20.04_beta`), then: |
586 | +[squid-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/squid/plain/examples/squid-deployment.yml) and set `containers.squid.image` in `squid-deployment.yml` to your chosen channel tag (e.g. `ubuntu/squid:4.13-21.10_edge`), then: |
587 | |
588 | ```sh |
589 | kubectl create configmap squid-config --from-file=squid=squid.conf |
590 | diff --git a/docs/docker.io/ubuntu/telegraf.md b/docs/docker.io/ubuntu/telegraf.md |
591 | index 614b5b6..e29f9d0 100644 |
592 | --- a/docs/docker.io/ubuntu/telegraf.md |
593 | +++ b/docs/docker.io/ubuntu/telegraf.md |
594 | @@ -21,7 +21,8 @@ _Tags in italics are not available in ubuntu/telegraf but are shown here for com |
595 | |
596 | | Channel Tag | | | Currently | Architectures | |
597 | |---|---|---|---|---| |
598 | - | **`1.17-21.04_beta`** | | | Telegraf™ software 1.17 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
599 | + | **`1.19-21.10_beta`** | | | Telegraf™ software 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
600 | + | `1.17-21.04_beta` | | | Telegraf™ software 1.17.2 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
601 | | `1.15-20.04_beta` | | | Telegraf™ software 1.15.2 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
602 | | _`track_risk`_ | |
603 | |
604 | @@ -35,7 +36,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
605 | Launch this image locally: |
606 | |
607 | ```sh |
608 | -docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.17-21.04_beta |
609 | +docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 ubuntu/telegraf:1.19-21.10_beta |
610 | ``` |
611 | Access your Telegraf server at `localhost:30273`. |
612 | |
613 | @@ -69,7 +70,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
614 | |
615 | Download |
616 | [telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf) and |
617 | -[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.17-21.04_beta`), then: |
618 | +[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) and set `containers.telegraf.image` in `telegraf-deployment.yml` to your chosen channel tag (e.g. `ubuntu/telegraf:1.19-21.10_beta`), then: |
619 | |
620 | ```sh |
621 | kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf |
622 | diff --git a/docs/public.ecr.aws/lts/bind9.md b/docs/public.ecr.aws/lts/bind9.md |
623 | index b53c2a8..eafda43 100644 |
624 | --- a/docs/public.ecr.aws/lts/bind9.md |
625 | +++ b/docs/public.ecr.aws/lts/bind9.md |
626 | @@ -20,7 +20,7 @@ Up to 10 years customer security maintenance `from canonical/bind9`. [Request ac |
627 | |
628 | | Channel Tag | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures | |
629 | |---|---|---|---|---| |
630 | - | **`9.16-20.04_beta`** | - | - | Bind9 9.16.15 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
631 | + | **`9.16-20.04_beta`** | - | - | Bind9 9.16.1 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
632 | | _`track_risk`_ | |
633 | |
634 | 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`. |
635 | diff --git a/docs/public.ecr.aws/lts/postgres.md b/docs/public.ecr.aws/lts/postgres.md |
636 | index d39a9db..1b84c2b 100644 |
637 | --- a/docs/public.ecr.aws/lts/postgres.md |
638 | +++ b/docs/public.ecr.aws/lts/postgres.md |
639 | @@ -20,7 +20,7 @@ Up to 10 years customer security maintenance `from canonical/postgres`. [Request |
640 | |
641 | | Channel Tag | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) until | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) until | Currently | Architectures | |
642 | |---|---|---|---|---| |
643 | - | **`12.4-20.04_beta`** | - | - | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `s390x` | |
644 | + | **`12.4-20.04_beta`** | - | - | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
645 | | _`track_risk`_ | |
646 | |
647 | 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`. |
648 | diff --git a/docs/public.ecr.aws/ubuntu/apache2.md b/docs/public.ecr.aws/ubuntu/apache2.md |
649 | index d433638..777828e 100644 |
650 | --- a/docs/public.ecr.aws/ubuntu/apache2.md |
651 | +++ b/docs/public.ecr.aws/ubuntu/apache2.md |
652 | @@ -10,14 +10,15 @@ The Apache HTTP Server Project's goal is to build a secure, efficient and extens |
653 | |
654 | ## Tags and Architectures |
655 | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) |
656 | -Up to 5 years free security maintenance [from public.ecr.aws/lts/apache2](https://gallery.ecr.aws/lts/${repo}). |
657 | +Up to 5 years free security maintenance [from public.ecr.aws/lts/apache2](https://gallery.ecr.aws/lts/apache2). |
658 | |
659 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) |
660 | Up to 10 years customer security maintenance `from canonical/apache2`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). |
661 | |
662 | | Channel Tag | | | Currently | Architectures | |
663 | |---|---|---|---|---| |
664 | - | **`2.4-21.04_beta`** | [](https://gallery.ecr.aws/lts/apache2) | | Apache2 2.4 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
665 | + | **`2.4-21.10_beta`** | [](https://gallery.ecr.aws/lts/apache2) | | Apache2 2.4.48 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
666 | + | `2.4-21.04_beta` | [](https://gallery.ecr.aws/lts/apache2) | | Apache2 2.4.46 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
667 | | _`track_risk`_ | |
668 | |
669 | _The following tags are not available in public.ecr.aws/ubuntu/apache2 but are shown here for completeness:_ |
670 | diff --git a/docs/public.ecr.aws/ubuntu/bind9.md b/docs/public.ecr.aws/ubuntu/bind9.md |
671 | index bc6ea86..ff71a62 100644 |
672 | --- a/docs/public.ecr.aws/ubuntu/bind9.md |
673 | +++ b/docs/public.ecr.aws/ubuntu/bind9.md |
674 | @@ -10,21 +10,21 @@ BIND 9 provides software for Domain Name System (DNS) management including both |
675 | |
676 | ## Tags and Architectures |
677 | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) |
678 | -Up to 5 years free security maintenance [from public.ecr.aws/lts/bind9](https://gallery.ecr.aws/lts/${repo}). |
679 | +Up to 5 years free security maintenance [from public.ecr.aws/lts/bind9](https://gallery.ecr.aws/lts/bind9). |
680 | |
681 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) |
682 | Up to 10 years customer security maintenance `from canonical/bind9`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). |
683 | |
684 | | Channel Tag | | | Currently | Architectures | |
685 | |---|---|---|---|---| |
686 | - | _**`9.16-20.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.15 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
687 | + | **`9.16-21.10_beta`** | [](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
688 | | _`track_risk`_ | |
689 | |
690 | _The following tags are not available in public.ecr.aws/ubuntu/bind9 but are shown here for completeness:_ |
691 | |
692 | | Channel Tag | | | Currently | Architectures | |
693 | |---|---|---|---|---| |
694 | - | _**`9.16-20.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.15 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
695 | + | _**`9.16-20.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/bind9) | | Bind9 9.16.1 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
696 | | _`track_risk`_ | |
697 | |
698 | |
699 | diff --git a/docs/public.ecr.aws/ubuntu/cassandra.md b/docs/public.ecr.aws/ubuntu/cassandra.md |
700 | index f0eb9ad..39c2aa4 100644 |
701 | --- a/docs/public.ecr.aws/ubuntu/cassandra.md |
702 | +++ b/docs/public.ecr.aws/ubuntu/cassandra.md |
703 | @@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/cassandra`. [Reques |
704 | |
705 | | Channel Tag | | | Currently | Architectures | |
706 | |---|---|---|---|---| |
707 | - | **`4.0-21.04_beta`** | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
708 | + | **`4.0-21.10_beta`** | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
709 | + | `4.0-21.04_beta` | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
710 | | `4.0-20.04_beta` | [](https://gallery.ecr.aws/lts/cassandra) | | Cassandra 4.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
711 | | _`track_risk`_ | |
712 | |
713 | @@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
714 | Launch this image locally: |
715 | |
716 | ```sh |
717 | -docker run -d --name cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 public.ecr.aws/ubuntu/cassandra:4.0-21.04_beta |
718 | +docker run -d --name cassandra-container -e TZ=UTC -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 public.ecr.aws/ubuntu/cassandra:4.0-21.10_beta |
719 | ``` |
720 | Access your Cassandra server with `cqlsh localhost 9042`. |
721 | |
722 | @@ -69,7 +70,7 @@ docker exec -it cassandra-container /bin/bash |
723 | 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`. |
724 | |
725 | Download |
726 | -[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml) and set `containers.cassandra.image` in `cassandra-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cassandra:4.0-21.04_beta`), then: |
727 | +[cassandra-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cassandra/plain/examples/cassandra-deployment.yml) 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_beta`), then: |
728 | |
729 | ```sh |
730 | kubectl apply -f cassandra-deployment.yml |
731 | diff --git a/docs/public.ecr.aws/ubuntu/cortex.md b/docs/public.ecr.aws/ubuntu/cortex.md |
732 | index 7896844..dce0227 100644 |
733 | --- a/docs/public.ecr.aws/ubuntu/cortex.md |
734 | +++ b/docs/public.ecr.aws/ubuntu/cortex.md |
735 | @@ -23,7 +23,8 @@ Up to 10 years customer security maintenance `from canonical/cortex`. [Request a |
736 | |
737 | | Channel Tag | | | Currently | Architectures | |
738 | |---|---|---|---|---| |
739 | - | **`1.7-21.04_beta`** | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.7 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
740 | + | **`1.10-21.10_beta`** | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.10.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
741 | + | `1.7-21.04_beta` | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.7.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
742 | | `1.4-20.04_beta` | [](https://gallery.ecr.aws/lts/cortex) | | Cortex 1.4.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
743 | | _`track_risk`_ | |
744 | |
745 | @@ -38,7 +39,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
746 | Launch this image locally: |
747 | |
748 | ```sh |
749 | -docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 public.ecr.aws/ubuntu/cortex:1.7-21.04_beta |
750 | +docker run -d --name cortex-container -e TZ=UTC -p 32709:9009 public.ecr.aws/ubuntu/cortex:1.10-21.10_beta |
751 | ``` |
752 | Access your Cortex server at `http://localhost:32709`. |
753 | |
754 | @@ -72,7 +73,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
755 | |
756 | Download |
757 | [cortex.yaml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/config/cortex.yaml) and |
758 | -[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) and set `containers.cortex.image` in `cortex-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/cortex:1.7-21.04_beta`), then: |
759 | +[cortex-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/cortex/plain/oci/examples/cortex-deployment.yml) 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_beta`), then: |
760 | |
761 | ```sh |
762 | kubectl create configmap cortex-config --from-file=main-config=cortex.yaml |
763 | diff --git a/docs/public.ecr.aws/ubuntu/grafana.md b/docs/public.ecr.aws/ubuntu/grafana.md |
764 | index 87b4e80..df47862 100644 |
765 | --- a/docs/public.ecr.aws/ubuntu/grafana.md |
766 | +++ b/docs/public.ecr.aws/ubuntu/grafana.md |
767 | @@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/grafana`. [Request |
768 | |
769 | | Channel Tag | | | Currently | Architectures | |
770 | |---|---|---|---|---| |
771 | - | **`7.4-21.04_beta`** | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 7.4 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
772 | + | **`8.1-21.10_beta`** | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 8.1.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
773 | + | `7.4-21.04_beta` | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 7.4.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
774 | | `7.2-20.04_beta` | [](https://gallery.ecr.aws/lts/grafana) | | Grafana™ software 7.2.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
775 | | _`track_risk`_ | |
776 | |
777 | @@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
778 | Launch this image locally: |
779 | |
780 | ```sh |
781 | -docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 public.ecr.aws/ubuntu/grafana:7.4-21.04_beta |
782 | +docker run -d --name grafana-container -e TZ=UTC -p 30000:3000 public.ecr.aws/ubuntu/grafana:8.1-21.10_beta |
783 | ``` |
784 | Access your Grafana server at `localhost:30000`. |
785 | |
786 | @@ -66,7 +67,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
787 | |
788 | Download |
789 | [datasource.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/datasource.yml), [dashboard.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/dashboard.yml), [system-stats-dashboard.json](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/config/system-stats-dashboard.json) and |
790 | -[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) and set `containers.grafana.image` in `grafana-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/grafana:7.4-21.04_beta`), then: |
791 | +[grafana-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/grafana/plain/examples/grafana-deployment.yml) 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_beta`), then: |
792 | |
793 | ```sh |
794 | 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 |
795 | diff --git a/docs/public.ecr.aws/ubuntu/memcached.md b/docs/public.ecr.aws/ubuntu/memcached.md |
796 | index f0b6dad..2b072ae 100644 |
797 | --- a/docs/public.ecr.aws/ubuntu/memcached.md |
798 | +++ b/docs/public.ecr.aws/ubuntu/memcached.md |
799 | @@ -10,14 +10,15 @@ Memcached is an in-memory key-value store for small chunks of arbitrary data (st |
800 | |
801 | ## Tags and Architectures |
802 | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) |
803 | -Up to 5 years free security maintenance [from public.ecr.aws/lts/memcached](https://gallery.ecr.aws/lts/${repo}). |
804 | +Up to 5 years free security maintenance [from public.ecr.aws/lts/memcached](https://gallery.ecr.aws/lts/memcached). |
805 | |
806 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) |
807 | Up to 10 years customer security maintenance `from canonical/memcached`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). |
808 | |
809 | | Channel Tag | | | Currently | Architectures | |
810 | |---|---|---|---|---| |
811 | - | **`1.6-21.04_beta`** | [](https://gallery.ecr.aws/lts/memcached) | | Memcached 1.6 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
812 | + | **`1.6-21.10_beta`** | [](https://gallery.ecr.aws/lts/memcached) | | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
813 | + | `1.6-21.04_beta` | [](https://gallery.ecr.aws/lts/memcached) | | Memcached 1.6.9 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
814 | | _`track_risk`_ | |
815 | |
816 | _The following tags are not available in public.ecr.aws/ubuntu/memcached but are shown here for completeness:_ |
817 | diff --git a/docs/public.ecr.aws/ubuntu/mysql.md b/docs/public.ecr.aws/ubuntu/mysql.md |
818 | index af55f37..7f5a7ab 100644 |
819 | --- a/docs/public.ecr.aws/ubuntu/mysql.md |
820 | +++ b/docs/public.ecr.aws/ubuntu/mysql.md |
821 | @@ -10,14 +10,15 @@ MySQL is a fast, stable and true multi-user, multi-threaded SQL database server. |
822 | |
823 | ## Tags and Architectures |
824 | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) |
825 | -Up to 5 years free security maintenance [from public.ecr.aws/lts/mysql](https://gallery.ecr.aws/lts/${repo}). |
826 | +Up to 5 years free security maintenance [from public.ecr.aws/lts/mysql](https://gallery.ecr.aws/lts/mysql). |
827 | |
828 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) |
829 | Up to 10 years customer security maintenance `from canonical/mysql`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). |
830 | |
831 | | Channel Tag | | | Currently | Architectures | |
832 | |---|---|---|---|---| |
833 | - | **`8.0-21.04_beta`** | [](https://gallery.ecr.aws/lts/mysql) | | MySQL™ 8.0 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` | |
834 | + | **`8.0-21.10_beta`** | [](https://gallery.ecr.aws/lts/mysql) | | MySQL™ 8.0.27 on Ubuntu 21.10 | `amd64`, `arm64`, `s390x` | |
835 | + | `8.0-21.04_beta` | [](https://gallery.ecr.aws/lts/mysql) | | MySQL™ 8.0.27 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` | |
836 | | _`track_risk`_ | |
837 | |
838 | _The following tags are not available in public.ecr.aws/ubuntu/mysql but are shown here for completeness:_ |
839 | diff --git a/docs/public.ecr.aws/ubuntu/nginx.md b/docs/public.ecr.aws/ubuntu/nginx.md |
840 | index 16682e1..0991efa 100644 |
841 | --- a/docs/public.ecr.aws/ubuntu/nginx.md |
842 | +++ b/docs/public.ecr.aws/ubuntu/nginx.md |
843 | @@ -10,14 +10,15 @@ Nginx ("engine X") is a high-performance web and reverse proxy server created by |
844 | |
845 | ## Tags and Architectures |
846 | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) |
847 | -Up to 5 years free security maintenance [from public.ecr.aws/lts/nginx](https://gallery.ecr.aws/lts/${repo}). |
848 | +Up to 5 years free security maintenance [from public.ecr.aws/lts/nginx](https://gallery.ecr.aws/lts/nginx). |
849 | |
850 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) |
851 | Up to 10 years customer security maintenance `from canonical/nginx`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). |
852 | |
853 | | Channel Tag | | | Currently | Architectures | |
854 | |---|---|---|---|---| |
855 | - | **`1.18-21.04_beta`** | [](https://gallery.ecr.aws/lts/nginx) | | Nginx 1.18 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
856 | + | **`1.18-21.10_beta`** | [](https://gallery.ecr.aws/lts/nginx) | | Nginx 1.18.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
857 | + | `1.18-21.04_beta` | [](https://gallery.ecr.aws/lts/nginx) | | Nginx 1.18.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
858 | | _`track_risk`_ | |
859 | |
860 | _The following tags are not available in public.ecr.aws/ubuntu/nginx but are shown here for completeness:_ |
861 | diff --git a/docs/public.ecr.aws/ubuntu/postgres.md b/docs/public.ecr.aws/ubuntu/postgres.md |
862 | index bea237a..ad316df 100644 |
863 | --- a/docs/public.ecr.aws/ubuntu/postgres.md |
864 | +++ b/docs/public.ecr.aws/ubuntu/postgres.md |
865 | @@ -10,21 +10,22 @@ PostgreSQL is a powerful, open source object-relational database system. It is f |
866 | |
867 | ## Tags and Architectures |
868 | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) |
869 | -Up to 5 years free security maintenance [from public.ecr.aws/lts/postgres](https://gallery.ecr.aws/lts/${repo}). |
870 | +Up to 5 years free security maintenance [from public.ecr.aws/lts/postgres](https://gallery.ecr.aws/lts/postgres). |
871 | |
872 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) |
873 | Up to 10 years customer security maintenance `from canonical/postgres`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). |
874 | |
875 | | Channel Tag | | | Currently | Architectures | |
876 | |---|---|---|---|---| |
877 | - | **`13.1-21.04_beta`** | [](https://gallery.ecr.aws/lts/postgres) | | Postgres 13.1 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` | |
878 | + | **`13.1-21.10_beta`** | [](https://gallery.ecr.aws/lts/postgres) | | Postgres 13.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
879 | + | `13.1-21.04_beta` | [](https://gallery.ecr.aws/lts/postgres) | | Postgres 13.1 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
880 | | _`track_risk`_ | |
881 | |
882 | _The following tags are not available in public.ecr.aws/ubuntu/postgres but are shown here for completeness:_ |
883 | |
884 | | Channel Tag | | | Currently | Architectures | |
885 | |---|---|---|---|---| |
886 | - | _**`12.4-20.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `s390x` | |
887 | + | _**`12.4-20.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/postgres) | | Postgres 12.4 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
888 | | _`track_risk`_ | |
889 | |
890 | |
891 | diff --git a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md |
892 | index 676d417..c0937a3 100644 |
893 | --- a/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md |
894 | +++ b/docs/public.ecr.aws/ubuntu/prometheus-alertmanager.md |
895 | @@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/prometheus-alertman |
896 | |
897 | | Channel Tag | | | Currently | Architectures | |
898 | |---|---|---|---|---| |
899 | - | **`0.21-21.04_beta`** | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.21 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
900 | + | **`0.22-21.10_beta`** | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.22.0 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
901 | + | `0.21-21.04_beta` | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.21.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
902 | | `0.21-20.04_beta` | [](https://gallery.ecr.aws/lts/prometheus-alertmanager) | | Prometheus Alertmanager 0.21.0 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
903 | | _`track_risk`_ | |
904 | |
905 | @@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
906 | Launch this image locally: |
907 | |
908 | ```sh |
909 | -docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 public.ecr.aws/ubuntu/prometheus-alertmanager:0.21-21.04_beta |
910 | +docker run -d --name prometheus-alertmanager-container -e TZ=UTC -p 30093:9093 public.ecr.aws/ubuntu/prometheus-alertmanager:0.22-21.10_beta |
911 | ``` |
912 | Access your Prometheus Alertmanager server at `localhost:30093`. |
913 | |
914 | @@ -66,7 +67,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
915 | |
916 | Download |
917 | [alertmanager.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/config/alertmanager.yml) and |
918 | -[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) 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.21-21.04_beta`), then: |
919 | +[prometheus-alertmanager-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus-alertmanager/plain/oci/examples/alertmanager-deployment.yml) 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_beta`), then: |
920 | |
921 | ```sh |
922 | kubectl create configmap prometheus-alertmanager-config --from-file=alertmanager=alertmanager.yml |
923 | diff --git a/docs/public.ecr.aws/ubuntu/prometheus.md b/docs/public.ecr.aws/ubuntu/prometheus.md |
924 | index 1ce4776..047fd10 100644 |
925 | --- a/docs/public.ecr.aws/ubuntu/prometheus.md |
926 | +++ b/docs/public.ecr.aws/ubuntu/prometheus.md |
927 | @@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/prometheus`. [Reque |
928 | |
929 | | Channel Tag | | | Currently | Architectures | |
930 | |---|---|---|---|---| |
931 | - | **`2.25-21.04_beta`** | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.25 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
932 | + | **`2.28-21.10_beta`** | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.28.1 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
933 | + | `2.25-21.04_beta` | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.25.1 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
934 | | `2.20-20.04_beta` | [](https://gallery.ecr.aws/lts/prometheus) | | Prometheus 2.20.1 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
935 | | _`track_risk`_ | |
936 | |
937 | @@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
938 | Launch this image locally: |
939 | |
940 | ```sh |
941 | -docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 public.ecr.aws/ubuntu/prometheus:2.25-21.04_beta |
942 | +docker run -d --name prometheus-container -e TZ=UTC -p 30090:9090 public.ecr.aws/ubuntu/prometheus:2.28-21.10_beta |
943 | ``` |
944 | Access your Prometheus server at `localhost:30090`. |
945 | |
946 | @@ -66,7 +67,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
947 | |
948 | Download |
949 | [prometheus.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/prometheus.yml), [alerts.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/config/alerts.yml) and |
950 | -[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) and set `containers.prometheus.image` in `prometheus-deployment.yml` to your chosen channel tag (e.g. `public.ecr.aws/ubuntu/prometheus:2.25-21.04_beta`), then: |
951 | +[prometheus-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/prometheus/plain/oci/examples/prometheus-deployment.yml) 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_beta`), then: |
952 | |
953 | ```sh |
954 | kubectl create configmap prometheus-config --from-file=prometheus=prometheus.yml --from-file=prometheus-alerts=alerts.yml |
955 | diff --git a/docs/public.ecr.aws/ubuntu/redis.md b/docs/public.ecr.aws/ubuntu/redis.md |
956 | index 9f0e902..28ee2c6 100644 |
957 | --- a/docs/public.ecr.aws/ubuntu/redis.md |
958 | +++ b/docs/public.ecr.aws/ubuntu/redis.md |
959 | @@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/redis`. [Request ac |
960 | |
961 | | Channel Tag | | | Currently | Architectures | |
962 | |---|---|---|---|---| |
963 | - | **`6.0-21.04_beta`** | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 6.0 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
964 | + | **`6.0-21.10_beta`** | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 6.0.15 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
965 | + | `6.0-21.04_beta` | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 6.0.11 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
966 | | `5.0-20.04_beta` | [](https://gallery.ecr.aws/lts/redis) | | Redis™ software 5.0.7 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
967 | | _`track_risk`_ | |
968 | |
969 | @@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
970 | Launch this image locally: |
971 | |
972 | ```sh |
973 | -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_beta |
974 | +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_beta |
975 | ``` |
976 | Access your Redis server at `localhost:30073`. |
977 | |
978 | @@ -68,7 +69,7 @@ This image also includes the `redis-cli` client for interactive container use: |
979 | ```sh |
980 | $ docker network create redis-network |
981 | $ docker network connect redis-network redis-container |
982 | -$ docker run -it --rm --network redis-network public.ecr.aws/ubuntu/redis:6.0-21.04_beta redis-cli -h redis-container |
983 | +$ docker run -it --rm --network redis-network public.ecr.aws/ubuntu/redis:6.0-21.10_beta redis-cli -h redis-container |
984 | ``` |
985 | Now you can: |
986 | ``` |
987 | @@ -86,7 +87,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
988 | |
989 | Download |
990 | [redis.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/config/redis.conf) and |
991 | -[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) 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_beta`), then: |
992 | +[redis-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/redis/plain/examples/redis-deployment.yml) 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_beta`), then: |
993 | |
994 | ```sh |
995 | kubectl create configmap redis-config --from-file=redis=redis.conf |
996 | diff --git a/docs/public.ecr.aws/ubuntu/squid.md b/docs/public.ecr.aws/ubuntu/squid.md |
997 | index 6add789..1064083 100644 |
998 | --- a/docs/public.ecr.aws/ubuntu/squid.md |
999 | +++ b/docs/public.ecr.aws/ubuntu/squid.md |
1000 | @@ -10,15 +10,14 @@ Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It r |
1001 | |
1002 | ## Tags and Architectures |
1003 | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) |
1004 | -Up to 5 years free security maintenance [from public.ecr.aws/lts/squid](https://gallery.ecr.aws/lts/${repo}). |
1005 | +Up to 5 years free security maintenance [from public.ecr.aws/lts/squid](https://gallery.ecr.aws/lts/squid). |
1006 | |
1007 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) |
1008 | Up to 10 years customer security maintenance `from canonical/squid`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). |
1009 | |
1010 | | Channel Tag | | | Currently | Architectures | |
1011 | |---|---|---|---|---| |
1012 | - | _**`4.10-20.04_beta`** _ | [![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17)](https://gallery.ecr.aws/lts/squid) | | Squid 4.10 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1013 | - | `4.13-21.10_edge` | [](https://gallery.ecr.aws/lts/squid) | | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
1014 | + | **`4.13-21.10_edge`** | [](https://gallery.ecr.aws/lts/squid) | | Squid 4.13 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
1015 | | _`track_risk`_ | |
1016 | |
1017 | _The following tags are not available in public.ecr.aws/ubuntu/squid but are shown here for completeness:_ |
1018 | diff --git a/docs/public.ecr.aws/ubuntu/telegraf.md b/docs/public.ecr.aws/ubuntu/telegraf.md |
1019 | index 508925d..aac090f 100644 |
1020 | --- a/docs/public.ecr.aws/ubuntu/telegraf.md |
1021 | +++ b/docs/public.ecr.aws/ubuntu/telegraf.md |
1022 | @@ -16,7 +16,8 @@ Up to 10 years customer security maintenance `from canonical/telegraf`. [Request |
1023 | |
1024 | | Channel Tag | | | Currently | Architectures | |
1025 | |---|---|---|---|---| |
1026 | - | **`1.17-21.04_beta`** | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.17 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
1027 | + | **`1.19-21.10_beta`** | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.19.2 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
1028 | + | `1.17-21.04_beta` | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.17.2 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` | |
1029 | | `1.15-20.04_beta` | [](https://gallery.ecr.aws/lts/telegraf) | | Telegraf™ software 1.15.2 on Ubuntu 20.04 LTS| `amd64`, `arm64`, `ppc64el`, `s390x` | |
1030 | | _`track_risk`_ | |
1031 | |
1032 | @@ -31,7 +32,7 @@ If your usage includes commercial redistribution or requires unavailable channel |
1033 | Launch this image locally: |
1034 | |
1035 | ```sh |
1036 | -docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.17-21.04_beta |
1037 | +docker run -d --name telegraf-container -e TZ=UTC -p 30273:9273 public.ecr.aws/ubuntu/telegraf:1.19-21.10_beta |
1038 | ``` |
1039 | Access your Telegraf server at `localhost:30273`. |
1040 | |
1041 | @@ -65,7 +66,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr |
1042 | |
1043 | Download |
1044 | [telegraf.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/config/telegraf.conf) and |
1045 | -[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) 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_beta`), then: |
1046 | +[telegraf-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/telegraf/plain/examples/telegraf-deployment.yml) 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_beta`), then: |
1047 | |
1048 | ```sh |
1049 | kubectl create configmap telegraf-config --from-file=main-config=telegraf.conf |
1050 | diff --git a/templates/README_ECR.md b/templates/README_ECR.md |
1051 | index 47ae031..645f7fa 100644 |
1052 | --- a/templates/README_ECR.md |
1053 | +++ b/templates/README_ECR.md |
1054 | @@ -17,7 +17,7 @@ ${description} |
1055 | |
1056 | ## Tags and Architectures |
1057 | ![LTS](https://assets.ubuntu.com/v1/0a5ff561-LTS%402x.png?h=17) |
1058 | -Up to 5 years free security maintenance${' [from public.ecr.aws/lts/'+repo+'](https://gallery.ecr.aws/lts/${repo})' if has_an_lts else '. [Request access](https://ubuntu.com/security/docker-images#get-in-touch)'}. |
1059 | +Up to 5 years free security maintenance${' [from public.ecr.aws/lts/'+repo+'](https://gallery.ecr.aws/lts/'+repo+')' if has_an_lts else '. [Request access](https://ubuntu.com/security/docker-images#get-in-touch)'}. |
1060 | |
1061 | ![ESM](https://assets.ubuntu.com/v1/572f3fbd-ESM%402x.png?h=17) |
1062 | Up to 10 years customer security maintenance `from canonical/${repo}`. [Request access](https://ubuntu.com/security/docker-images#get-in-touch). |
Thanks for the MP, Valentin :-).
LGTM, +1.