diff options
| -rw-r--r-- | docker/base/grafana.repo | 3 | ||||
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/base/grafana.repo b/docker/base/grafana.repo index dc8d30b44..b21cd166b 100644 --- a/docker/base/grafana.repo +++ b/docker/base/grafana.repo @@ -3,5 +3,6 @@ name=grafana baseurl=https://packagecloud.io/grafana/stable/el/7/$basearch repo_gpgcheck=1 enabled=1 -gpgcheck=1 +# TODO(jeffrey4l), enable gpg check when grafana gpgkey is OK. +gpgcheck=0 gpgkey=https://packagecloud.io/gpg.key https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 43091fc13..796b06318 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -13,7 +13,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' && /bin/fa {% elif install_type == 'source' %} -ENV ANSIBLE_FROM_PYPI True +ENV VENV /var/lib/kolla/venv ADD bifrost-base-archive /bifrost-base-source COPY build_arg.yml /tmp/build_arg.yml |