~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:2.4-20.04

Last commit made on 2022-02-14
Get this branch:
git clone -b 2.4-20.04 https://git.launchpad.net/~ubuntu-docker-images/ubuntu-docker-images/+git/apache2
Members of Ubuntu Docker Images can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

04ae722... by Athos Ribeiro

Revert "Pull base image from ECR"

This reverts commit b82dec6edb9b54b5b16d1357d4f76bc37f3eb0e2.

ECR anonymous pull rate limits will not support parallel multi-arch
builds

b82dec6... by Athos Ribeiro

Pull base image from ECR

We pull base images from ECR to leverage the better image pull rate
limits provided by Amazon in comparison to Docker Hub limits.

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

d39f165... by Sergio Durigan Junior

Remove documentation (migrated to templates.git)

406635e... by Bryce Harrington

Resync with Dockerfile from the 21.04 branch

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>

6845259... by Sergio Durigan Junior

Make HACKING.md a template as well

HACKING.md was ripe to become a template, so I went ahead and did it.

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

1a55fa6... by Sergio Durigan Junior

Don't use templates for things under examples

It doesn't make sense right now to use templates to generate the
deployment and the docker-compose files, because the only templateable
thing in them is the image namespace, and since that's not available
from the data file, we end up having to hard-code it into the files
anyway.

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

32bd794... by Sergio Durigan Junior

Implement templating (LP: #1905286)

This commit implements templating support for the image. It:

- Converts the .yml files under examples/ to templates.

- Moves the data from the templates.git repository here.

- Implements a Makefile that can be used to automatically generate the
  documentation (README.md and some files under the examples/
  directory).

- Regenerates everything using the templates.

- Updates HACKING.md with instructions on how to generate the
  documentation and how to hack on the templates.

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

b2f8bc4... by Lucas Kanashiro

Create manifest file to better track security updates (LP: #1905052)

The file /usr/share/rocks/dpkg.query is created inside the OCI image
with information about the installed packages.