Merge pull request #20 from tnozicka/fix-xq

Fix yq instalation
scylladb · Jun 22, 2023 · 3f0054e · 3f0054e
2 parents fb8a581 + d114393
commit 3f0054e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/golang/1.18/Dockerfile b/golang/1.18/Dockerfile
@@ -12,4 +12,5 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     /tmp/download-file.sh https://go.dev/dl/go1.18.10.linux-amd64.tar.gz '2f1986ae1a95f1e2e735abdf2240770210482215c03293322ce9d3cb7b5c7b2904943827154d048771b00fa95d9b5e659d8077873dea0352d7d8cca8880ce204' | tar -C /usr/local -xzf - && \
     go install github.com/mikefarah/yq/v4@v4.34.1 && \
+    mv "$( go env GOPATH )/bin/yq" /usr/local/bin/ && \
     rm -rf /tmp/*
diff --git a/golang/1.19/Dockerfile b/golang/1.19/Dockerfile
@@ -12,4 +12,5 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     /tmp/download-file.sh https://go.dev/dl/go1.19.8.linux-amd64.tar.gz '469ff06d6b86d201bcf01abbb6eed6897091afed2fd47726d90589424e4abd9a561cc24c8c2a5ce3a172a8905bfcdb35e32aef4a72ad380584f549fd20cb1d42' | tar -C /usr/local -xzf - && \
     go install github.com/mikefarah/yq/v4@v4.34.1 && \
+    mv "$( go env GOPATH )/bin/yq" /usr/local/bin/ && \
     rm -rf /tmp/*
diff --git a/golang/1.20/Dockerfile b/golang/1.20/Dockerfile
@@ -12,4 +12,5 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     /tmp/download-file.sh https://go.dev/dl/go1.20.3.linux-amd64.tar.gz 'b6e74b9b0bf03371e746b1b579235665a692425847b685f1a862345a5858329ec24e184db4ddbd2fd617e22df4c48d3e95fe7ba79b19d737c6d6afa63a129773' | tar -C /usr/local -xzf - && \
     go install github.com/mikefarah/yq/v4@v4.34.1 && \
+    mv "$( go env GOPATH )/bin/yq" /usr/local/bin/ && \
     rm -rf /tmp/*
diff --git a/kube-tools/latest/Dockerfile b/kube-tools/latest/Dockerfile
@@ -4,6 +4,7 @@ RUN set -euExo pipefail && shopt -s inherit_errexit && \
     dnf install -y rsync git make tar gzip golang && \
     dnf clean all && \
     go install github.com/mikefarah/yq/v4@v4.34.1 && \
+    mv "$( go env GOPATH )/bin/yq" /usr/local/bin/ && \
     mkdir -p /go/src/k8s.io/ && \
     cd /go/src/k8s.io/ && \
     git clone --depth=1 --branch v1.27.3 https://github.com/kubernetes/kubernetes.git && \