From c0f9ced6f2788a86c46b3214a6f3827c6a0dd122 Mon Sep 17 00:00:00 2001 From: Gaetan Trellu Date: Wed, 29 May 2019 08:59:05 -0400 Subject: Use the default policy.json for Qinling To avoid complexity and possible issue during the Qinling usage we should build the Qinling Docker images with the policy.json file. The reason why is because Qinling doesn't have default policies. Change-Id: I13f64fcbfb3150efcb94af267f463eaddb11621d Closes-Bug: #1830900 Implements: blueprint qinling-support --- docker/qinling/qinling-base/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/qinling/qinling-base/Dockerfile.j2 b/docker/qinling/qinling-base/Dockerfile.j2 index 307fffa25..862296d85 100644 --- a/docker/qinling/qinling-base/Dockerfile.j2 +++ b/docker/qinling/qinling-base/Dockerfile.j2 @@ -23,7 +23,7 @@ ADD qinling-base-archive /qinling-base-source RUN ln -s qinling-base-source/* qinling \ && {{ macros.install_pip(qinling_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/qinling \ - && cp -r /qinling/etc/* /etc/qinling/ \ + && cp -r /qinling/etc/policy.json.sample /etc/qinling/policy.json \ && chown -R qinling: /etc/qinling {% endif %} -- cgit v1.2.3