openstack/tripleo-ansible
Code Issues Proposed changes

Merge "Container build: define ARGs after FROM line"

Browse Source
This commit is contained in:
Zuul 2022-09-23 17:15:56 +00:00 committed by Gerrit Code Review
commit 5565581993
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_ansible/roles/tripleo_container_image_build/templates/Containerfile.j2
View File

@ -13,10 +13,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
FROM {{ tcib_from }}
{% for key, value in tcib_args.items() %} {% for key, value in tcib_args.items() %}
ARG {{ key }}={{ value | to_json }} ARG {{ key }}={{ value | to_json }}
{% endfor %} {% endfor %}
FROM {{ tcib_from }}
{% for key, value in tcib_labels.items() %} {% for key, value in tcib_labels.items() %}
LABEL {{ key }}={{ value | to_json }} LABEL {{ key }}={{ value | to_json }}
{% endfor %} {% endfor %}