Ubuntu Docker Images

Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:2.4-21.10-wip into ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:2.4-21.04

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

Description of the change

This change creates the apache2 OCI image for impish.

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

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

LGTM, +1

review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, Bryce. Merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index 7066d46..64490ec 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 256cf0a..8de4c4b 100644
13--- a/HACKING.md
14+++ b/HACKING.md
15@@ -1,7 +1,7 @@
16 # Contributing
17
18 In Ubuntu, Apache2 is available as a `.deb` package. For this reason,
19-this image was built by installing the Apache2 Ubuntu 21.04 package
20+this image was built by installing the Apache2 Ubuntu 21.10 package
21 inside a docker container.
22
23 In order to contribute to the Apache2 OCI image, do the following:
24diff --git a/README.md b/README.md
25index c49f2ad..5ecffa1 100644
26--- a/README.md
27+++ b/README.md
28@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/apache2 but are shown here for comp
29
30 | Channel Tag | | | Currently | Architectures |
31 |---|---|---|---|---|
32-| **`2.4-21.04_beta`**    | | | Apache2 2.4.46 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
33+| **`2.4-21.10_beta`**    | | | Apache2 2.4.46 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 apache2-container -e TZ=UTC -p 8080:80 ubuntu/apache2:2.4-21.04_beta
42+docker run -d --name apache2-container -e TZ=UTC -p 8080:80 ubuntu/apache2:2.4-21.10_beta
43 ```
44 Access your Apache2 server at `http://localhost:8080`.
45
46@@ -65,7 +65,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
47
48 Download
49 [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
50-[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:
51+[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:
52
53 ```sh
54 kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html
55diff --git a/data/apache2.yaml b/data/apache2.yaml
56index 5898835..346ce99 100644
57--- a/data/apache2.yaml
58+++ b/data/apache2.yaml
59@@ -4,7 +4,7 @@ repo: apache2
60 description: >
61 The Apache HTTP Server Project's goal is to build a secure, efficient and extensible HTTP server as standards-compliant open source software. The result has long been the number one web server on the Internet. Read more on the [apache2 website](https://httpd.apache.org/).
62 version: 2.4.46
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: