Merge pull request #10256 from rifelpet/cfn-python-lint

Fix cloudformation lint job
kubernetes · Nov 18, 2020 · a0c8925 · a0c8925
2 parents 6afa302 + df1e301
commit a0c8925
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/hack/cfn-lint.Dockerfile b/hack/cfn-lint.Dockerfile
@@ -0,0 +1,4 @@
+FROM python:3.8-alpine
+ARG CFNLINT_VERSION
+RUN pip install "cfn-lint==${CFNLINT_VERSION}" pydot
+ENTRYPOINT ["cfn-lint"]
diff --git a/hack/verify-cloudformation.sh b/hack/verify-cloudformation.sh
@@ -27,12 +27,7 @@ IMAGE="cfn-python-lint:${TAG}"
 # https://github.com/aws-cloudformation/cfn-python-lint/issues/1025
 function docker_build() {
   echo "Building cfn-python-lint image"
-  TMP=$(mktemp -d)
-  git clone -q -b "${TAG}" https://github.com/aws-cloudformation/cfn-python-lint "${TMP}"
-  pushd "${TMP}"
-  docker build --tag "${IMAGE}" .
-  popd
-  rm -rf "${TMP}"
+  docker build --build-arg "CFNLINT_VERSION=${TAG}" --tag "${IMAGE}" - < "${KOPS_ROOT}/hack/cfn-lint.Dockerfile"
 }
 
 docker image inspect "${IMAGE}" >/dev/null 2>&1 || docker_build