Merge pull request #31 from linuxbandit/feature/hadolint-reviewdog

Feature/hadolint reviewdog
gadiener · Apr 30, 2020 · f27e508 · f27e508
2 parents c3491c6 + 7e42a33
commit f27e508
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 33 deletions.
diff --git a/bucket-production.yml b/bucket-production.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/bucket-quality.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/bucket-quality.yml'
 
 deploy:production:
   extends: .deploy

diff --git a/bucket-quality.yml b/bucket-quality.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/bucket.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/bucket.yml'
 
 deploy:quality:
   extends: .deploy

diff --git a/cloudrun-production.yml b/cloudrun-production.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/cloudrun-quality.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/cloudrun-quality.yml'
 
 deploy:production:
   extends: deploy:quality

diff --git a/cloudrun-quality.yml b/cloudrun-quality.yml
@@ -1,6 +1,6 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/docker.yml'
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/cloudrun.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/docker.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/cloudrun.yml'
 
 deploy:quality:
   extends: .cloudrun:deploy

diff --git a/docker.yml b/docker.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/docker.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/docker.yml'
 
 build:
   stage: build

diff --git a/helm-multiregion.yml b/helm-multiregion.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/helm-quality.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/helm-quality.yml'
 
 # EUROPE
 deploy:production:europe:helm:

diff --git a/helm-quality.yml b/helm-quality.yml
@@ -1,6 +1,6 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/docker.yml'
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/helm.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/docker.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/helm.yml'
 
 deploy:quality:helm:
   variables:

diff --git a/helm-regional.yml b/helm-regional.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/helm-quality.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/helm-quality.yml'
 
 deploy:production:helm:
   extends: .deploy:production:helm

diff --git a/kubernetes-multiregion.yml b/kubernetes-multiregion.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/kubernetes-quality.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/kubernetes-quality.yml'
 
 # EUROPE
 deploy:production:europe:image:

diff --git a/kubernetes-quality.yml b/kubernetes-quality.yml
@@ -1,6 +1,6 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/docker.yml'
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/kubernetes.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/docker.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/kubernetes.yml'
 
 deploy:quality:image:
   variables:

diff --git a/kubernetes-regional.yml b/kubernetes-regional.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/kubernetes-quality.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/kubernetes-quality.yml'
 
 deploy:production:image:
   extends: .deploy:production:image

diff --git a/kubernetes-task-production.yml b/kubernetes-task-production.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/kubernetes-task-quality.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/kubernetes-task-quality.yml'
 
 task:production:
   extends: .task

diff --git a/kubernetes-task-quality.yml b/kubernetes-task-quality.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/kubernetes-task.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/kubernetes-task.yml'
 
 task:quality:
   extends: .task

diff --git a/lint-docker.yml b/lint-docker.yml
@@ -1,11 +1,11 @@
 lint:docker:
   stage: lint
-  image: hadolint/hadolint:v1.17.5-debian
+  image: linuxbandit/hadolint-reviewdog:v1.0.0
   script:
     - |
 
       COMMAND_TO_RUN="hadolint"
-      COMMAND_TO_RUN+=( --trusted-registry registry.my-company.io )
+      COMMAND_TO_RUN+=( --trusted-registry "docker.io" --trusted-registry "${CI_REGISTRY}" )
 
       if [[ -n "${IGNORE_DOCKER_LINT}" ]]; then
         IGNORE_DOCKER_LINT=( DL3012 )
@@ -14,26 +14,47 @@ lint:docker:
         COMMAND_TO_RUN+=( --ignore "${ign}" )
       done
 
-      FINAL_COMMAND=${COMMAND_TO_RUN}
+      # Find docker files in a way similar to docker.yml
 
-      if [[ -f "Dockerfile" ]]; then
-        FINAL_COMMAND+=( ./Dockerfile )
+      if [ -z "${IMAGES}" ]; then
+        COMMAND_TO_RUN+=( ./Dockerfile )
       else
-        FINAL_COMMAND+=( ./docker/app/Dockerfile )
-        EXTRA_COMMAND+=( ${COMMAND_TO_RUN} ./docker/nginx/Dockerfile )
+        if [ -z "${DOCKERFILES_DIR}" ]; then
+          DOCKERFILES_DIR=docker
+        fi
+
+        for image in ${IMAGES[@]}; do
+          COMMAND_TO_RUN+=( ./"${DOCKERFILES_DIR}/${image}"/Dockerfile )
+        done
       fi
 
       echo
       echo "-> Linting Dockerfile:"
       echo
 
-      "${FINAL_COMMAND[@]}"
-      if [[ ! -z "${EXTRA_COMMAND}" ]]; then
+      if [ "${ENABLE_REVIEWDOG}" = "1" ]; then
+
         echo
-        echo "-> Linting support Dockerfile:"
+        echo "-> Enabled Review Dog!"
         echo
-        "${EXTRA_COMMAND[@]}"
+
+        if [ -z "${REVIEWDOG_GITLAB_API_TOKEN}" ]; then
+          echo
+          echo "-> [WARNING] Missing 'REVIEWDOG_GITLAB_API_TOKEN' variable!"
+          echo
+          exit 1
+        fi
+
+        if [ -z "${REVIEWDOG_LEVEL}" ]; then
+          REVIEWDOG_LEVEL="warning"
+        fi
+
+        "${COMMAND_TO_RUN[@]}" | reviewdog -name="Hadolint linter" \
+          -efm="%f:%l: %m" -diff="git diff master" -reporter=gitlab-mr-discussion -level="${INPUT_LEVEL}"
+
       else
+        "${COMMAND_TO_RUN[@]}"
+      fi
 
       echo
       echo "-> Dockerfile(s) checked!"

diff --git a/serverless-multiregion.yml b/serverless-multiregion.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/serverless.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/serverless.yml'
 
 # EUROPE
 deploy:production:europe:

diff --git a/serverless-quality.yml b/serverless-quality.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/serverless.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/serverless.yml'
 
 deploy:quality:
   extends: .serverless:deploy

diff --git a/serverless-regional.yml b/serverless-regional.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/serverless.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/serverless.yml'
 
 deploy:production:
   extends: .serverless:deploy

diff --git a/ssh-production.yml b/ssh-production.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/ssh-quality.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/ssh-quality.yml'
 
 ssh:production:
   extends: .ssh:exec

diff --git a/ssh-quality.yml b/ssh-quality.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/ssh.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/ssh.yml'
 
 ssh:quality:
   extends: .ssh:exec

diff --git a/test-unit.yml b/test-unit.yml
@@ -1,5 +1,5 @@
 include:
-  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.11.0/templates/docker.yml'
+  - remote: 'https://raw.githubusercontent.com/jobtome-labs/ci-templates/v2.12.0/templates/docker.yml'
 
 test:unit:
   extends: .docker