Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql:13.3-21.10-wip into ~ubuntu-docker-images/ubuntu-docker-images/+git/postgresql:13.1-21.04

[Athos Ribeiro]

This change creates the postgresql OCI image for impish.

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

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

Moreover, although a 13.2-21.04 branch exists, the 13.1 branch is the one set in the current recipe (and that is why this new one is based on the 13.1 branch). Finally, no significant changes were performed in the postgresql upstream Dockerfile from which this one was initially forked in the past, as per the AUTHORS file.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Athos.

The changes to the Dockerfile and the doc regeneration are fine, but the branch name should not contain the minor version. It should be "13-21.10" (notice that there are the "12-20.10" and the "13-21.04" branches). Arguably, we should delete the other branches from the repo because they cause confusion. Also notice that you will have to use the 13-21.04 branch as the base for the new 13-21.10 branch.

Having said that, you actually caught a problem in the postgres-21.04 recipe: it's using the wrong branch to build the image. I went ahead and updated the recipe to use the 13-21.04 branch, and also triggered a full rebuild of the image.

review: Needs Fixing

[Athos Ribeiro (athos-ribeiro)]

Hi Sergio, I am closing this MR then and will file a new one from the proper branch when we re-visit the impish images:)

Thanks for the review!

[Sergio Durigan Junior (sergiodj)]

Athos,

Now that we're working on the impish OCI images, would you like to reopen/refile this MP?

[Athos Ribeiro (athos-ribeiro)]

Sounds good. I will address your comments, check if any further changes are needed and re-open this one

[Sergio Durigan Junior (sergiodj)]

On Monday, August 30 2021, Athos Ribeiro wrote:

> Sounds good. I will address your comments, check if any further changes are needed and re-open this one

+1, thanks Athos!

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

Unmerged commits

8365baa... by Athos Ribeiro on 2021-05-31

Regenerate documentation

Signed-off-by: Athos Ribeiro <email address hidden>

2858808... by Athos Ribeiro on 2021-05-31

Update to impish

Signed-off-by: Athos Ribeiro <email address hidden>

diff --git a/Dockerfile b/Dockerfile
index 3e0a282..13b1d7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM ubuntu:hirsute
+FROM ubuntu:impish
 
 ENV TZ UTC
 
diff --git a/HACKING.md b/HACKING.md
index cdcb3d0..1efa043 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,7 +1,7 @@
 # Contributing
 
 In Ubuntu, Postgres is available as a `.deb` package.  For this reason,
-this image was built by installing the Postgres Ubuntu Focal package
+this image was built by installing the Postgres Ubuntu 21.10 LTS package
 inside a docker container.
 
 In order to contribute to the Postgres OCI image, do the following:
diff --git a/README.md b/README.md
index a3a9642..231afef 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/postgres but are shown here for com
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`12.4-20.04_beta`**    | | | Postgres 12.4 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `s390x` |
+| **`13.3-21.10_beta`**    | | | Postgres 13.3 on Ubuntu 21.10 LTS | `amd64`, `arm64`, `s390x` |
 | _`track_risk`_ |
 
 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`.
@@ -30,7 +30,7 @@ Channel tag shows the most stable channel for that track ordered `stable`, `cand
 Launch this image locally:
 
 ```sh
-docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ ubuntu/postgres:12.4-20.04_beta
+docker run -d --name postgres-container -e TZ=UTC -p 30432:5432 -e POSTGRES_PASSWORD=My:s3Cr3t/ ubuntu/postgres:13.3-21.10_beta
 ```
 Access your PostgreSQL server at `localhost:30432`.
 
@@ -80,7 +80,7 @@ This image also includes the `psql` client for interactive container use:
 ```sh
 $ docker network create postgres-network
 $ docker network connect postgres-network postgres-container
-$ docker run -it --rm --network postgres-network ubuntu/postgres:12.4-20.04_beta psql -h postgres-container -U postgres
+$ docker run -it --rm --network postgres-network ubuntu/postgres:13.3-21.10_beta psql -h postgres-container -U postgres
 ```
 The password will be asked and you can enter `My:s3Cr3t/`. Now, you are logged in and can enjoy your new instance.
 
@@ -90,7 +90,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [postgresql.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/postgresql/plain/examples/config/postgresql.conf) and
-[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:12.4-20.04_beta`), then:
+[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.3-21.10_beta`), then:
 
 ```sh
 kubectl create configmap postgres-config --from-file=main-config=postgresql.conf
diff --git a/data/postgres.yaml b/data/postgres.yaml
index aa807f6..187577d 100644
--- a/data/postgres.yaml
+++ b/data/postgres.yaml
@@ -3,8 +3,8 @@ main: true
 repo: postgres
 description: >
   PostgreSQL is a powerful, open source object-relational database system. It is fully ACID compliant, has full support for foreign keys, joins, views, triggers, and stored procedures (in multiple languages). It includes most SQL:2008 data types, including INTEGER, NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and TIMESTAMP. It also supports storage of binary large objects, including pictures, sounds, or video. It has native programming interfaces for C/C++, Java, .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional documentation. Read more on the [PostgreSQL website](https://www.postgresql.org/docs/).
-version: 13.1
-base: Ubuntu 21.04 LTS
+version: "13.3"
+base: Ubuntu 21.10 LTS
 architectures:
   - amd64
   - arm64