~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:edge

Last commit made on 2021-09-29
Get this branch:
git clone -b edge 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

76fd344... by Sergio Durigan Junior

Cleaning up 'edge' branch

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

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>

Merged branch ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:improve-template
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.

Merged branch ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:manifest
93d1f63... by Sergio Durigan Junior

s/squeakywheel/ubuntu/g

We're releasing the images under the 'ubuntu' namespace.

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

2ffc2c2... by Sergio Durigan Junior

Update project URL

We've moved from https://launchpad.net/ubuntu-server-oci to
https://launchpad.net/ubuntu-docker-images, so we need to update all
READMEs accordingly.

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

0cad654... by Sergio Durigan Junior

Set "TZ=UTC" (LP: #1904018)

This commit sets the environment variable TZ to the sane value "UTC".
In order to do that, we:

1) Set "ENV TZ UTC" at the beginning of the image declaration (usually
   right below the "FROM" statement).

2) Install the "tzdata" package, which is needed in order to make TZ
   work properly.

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

Merged branch ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:set-tz-utc