Skip to content

Commit

Permalink
fix: fixed lint issues
Browse files Browse the repository at this point in the history
  • Loading branch information
anaik91 committed Oct 23, 2023
1 parent 631c48a commit 9f0b81f
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .shellcheckrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# relative paths and dynamic paths cannot be resolved by the tool
disable=SC1090,SC1091
disable=SC1090,SC1091,SC2044
33 changes: 15 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
FROM google/cloud-sdk:alpine

RUN apk add --update --no-cache py-pip openssh
RUN python3 -m pip install \
ENV HELM_BASE_URL="https://get.helm.sh"
ENV HELM_VERSION="3.13.1"
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
RUN apk add --update --no-cache py-pip==23.1.2-r0 openssh==9.3_p2-r0
RUN python3 -m pip install --no-cache-dir \
requests==2.25.1 \
jsonschema==4.19.1 \
jsonschema-specifications==2023.7.1 \
jmespath==1.0.1 \
kubernetes==27.2.0 \
ansible-core==2.15.5 \
ansible==8.5.0

RUN ansible-galaxy collection install ansible.posix
ENV HELM_BASE_URL="https://get.helm.sh"
ENV HELM_VERSION="3.13.1"

RUN case `uname -m` in \
ansible==8.5.0 && \
ansible-galaxy collection install ansible.posix && \
case $(uname -m) in \
x86_64) ARCH=amd64; ;; \
armv7l) ARCH=arm; ;; \
aarch64) ARCH=arm64; ;; \
ppc64le) ARCH=ppc64le; ;; \
s390x) ARCH=s390x; ;; \
*) echo "un-supported arch, exit ..."; exit 1; ;; \
esac && \
apk add --update --no-cache wget git curl bash yq && \
wget ${HELM_BASE_URL}/helm-v${HELM_VERSION}-linux-${ARCH}.tar.gz -O - | tar -xz && \
mv linux-${ARCH}/helm /usr/bin/helm && \
chmod +x /usr/bin/helm && \
rm -rf linux-${ARCH}

RUN gcloud components install kubectl
esac && \
apk add --update --no-cache wget==1.21.4-r0 git==2.40.1-r0 curl==8.4.0-r0 bash==5.2.15-r5 yq==4.33.3-r4 && \
wget --progress=dot:giga "${HELM_BASE_URL}/helm-v${HELM_VERSION}-linux-${ARCH}.tar.gz" -O - | tar -xz && \
mv "linux-${ARCH}/helm" /usr/bin/helm && \
chmod +x /usr/bin/helm && \
rm -rf "linux-${ARCH}" && \
gcloud components install kubectl
6 changes: 3 additions & 3 deletions copyright.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ SCRIPTPATH="$( cd "$(dirname "$0")" || exit >/dev/null 2>&1 ; pwd -P )"
COPYRIGHT_FILE="$SCRIPTPATH/copyright"


for i in $(find $SCRIPTPATH -name "*.$EXTENSION")
for i in $(find "$SCRIPTPATH" -name "*.$EXTENSION")
do
if ! grep -q Copyright $i
if ! grep -q Copyright "$i"
then
cat $COPYRIGHT_FILE $i >$i.new && mv $i.new $i
cat "$COPYRIGHT_FILE" "$i" >"$i".new && mv "$i".new "$i"
fi
done

0 comments on commit 9f0b81f

Please sign in to comment.