⬆️ Dev tools update (#77)

* 🐳 remove useless hadolint ignore tag

* 🔧 add lint and test in dev-build script, moved to repository root

* 📝 add license badge and update dev doc

* 🚚 renamed container structure test config

* 👷 update container structure test config name in build-test workflow

* 🔧 update dev-build script to use container-structure-test image instead of local binary

Author: bgauduch

.github/workflows/build-test.yml

@@ -75,4 +75,4 @@ jobs:
         uses: plexsystems/[email protected]
         with:
           image: ${{ env.ORGANIZATION }}/${{ env.IMAGE_NAME }}:${{ env.BRANCH }}
-          config: tests/container-structure-test.yml
+          config: tests/container-structure-tests.yml

Dockerfile

@@ -7,7 +7,6 @@ ARG PYTHON_MAJOR_VERSION=3.7
 FROM debian:buster-20191118-slim as terraform-cli
 ARG TERRAFORM_VERSION
 RUN apt-get update
-# hadolint ignore=DL3015
 RUN apt-get install -y --no-install-recommends curl=7.64.0-4+deb10u1
 RUN apt-get install -y --no-install-recommends ca-certificates=20190110
 RUN apt-get install -y --no-install-recommends unzip=6.0-23+deb10u1

README.md

@@ -1,6 +1,8 @@
 [![build-test](https://github.com/Zenika/terraform-azure-cli/workflows/build-test/badge.svg)](https://github.com/Zenika/terraform-azure-cli/actions?query=workflow%3Abuild-test)
 [![push-latest](https://github.com/Zenika/terraform-azure-cli/workflows/push-latest/badge.svg)](https://github.com/Zenika/terraform-azure-cli/actions?query=workflow%3Apush-latest)
 [![release](https://github.com/Zenika/terraform-azure-cli/workflows/release/badge.svg)](https://github.com/Zenika/terraform-azure-cli/actions?query=workflow%3Arelease)
+
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Docker Pulls](https://img.shields.io/docker/pulls/zenika/terraform-azure-cli.svg)](https://hub.docker.com/r/zenika/terraform-azure-cli/)
 
 <p align="center">
@@ -52,11 +54,16 @@ docker container run -it --rm --mount type=bind,source="$(pwd)",target=/workspac
 > The `--rm` flag will completely destroy the container and its data on exit.
 
 ### Build the image
-You can build the image locally directly from the Dockerfiles, using the build script:
+You can build the image locally directly from the Dockerfile, using the build script.
+
+It will :
+* Lint the Dockerfile with [Hadolint](https://github.com/hadolint/hadolint);
+* Build and tag the image `zenika/terraform-azure-cli:dev`;
+* Execute [container structure tests](https://github.com/GoogleContainerTools/container-structure-test) on the image.
 
 ```bash
 # launch build script
-./scripts/dev-build.sh
+./dev-build.sh
 ```
 
 Optionally, it is possible to choose the tools desired versions using [Docker builds arguments](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables---build-arg) :
@@ -67,7 +74,7 @@ AZURE_CLI_VERSION=2.5.1
 TERRAFORM_VERSION=0.12.24
 
 # launch the build script with parameters
-./scripts/dev-build.sh $AZURE_CLI_VERSION $TERRAFORM_VERSION
+./dev-build.sh $AZURE_CLI_VERSION $TERRAFORM_VERSION
 ```
 
 ## 🙏 Roadmap & Contributions

dev-build.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+IMAGE_NAME="zenika/terraform-azure-cli:dev"
+
+# Lint Dockerfile
+echo "Linting Dockerfile..."
+docker run --rm -i hadolint/hadolint:v1.17.6-alpine < Dockerfile
+echo "Lint Successful!"
+
+# Build dev image
+if [ -n "$1" ] && [ -n "$2" ] ; then
+  echo "Building images with parameters AZURE_CLI_VERSION=${1} and TERRAFORM_VERSION=${2}..."
+  docker image build --build-arg AZURE_CLI_VERSION="$1" --build-arg TERRAFORM_VERSION="$2" -t $IMAGE_NAME .
+else
+  echo "Building images with default parameters..."
+  docker image build -f Dockerfile -t $IMAGE_NAME .
+fi
+
+# Test dev image
+echo "Executing container structure test..."
+docker container run --rm -it -v "${PWD}"/tests/container-structure-tests.yml:/tests.yml:ro -v /var/run/docker.sock:/var/run/docker.sock:ro gcr.io/gcp-runtimes/container-structure-test:v1.8.0 test --image $IMAGE_NAME --config /tests.yml