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
diff --git a/Dockerfile b/Dockerfile
index 34d9d00..d12137f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
1FROM ubuntu:hirsute1FROM ubuntu:impish
22
3ENV TZ UTC3ENV TZ UTC
44
diff --git a/HACKING.md b/HACKING.md
index 08bccc6..52432ab 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,7 +1,7 @@
1# Contributing1# Contributing
22
3In Ubuntu, Memcached is available as a `.deb` package. For this reason,3In Ubuntu, Memcached is available as a `.deb` package. For this reason,
4this image was built by installing the Memcached Ubuntu 21.04 package4this image was built by installing the Memcached Ubuntu 21.10 package
5inside a docker container.5inside a docker container.
66
7In order to contribute to the Memcached OCI image, do the following:7In order to contribute to the Memcached OCI image, do the following:
diff --git a/README.md b/README.md
index 1616930..34a90c5 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/memcached but are shown here for co
1919
20| Channel Tag | | | Currently | Architectures |20| Channel Tag | | | Currently | Architectures |
21|---|---|---|---|---|21|---|---|---|---|---|
22| **`1.6-21.04_beta`**    | | | Memcached 1.6.9 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |22| **`1.6-21.10_beta`**    | | | Memcached 1.6.9 on Ubuntu 21.10 | `amd64`, `arm64`, `ppc64el`, `s390x` |
23| _`track_risk`_ |23| _`track_risk`_ |
2424
25Channel 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`.25Channel 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`.
@@ -30,7 +30,7 @@ Channel tag shows the most stable channel for that track ordered `stable`, `cand
30Launch this image locally:30Launch this image locally:
3131
32```sh32```sh
33docker run -d --name memcached-container -e TZ=UTC ubuntu/memcached:1.6-21.04_beta33docker run -d --name memcached-container -e TZ=UTC ubuntu/memcached:1.6-21.10_beta
34```34```
3535
36#### Parameters36#### Parameters
@@ -95,7 +95,7 @@ In this case you can append the flags themselves or a shell script to the run co
95Works 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`.95Works 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`.
9696
97Download97Download
98[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:98[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:
9999
100```sh100```sh
101kubectl apply -f memcached-deployment.yml101kubectl apply -f memcached-deployment.yml
diff --git a/data/memcached.yaml b/data/memcached.yaml
index 051afdc..01afa20 100644
--- a/data/memcached.yaml
+++ b/data/memcached.yaml
@@ -5,7 +5,7 @@ description: >
5 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.5 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.
6 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/).6 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/).
7version: 1.6.97version: 1.6.9
8base: Ubuntu 21.048base: Ubuntu 21.10
9architectures:9architectures:
10 - amd6410 - amd64
11 - arm6411 - arm64

Subscribers

People subscribed via source and target branches

to all changes: