diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2026-06-18 17:16:08 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2026-06-24 15:00:26 +0200 |
| commit | a1a3fdc1b54baf62f234ddc9dac4906e30eb5d11 (patch) | |
| tree | a4f88789a9ac039db65f9491751c75ca59cebb74 /docker/cyborg | |
| parent | a437f0bd5f406bf1f82dfdf05c4dac16c02573ff (diff) | |
| download | kolla-a1a3fdc1b54baf62f234ddc9dac4906e30eb5d11.tar.gz kolla-a1a3fdc1b54baf62f234ddc9dac4906e30eb5d11.zip | |
kolla-build: fix build-date LABEL invalidating Docker layer cache
The build-date label was rendered into a LABEL instruction on line
3 of every Dockerfile template, immediately after FROM.
Because Docker invalidates the cache for a changed instruction and
all subsequent layers, a date change caused a full rebuild of every
image on each new calendar day, even when nothing else had changed.
Fix this by removing build-date from the Dockerfile templates and
applying it as a --label argument at build time via image.labels.
Labels passed on the build command line are not part of the
Dockerfile cache key, so the date is still recorded in the image
metadata without affecting layer caching.
Change-Id: I8ef0d85bab1a999a4d09f7cbf0c088ca00fdcf77
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/cyborg')
| -rw-r--r-- | docker/cyborg/cyborg-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cyborg/cyborg-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cyborg/cyborg-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/cyborg/cyborg-conductor/Dockerfile.j2 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docker/cyborg/cyborg-agent/Dockerfile.j2 b/docker/cyborg/cyborg-agent/Dockerfile.j2 index 222be13dc..dfc1adc0b 100644 --- a/docker/cyborg/cyborg-agent/Dockerfile.j2 +++ b/docker/cyborg/cyborg-agent/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cyborg_agent_header %}{% endblock %} diff --git a/docker/cyborg/cyborg-api/Dockerfile.j2 b/docker/cyborg/cyborg-api/Dockerfile.j2 index f087e572d..d67cdeb28 100644 --- a/docker/cyborg/cyborg-api/Dockerfile.j2 +++ b/docker/cyborg/cyborg-api/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cyborg_api_header %}{% endblock %} diff --git a/docker/cyborg/cyborg-base/Dockerfile.j2 b/docker/cyborg/cyborg-base/Dockerfile.j2 index a0b3a4566..c3f3e602a 100644 --- a/docker/cyborg/cyborg-base/Dockerfile.j2 +++ b/docker/cyborg/cyborg-base/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cyborg_header %}{% endblock %} diff --git a/docker/cyborg/cyborg-conductor/Dockerfile.j2 b/docker/cyborg/cyborg-conductor/Dockerfile.j2 index aeff1c7ed..d17d1cacd 100644 --- a/docker/cyborg/cyborg-conductor/Dockerfile.j2 +++ b/docker/cyborg/cyborg-conductor/Dockerfile.j2 @@ -1,6 +1,6 @@ FROM {{ namespace }}/{{ image_prefix }}cyborg-base:{{ tag }} {% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" {% endblock %} {% block cyborg_conductor_header %}{% endblock %} |