Skip to content

Commit

Permalink
Patch level and Bugfix level version updates (#34)
Browse files Browse the repository at this point in the history
* Update SonarScanner

* Udpate ASDF from 0.8.0 to 0.8.1

* Update Helm Diff from 3.1.2 to 3.1.3

* Update Shellcheck to 0.7.2

* Use newer version in Taskfile.yml

* Removed stderr redirection on gocritic unit test

Co-authored-by: Justin Shaw <justin.shaw@saic.com>
  • Loading branch information
saic-statonb and shawju authored Oct 19, 2021
1 parent 2f5c286 commit 927ed44
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# https://taskfile.dev

version: "2"
version: "3"

vars:
DOCKER_REGISTRY: docker.io
Expand Down
2 changes: 1 addition & 1 deletion spec/gocritic_spec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Describe "printVersion()"
printVersion() {
cd $(find / -name "go-critic@*" -type d 2> /dev/null | head -n1); cd checkers; gocritic version
cd $(find / -name "go-critic@*" -type d | head -n1); cd checkers; gocritic version
}

It "validates tool is installed by checking version"
Expand Down
8 changes: 4 additions & 4 deletions src/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ RUN wget -O /root/task.tar.gz --progress=dot:giga "https://github.com/go-task/ta
&& rm -rf /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???*

# Install shellcheck. Get versions from https://github.com/koalaman/shellcheck/releases
ARG SHELLCHECK_VERSION="0.7.1"
ARG SHELLCHECK_VERSION="0.7.2"
ENV SHELLCHECK_VERSION=${SHELLCHECK_VERSION}
# hadolint ignore=DL3003
RUN wget -O /root/shellcheck.tar.xz --progress=dot:giga "https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/shellcheck-v${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" \
Expand Down Expand Up @@ -159,7 +159,7 @@ USER anvil
WORKDIR /home/anvil

# Install asdf. Get versions from https://github.com/asdf-vm/asdf/releases
ARG ASDF_VERSION="0.8.0"
ARG ASDF_VERSION="0.8.1"
ENV ASDF_VERSION=${ASDF_VERSION}
# hadolint ignore=SC2016
RUN git clone --branch "v${ASDF_VERSION}" --depth 1 https://github.com/asdf-vm/asdf.git "${HOME}/.asdf" \
Expand Down Expand Up @@ -244,7 +244,7 @@ RUN asdf plugin add helm \
&& rm -rf /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???*

# Install helm-diff plugin. Get versions from https://github.com/databus23/helm-diff/releases
ARG HELM_DIFF_VERSION="3.1.2"
ARG HELM_DIFF_VERSION="3.1.3"
ENV HELM_DIFF_VERSION=${HELM_DIFF_VERSION}
RUN helm plugin install https://github.com/databus23/helm-diff --version "${HELM_DIFF_VERSION}" \
&& asdf reshim helm \
Expand Down Expand Up @@ -359,7 +359,7 @@ RUN go get -u github.com/go-critic/go-critic/cmd/gocritic \
&& rm -rf /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???*

# Install sonarscanner. Get versions using 'asdf list all sonarscanner'
ARG SONARSCANNER_VERSION="4.6.0.2311"
ARG SONARSCANNER_VERSION="4.6.2.2472"
ENV SONARSCANNER_VERSION=${SONARSCANNER_VERSION}
RUN asdf plugin-add sonarscanner https://github.com/virtualstaticvoid/asdf-sonarscanner.git \
&& asdf install sonarscanner "${SONARSCANNER_VERSION}" \
Expand Down

0 comments on commit 927ed44

Please sign in to comment.