diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-11 09:21:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-11 09:21:57 +0000 |
| commit | 26fd382f176adbc104850f565df238253d8f9fc7 (patch) | |
| tree | cb95f603667c6bc52f47cfe9612d0c28b0cf2ef1 /docker/skydive | |
| parent | 24c4da0218714ccc67c8b60b74eb37a414a70516 (diff) | |
| parent | a1510870e86f9cde6537ac2cbbfb055337843c90 (diff) | |
| download | kolla-26fd382f176adbc104850f565df238253d8f9fc7.tar.gz kolla-26fd382f176adbc104850f565df238253d8f9fc7.zip | |
Merge "drop infra_image_prefix"
Diffstat (limited to 'docker/skydive')
| -rw-r--r-- | docker/skydive/skydive-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/skydive/skydive-analyzer/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/skydive/skydive-base/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/skydive/skydive-agent/Dockerfile.j2 b/docker/skydive/skydive-agent/Dockerfile.j2 index 50c966461..72cf1b21f 100644 --- a/docker/skydive/skydive-agent/Dockerfile.j2 +++ b/docker/skydive/skydive-agent/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}skydive-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/skydive/skydive-analyzer/Dockerfile.j2 b/docker/skydive/skydive-analyzer/Dockerfile.j2 index 49a0fc182..de265af51 100644 --- a/docker/skydive/skydive-analyzer/Dockerfile.j2 +++ b/docker/skydive/skydive-analyzer/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}skydive-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 index 5342f7e99..22c7f6c7e 100644 --- a/docker/skydive/skydive-base/Dockerfile.j2 +++ b/docker/skydive/skydive-base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} {% block labels %} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} |
