From 2b53dcab7aca24c2d545ec15b6d6469152fa7403 Mon Sep 17 00:00:00 2001 From: cytopia Date: Mon, 20 May 2019 09:17:20 +0200 Subject: [PATCH] Add tool: yq --- Dockerfiles/work/Dockerfile-5.2 | 3 +++ Dockerfiles/work/Dockerfile-5.3 | 3 +++ Dockerfiles/work/Dockerfile-5.4 | 3 +++ Dockerfiles/work/Dockerfile-5.5 | 3 +++ Dockerfiles/work/Dockerfile-5.6 | 3 +++ Dockerfiles/work/Dockerfile-7.0 | 3 +++ Dockerfiles/work/Dockerfile-7.1 | 3 +++ Dockerfiles/work/Dockerfile-7.2 | 3 +++ Dockerfiles/work/Dockerfile-7.3 | 3 +++ Dockerfiles/work/Dockerfile-7.4 | 3 +++ Dockerfiles/work/Dockerfile-8.0 | 3 +++ build/ansible/group_vars/all/work.yml | 4 ++++ 12 files changed, 37 insertions(+) diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index aed8b2b..a9add47 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -343,6 +343,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -412,6 +414,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index ce92e40..1f59c2c 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -385,6 +385,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -461,6 +463,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index e306ec8..eb80c14 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -414,6 +414,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -494,6 +496,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index bc6d601..b36fa75 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -426,6 +426,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -510,6 +512,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index e775683..ea1098d 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -438,6 +438,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -523,6 +525,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index b1155ab..2575baf 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -438,6 +438,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -523,6 +525,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 1795174..fe97fb3 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -438,6 +438,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -523,6 +525,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 83188c5..175bcc2 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -438,6 +438,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -523,6 +525,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index d2fedfa..af3dbf7 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -427,6 +427,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -511,6 +513,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 3b397c4..6111f0f 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -423,6 +423,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -506,6 +508,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 157fa03..e1328bb 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -356,6 +356,8 @@ RUN set -x \ && pip install --no-cache-dir --force-reinstall ansible \ # yamllint && pip install --no-cache-dir --force-reinstall yamllint \ +# yq + && pip install --no-cache-dir --force-reinstall yq \ \ && rm -rf /root/.cache/pip \ && rm -rf /tmp/* \ @@ -430,6 +432,7 @@ RUN set -x \ \ && ansible --version | grep -E '^ansible [.0-9]+$' \ && yamllint --version 2>&1 | grep -E '[.0-9]+' \ + && yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' \ \ && ng version 2>&1 | grep -iE 'Angular CLI:\s*[.0-9]+' \ && eslint -v | grep -E '[.0-9]+' \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index e20b9f6..f950888 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -74,6 +74,7 @@ npm_enabled: pip_enabled: - ansible - yamllint + - yq # ------------------------------------------------------------------------------------------------- @@ -331,6 +332,9 @@ pip_available: yamllint: name: yamllint check: yamllint --version 2>&1 | grep -E '[.0-9]+' + yq: + name: yq + check: yq --version 2>&1 | grep -E '^yq\s+[.0-9]+$' # -------------------------------------------------------------------------------------------------