Ubuntu Docker Images

Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/mysql:8.0-21.10-wip into ~ubuntu-docker-images/ubuntu-docker-images/+git/mysql:8.0-21.04

  1. Git
  2. lp:~ubuntu-docker-images/ubuntu-docker-images/+git/mysql
  3. 8.0-21.10-wip
  4. Merge into 8.0-21.04
Proposed by Athos Ribeiro
Status: Merged
Merge reported by: Athos Ribeiro
Merged at revision: 2b509c5652331f95f4c1e5e251e92f1252438a3f
Proposed branch: ~ubuntu-docker-images/ubuntu-docker-images/+git/mysql:8.0-21.10-wip
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/mysql:8.0-21.04
Diff against target: 78 lines (+8/-8)
4 files modified
Dockerfile (+1/-1)
HACKING.md (+1/-1)
README.md (+4/-4)
data/mysql.yaml (+2/-2)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior Approve
Bryce Harrington Pending
Canonical Server Pending
Review via email: mp+403527@code.launchpad.net

Description of the change

This change creates the mysql 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 8.0-21.04 branch solely for comparing purposes. When accepted, these changes should be pushed into a new 8.0-21.10 branch.

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

Builds and tests fine. LGTM, +1.

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

Pushed a new 8.0-21.10 branch and removed the 8.0-21.10-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 9040dd7..089edab 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 3de44d0..abf59fb 100644
13--- a/HACKING.md
14+++ b/HACKING.md
15@@ -1,7 +1,7 @@
16 # Contributing
17
18 In Ubuntu, MySQL is available as a `.deb` package. For this reason,
19-this image was built by installing the MySQL Ubuntu 21.04 package
20+this image was built by installing the MySQL Ubuntu 21.10 package
21 inside a docker container.
22
23 In order to contribute to the MySQL OCI image, do the following:
24diff --git a/README.md b/README.md
25index ca2da5f..875ec10 100644
26--- a/README.md
27+++ b/README.md
28@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/mysql but are shown here for comple
29
30 | Channel Tag | | | Currently | Architectures |
31 |---|---|---|---|---|
32-| **`8.0-21.04_beta`**    | | | MySQL 8.0.23 on Ubuntu 21.04 | `amd64`, `arm64`, `s390x` |
33+| **`8.0-21.10_beta`**    | | | MySQL 8.0.25 on Ubuntu 21.10 | `amd64`, `arm64`, `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 mysql-container -e TZ=UTC -p 30306:3306 -e MYSQL_ROOT_PASSWORD=My:S3cr3t/ ubuntu/mysql:8.0-21.04_beta
42+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
43 ```
44 Access your MySQL server at `localhost:30306`.
45
46@@ -81,7 +81,7 @@ This image also includes the `mysql` client for interactive container use:
47 ```sh
48 $ docker network create mysql-network
49 $ docker network connect mysql-network mysql-container
50-$ docker run -it --rm --network mysql-network ubuntu/mysql:8.0-21.04_beta mysql -hmysql-container -uroot -p
51+$ docker run -it --rm --network mysql-network ubuntu/mysql:8.0-21.10_beta mysql -hmysql-container -uroot -p
52 ```
53 The password will be asked and you can enter `My:S3cr3t/`. Now, you are logged in and can enjoy your new instance.
54
55@@ -91,7 +91,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
56
57 Download
58 [my-custom.cnf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/mysql/plain/examples/config/my-custom.cnf) and
59-[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:
60+[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:
61
62 ```sh
63 kubectl create configmap mysql-config --from-file=main-config=my-custom.cnf
64diff --git a/data/mysql.yaml b/data/mysql.yaml
65index d53a1be..2b607e5 100644
66--- a/data/mysql.yaml
67+++ b/data/mysql.yaml
68@@ -6,8 +6,8 @@ description: >
69 server. SQL (Structured Query Language) is the most popular database query
70 language in the world. The main goals of MySQL are speed, robustness and ease
71 of use. Read more on the [MySQL website](https://dev.mysql.com/doc/refman/8.0/en/).
72-version: 8.0.23
73-base: Ubuntu 21.04
74+version: 8.0.25
75+base: Ubuntu 21.10
76 architectures:
77 - amd64
78 - arm64

Subscribers

People subscribed via source and target branches

to all changes: