Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/memcached:1.6-21.10-wip into ~ubuntu-docker-images/ubuntu-docker-images/+git/memcached:1.6-21.04

Proposed by Athos Ribeiro
Status: Merged
Merge reported by: Athos Ribeiro
Merged at revision: 16d191aadbf9541b461d1e1e5795dad71f924673
Proposed branch: ~ubuntu-docker-images/ubuntu-docker-images/+git/memcached:1.6-21.10-wip
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/memcached:1.6-21.04
Diff against target: 67 lines (+6/-6)
4 files modified
Dockerfile (+1/-1)
HACKING.md (+1/-1)
README.md (+3/-3)
data/memcached.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior Approve
Bryce Harrington Pending
Canonical Server Pending
Review via email: mp+403521@code.launchpad.net

Description of the change

This change creates the memcached OCI image for impish.

Just the trivial changes were needed and no regressions were detected when running the unit test.

Note that this MP is targeting the 1.6-21.04 branch solely for comparing purposes. When accepted, these changes should be pushed into a new 1.6-21.10 branch.

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, builds and tests fine. LGTM.

review: Approve
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Created new 1.6-21.10 branch and removed the wip one.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index 34d9d00..d12137f 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -1,4 +1,4 @@
6-FROM ubuntu:hirsute
7+FROM ubuntu:impish
8
9 ENV TZ UTC
10
11diff --git a/HACKING.md b/HACKING.md
12index 08bccc6..52432ab 100644
13--- a/HACKING.md
14+++ b/HACKING.md
15@@ -1,7 +1,7 @@
16 # Contributing
17
18 In Ubuntu, Memcached is available as a `.deb` package. For this reason,
19-this image was built by installing the Memcached Ubuntu 21.04 package
20+this image was built by installing the Memcached Ubuntu 21.10 package
21 inside a docker container.
22
23 In order to contribute to the Memcached OCI image, do the following:
24diff --git a/README.md b/README.md
25index 1616930..34a90c5 100644
26--- a/README.md
27+++ b/README.md
28@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/memcached but are shown here for co
29
30 | Channel Tag | | | Currently | Architectures |
31 |---|---|---|---|---|
32-| **`1.6-21.04_beta`**    | | | Memcached 1.6.9 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
33+| **`1.6-21.10_beta`**    | | | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
34 | _`track_risk`_ |
35
36 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`.
37@@ -30,7 +30,7 @@ Channel tag shows the most stable channel for that track ordered `stable`, `cand
38 Launch this image locally:
39
40 ```sh
41-docker run -d --name memcached-container -e TZ=UTC ubuntu/memcached:1.6-21.04_beta
42+docker run -d --name memcached-container -e TZ=UTC ubuntu/memcached:1.6-21.10_beta
43 ```
44
45 #### Parameters
46@@ -95,7 +95,7 @@ In this case you can append the flags themselves or a shell script to the run co
47 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`.
48
49 Download
50-[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:
51+[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:
52
53 ```sh
54 kubectl apply -f memcached-deployment.yml
55diff --git a/data/memcached.yaml b/data/memcached.yaml
56index 051afdc..01afa20 100644
57--- a/data/memcached.yaml
58+++ b/data/memcached.yaml
59@@ -5,7 +5,7 @@ description: >
60 Memcached is an in-memory key-value store for small chunks of arbitrary data (strings, objects) from results of database calls, API calls, or page rendering. It is a short-term memory for applications.
61 Memcached allows to take memory from parts of a system where you have more than you need and make it accessible to areas where you have less than you need. Read more on the [memcached website](https://memcached.org/).
62 version: 1.6.9
63-base: Ubuntu 21.04
64+base: Ubuntu 21.10
65 architectures:
66 - amd64
67 - arm64

Subscribers

People subscribed via source and target branches

to all changes: