update yq version

icodex · Nov 17, 2021 · a17a7f8 · a17a7f8
1 parent 268d7c5
commit a17a7f8
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 10 deletions.
diff --git a/build/Dockerfile.os.centos7 b/build/Dockerfile.os.centos7
@@ -8,7 +8,7 @@ RUN yum install -q -y ${BUILD_TOOLS} \
 
 WORKDIR /centos/$OS_VERSION/os
 COPY packages.yaml .
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
+COPY --from=mikefarah/yq:4.14.2 /usr/bin/yq /usr/bin/yq
 RUN yq eval '.common[],.yum[],.centos7[],.kubespray.common[],.kubespray.yum[]' packages.yaml > packages.list
 
 RUN ARCH=$(uname -m) \

diff --git a/build/Dockerfile.os.centos8 b/build/Dockerfile.os.centos8
@@ -10,7 +10,7 @@ RUN ARCH=$(uname -m) \
 
 WORKDIR /centos/$OS_VERSION/os
 COPY packages.yaml .
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
+COPY --from=mikefarah/yq:4.14.2 /usr/bin/yq /usr/bin/yq
 RUN yq eval '.common[],.yum[],.centos8[],.kubespray.common[],.kubespray.yum[]' packages.yaml > packages.list
 
 RUN ARCH=$(uname -m) \

diff --git a/build/Dockerfile.os.debian10 b/build/Dockerfile.os.debian10
@@ -13,8 +13,7 @@ RUN ARCH=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') \
 WORKDIR /debian/${TARGETARCH}
 COPY packages.yaml .
 
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
+COPY --from=mikefarah/yq:4.14.2 /usr/bin/yq /usr/bin/yq
 RUN yq eval '.common[],.apt[],.kubespray.common[],.kubespray.apt[],.debian10[]' packages.yaml > packages.list \
     && dpkg --get-selections | grep -v deinstall | cut -f1 | cut -d ':' -f1 >> packages.list \
     && sort -u packages.list | xargs apt-get install --reinstall --print-uris | awk -F "'" '{print $2}' | grep -v '^$' | sort -u > packages.urls

diff --git a/build/Dockerfile.os.debian9 b/build/Dockerfile.os.debian9
@@ -13,8 +13,7 @@ RUN ARCH=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') \
 WORKDIR /debian/${TARGETARCH}
 COPY packages.yaml .
 
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
+COPY --from=mikefarah/yq:4.14.2 /usr/bin/yq /usr/bin/yq
 RUN yq eval '.common[],.apt[],.kubespray.common[],.kubespray.apt[],.debian9[]' packages.yaml > packages.list \
     && dpkg --get-selections | grep -v deinstall | cut -f1 | cut -d ':' -f1 >> packages.list \
     && sort -u packages.list | xargs apt-get install --reinstall --print-uris | awk -F "'" '{print $2}' | grep -v '^$' | sort -u > packages.urls

diff --git a/build/Dockerfile.os.ubuntu1804 b/build/Dockerfile.os.ubuntu1804
@@ -13,7 +13,7 @@ RUN ARCH=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') \
 WORKDIR /ubuntu/${TARGETARCH}
 COPY packages.yaml .
 
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
+COPY --from=mikefarah/yq:4.14.2 /usr/bin/yq /usr/bin/yq
 RUN yq eval '.common[],.apt[],.kubespray.common[],.kubespray.apt[],.ubuntu[]' packages.yaml > packages.list \
     && dpkg --get-selections | grep -v deinstall | cut -f1 | cut -d ':' -f1 >> packages.list \
     && sort -u packages.list | xargs apt-get install --reinstall --print-uris | awk -F "'" '{print $2}' | grep -v '^$' | sort -u > packages.urls

diff --git a/build/Dockerfile.os.ubuntu2004 b/build/Dockerfile.os.ubuntu2004
@@ -13,7 +13,7 @@ RUN ARCH=$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/') \
 WORKDIR /ubuntu/${TARGETARCH}
 COPY packages.yaml .
 
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
+COPY --from=mikefarah/yq:4.14.2 /usr/bin/yq /usr/bin/yq
 RUN yq eval '.common[],.apt[],.kubespray.common[],.kubespray.apt[],.ubuntu[]' packages.yaml > packages.list \
     && dpkg --get-selections | grep -v deinstall | cut -f1 | cut -d ':' -f1 >> packages.list \
     && sort -u packages.list | xargs apt-get install --reinstall --print-uris | awk -F "'" '{print $2}' | grep -v '^$' | sort -u > packages.urls

diff --git a/build/base/Dockerfile.fedora33 b/build/base/Dockerfile.fedora33
@@ -8,4 +8,4 @@ RUN dnf install -q -y ${BUILD_TOOLS} \
     && dnf makecache -q
 
 WORKDIR /fedora/$OS_VERSION/os
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
+COPY --from=mikefarah/yq:4.14.2 /usr/bin/yq /usr/bin/yq
diff --git a/build/base/Dockerfile.fedora34 b/build/base/Dockerfile.fedora34
@@ -7,4 +7,4 @@ RUN dnf install -q -y ${BUILD_TOOLS} \
     && dnf makecache -q
 
 WORKDIR /fedora/$OS_VERSION/os
-COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
+COPY --from=mikefarah/yq:4.14.2 /usr/bin/yq /usr/bin/yq