Merge branch 'enhancement/15-shellcheck' into 'master'

Add shellcheck

Closes #6 and #5

See merge request pmpl/sonar-scanner-cli-image!3

.devcontainer/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update \
     && apt-get -y install --no-install-recommends git procps lsb-release \
     #
     # Install project-specific tools
-    && apt-get -y install --no-install-recommends ca-certificates shellcheck wget \
+    && apt-get -y install --no-install-recommends ca-certificates wget \
     #
     # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
     && groupadd --gid $USER_GID $USERNAME \
@@ -40,5 +40,10 @@ ARG HADOLINT_VERSION=v1.17.1
 RUN wget -O /usr/local/bin/hadolint https://github.com/hadolint/hadolint/releases/download/${HADOLINT_VERSION}/hadolint-Linux-x86_64 \
     && chmod +x /usr/local/bin/hadolint
 
+# Configure shellcheck
+ARG SHELLCHECK_VERSION=latest
+RUN wget -O /usr/local/bin/shellcheck https://shellcheck.storage.googleapis.com/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz \
+    && chmod +x /usr/local/bin/shellcheck
+
 # Switch back to dialog for any ad-hoc use of apt-get
 ENV DEBIAN_FRONTEND=''

.devcontainer/devcontainer.json

@@ -28,6 +28,6 @@
 	"extensions": [
 		"exiasr.hadolint",
 		"ms-azuretools.vscode-docker",
-		"timonwong.shellcheck",
-	],
+		"timonwong.shellcheck"
+	]
 }
\ No newline at end of file

Dockerfile

@@ -19,7 +19,7 @@ RUN apt-get update \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Sonar Scanner CLI
+# Configure Sonar Scanner CLI
 ARG SONAR_SCANNER_CLI_VERSION=4.0.0.1744
 RUN wget -O sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_CLI_VERSION-linux.zip \
     && unzip sonar-scanner-cli.zip -d /opt \
@@ -27,6 +27,11 @@ RUN wget -O sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/
     && chmod +x /opt/sonar-scanner-$SONAR_SCANNER_CLI_VERSION-linux/bin/sonar-scanner \
     && ln -s /opt/sonar-scanner-$SONAR_SCANNER_CLI_VERSION-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner
 
+# Configure shellcheck
+ARG SHELLCHECK_VERSION=latest
+RUN wget -O /usr/local/bin/shellcheck https://shellcheck.storage.googleapis.com/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz \
+    && chmod +x /usr/local/bin/shellcheck
+
 # Switch back to dialog for any ad-hoc use of apt-get
 ENV DEBIAN_FRONTEND=''
 
@@ -43,7 +48,7 @@ CMD ["/bin/bash"]
 ## It is also possible to pass other metadata values via build arguments.
 ARG IMAGE_CREATED=""
 ARG IMAGE_SOURCE="https://gitlab.cs.ui.ac.id/pmpl/sonar-scanner-cli-image"
-ARG IMAGE_VERSION=""
+ARG IMAGE_VERSION=${SONAR_SCANNER_CLI_VERSION}
 ARG IMAGE_REVISION=""
 ARG IMAGE_VENDOR="Faculty of Computer Science Universitas Indonesia"
 ARG IMAGE_TITLE="Sonar Scanner CLI Image"

build.sh

@@ -24,19 +24,12 @@ if ! [ -n "$1" ]; then
     exit 1
 fi
 
-if ! [ -n "$2" ]; then
-    echo "Error: missing 2nd argument of $0, i.e. version of the container image." >&2
-    exit 1
-fi
-
 IMAGE_NAMESPACE="$1"
-IMAGE_VERSION="$2"
 
 docker build \
     --build-arg=IMAGE_CREATED="$(date --utc --rfc-3339=seconds)" \
-    --build-arg=IMAGE_VERSION="${IMAGE_VERSION}" \
     --build-arg=IMAGE_REVISION="$(git show --pretty=oneline | tac | tail -n 1 | awk '{print $1}')" \
-    --tag="${IMAGE_NAMESPACE}/sonar-scanner-cli:${IMAGE_VERSION}" \
+    --tag="${IMAGE_NAMESPACE}/sonar-scanner-cli:latest" \
     .
 
 exit 0