From acea0ac0fe524ed13d8ad958966a79bf983390a2 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Aug 2020 11:09:19 +0200 Subject: [PATCH] Fixed Ansible installation --- Dockerfiles/work/Dockerfile-5.2 | 6 +++--- Dockerfiles/work/Dockerfile-5.3 | 6 +++--- Dockerfiles/work/Dockerfile-5.4 | 6 +++--- Dockerfiles/work/Dockerfile-5.5 | 6 +++--- Dockerfiles/work/Dockerfile-5.6 | 6 +++--- Dockerfiles/work/Dockerfile-7.0 | 6 +++--- Dockerfiles/work/Dockerfile-7.1 | 6 +++--- Dockerfiles/work/Dockerfile-7.2 | 6 +++--- Dockerfiles/work/Dockerfile-7.3 | 6 +++--- Dockerfiles/work/Dockerfile-7.4 | 6 +++--- Dockerfiles/work/Dockerfile-8.0 | 6 +++--- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 6 +++--- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index c2d5d4c..b79b81b 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -384,13 +384,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 8f979ff..1dd427a 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -440,13 +440,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index aa56137..20b2b7b 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -474,13 +474,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 9903461..6c51c7f 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -491,13 +491,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index ddb8b65..a7b8c9f 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -502,13 +502,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index dd7ec1b..bc3a1ab 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -502,13 +502,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 10c7b74..c5e20ea 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -502,13 +502,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 1b97bc6..6dafd86 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -503,13 +503,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 2f8336f..bab8af2 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -503,13 +503,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index d430729..6fb009b 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -498,13 +498,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 8f901ec..d481e12 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -403,13 +403,13 @@ RUN set -eux \ ### RUN set -eux \ # -------------------- ansible -------------------- - && pip install --no-cache-dir --force-reinstall ansible \ + && pip install --no-cache-dir --force-reinstall ansible || true \ \ # -------------------- yamllint -------------------- - && pip install --no-cache-dir --force-reinstall yamllint \ + && pip install --no-cache-dir --force-reinstall yamllint || true \ \ # -------------------- yq -------------------- - && pip install --no-cache-dir --force-reinstall yq \ + && pip install --no-cache-dir --force-reinstall yq || true \ \ \ && rm -rf /root/.cache/pip \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 0cba6b0..28ea9db 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -384,13 +384,13 @@ RUN set -eux \ {%- endif -%} {#- Version specific gem version available? -#} {%- if php_version in pip_available[tool] and 'version' in pip_available[tool][php_version] -%} - {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool][php_version]['version'] }} \ + {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool][php_version]['version'] }} || true \ {#- Generic gem version available? -#} {%- elif 'all' in pip_available[tool] and 'version' in pip_available[tool]['all'] -%} - {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool]['all']['version'] }} \ + {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }}=={{ pip_available[tool]['all']['version'] }} || true \ {#- No version info available -#} {%- else -%} - {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }} \ + {{ "\n\t" }}&& pip install --no-cache-dir --force-reinstall {{ pip_available[tool]['name'] }} || true \ {%- endif -%} {#- Fail fast version -#} {%- if build_fail_fast -%}