~cjwatson/+git/apache2-oci:2.4-21.04

Last commit made on 2021-03-02
Get this branch:
git clone -b 2.4-21.04 https://git.launchpad.net/~cjwatson/+git/apache2-oci
Only Colin Watson can upload to this branch. If you are Colin Watson please log in for upload directions.

Branch merges

Branch information

Name:
2.4-21.04
Repository:
lp:~cjwatson/+git/apache2-oci

Recent commits

ff2d1e0... by Sergio Durigan Junior

Update README.md and HACKING.md

Signed-off-by: Sergio Durigan Junior <email address hidden>

b0c337e... by Bryce Harrington

Perform a full-upgrade on container before installing on it

dfdbc42... by Bryce Harrington

Document the different steps with comments

982eff3... by Bryce Harrington

Cleanup by auto-removing unneeded packages

de4a837... by Bryce Harrington

Reformat apt-get line for consistency with other Dockerfiles

f8eed6d... by Bryce Harrington

Use consistent line separations

Since set -eux is in use, it's not necessary to chain commands with &&.
Semi-colons will facilitate debugging and prevent mistakes with more
complex command logic.

c94f76a... by Bryce Harrington

Cleanup old commented out logic

This can be obtained from the Debian branch or from git history, and
seems not applicable to the current Ubuntu Docker image needs, so just
remove it for now.

5c4e0fa... by Bryce Harrington

Update Dockerfile for hirsute

a00ddbe... by Sergio Durigan Junior

Improve Makefile rule to wget the templates

With this new rule, we always perform a wget on everything under the
templates/ directory (from the templates.git repo).

Signed-off-by: Sergio Durigan Junior <email address hidden>

55ca1b9... by Sergio Durigan Junior

Fix thinko on Makefile

We have to invoke 'rm' with '-r' because we're now removing the
templates dir.

Signed-off-by: Sergio Durigan Junior <email address hidden>