👌 upgrade contribution by @alan-cushla (#136)

bgauduch · bgauduch · web-flow · commit 3beaca2381a8 · 2024-03-01T17:29:21.000+01:00
* 👌 contribution by @alan-cushla * ⚗️ testing without gcc * ⬆️ bumped all Github actions * ⬆️ update Action runner version --------- Co-authored-by: bgauduch <user.personal@users.noreply.github.com>
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -23,14 +23,14 @@ env:
 
 jobs:
   load_supported_versions:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Save supported versions as output
         id: set-matrix
@@ -42,14 +42,14 @@ jobs:
           echo "::set-output name=matrix::${SUPPORTED_VERSIONS}"
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: load_supported_versions
     strategy:
       matrix: ${{ fromJSON(needs.load_supported_versions.outputs.matrix) }}
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Save branch name as env var
         run: echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
@@ -64,13 +64,13 @@ jobs:
         run: docker image save --output ${IMAGE_NAME}_${IMAGE_TAG}.tar ${IMAGE_NAME}:${IMAGE_TAG}
 
       - name: Upload image artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}
           path: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}.tar
 
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - build
       - load_supported_versions
@@ -79,7 +79,7 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Save branch name as env var
         run: echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
@@ -88,7 +88,7 @@ jobs:
         run: echo "IMAGE_TAG=${BRANCH}_terraform-${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}" >> $GITHUB_ENV
 
       - name: Download image artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.IMAGE_NAME }}_${{ env.IMAGE_TAG }}
 
@@ -102,7 +102,7 @@ jobs:
           envsubst '${TF_VERSION},${AZ_VERSION}' < tests/container-structure-tests.yml.template > tests/container-structure-tests.yml
 
       - name: run structure tests
-        uses: plexsystems/container-structure-test-action@v0.2.0
+        uses: plexsystems/container-structure-test-action@v0.3.0
         with:
           image: ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
           config: tests/container-structure-tests.yml
diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml
@@ -11,9 +11,9 @@ on:
       - .github/workflows/dockerhub-description.yml
 jobs:
   dockerHubDescription:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Update Docker Hub Description
       uses: peter-evans/dockerhub-description@v3
diff --git a/.github/workflows/lint-dockerfile.yml b/.github/workflows/lint-dockerfile.yml
@@ -17,11 +17,11 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Lint Dockerfile
         uses: brpaz/hadolint-action@v1.5.0
diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml
@@ -21,11 +21,11 @@ env:
 
 jobs:
   build_push_latest:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Retrieve latest suported versions
         run: |
@@ -45,7 +45,7 @@ jobs:
         run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar $ORGANIZATION/$IMAGE_NAME:$IMAGE_TAG
 
       - name: Upload image artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}
           path: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}.tar
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,14 +7,14 @@ on:
 
 jobs:
   load_supported_versions:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Save supported versions as output
         id: set-matrix
@@ -26,7 +26,7 @@ jobs:
           echo "::set-output name=matrix::${SUPPORTED_VERSIONS}"
 
   build_push_release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - load_supported_versions
 
@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get and save release tag
         run: echo "RELEASE_TAG=${GITHUB_REF##*/}" >> $GITHUB_ENV
@@ -60,7 +60,7 @@ jobs:
         run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
 
       - name: Upload image artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_RELEASE_TAG }}
           path: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_RELEASE_TAG }}.tar
diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +1,17 @@
 # Build arguments
 ARG AZURE_CLI_VERSION
 ARG TERRAFORM_VERSION
-ARG PYTHON_MAJOR_VERSION=3.9
-ARG DEBIAN_VERSION=bullseye-20220125-slim
+ARG PYTHON_MAJOR_VERSION=3.11
+ARG DEBIAN_VERSION=bookworm-20240211-slim
 
 # Download Terraform binary
 FROM debian:${DEBIAN_VERSION} as terraform-cli
 ARG TERRAFORM_VERSION
 RUN apt-get update
-RUN apt-get install --no-install-recommends -y curl=7.74.0-1.3+deb11u1
-RUN apt-get install --no-install-recommends -y ca-certificates=20210119
-RUN apt-get install --no-install-recommends -y unzip=6.0-26
-RUN apt-get install --no-install-recommends -y gnupg=2.2.27-2
+RUN apt-get install --no-install-recommends -y curl=7.88.1-10+deb12u5
+RUN apt-get install --no-install-recommends -y ca-certificates=20230311
+RUN apt-get install --no-install-recommends -y unzip=6.0-28
+RUN apt-get install --no-install-recommends -y gnupg=2.2.40-1.1
 WORKDIR /workspace
 RUN curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS
 RUN curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
@@ -28,21 +28,23 @@ FROM debian:${DEBIAN_VERSION} as azure-cli
 ARG AZURE_CLI_VERSION
 ARG PYTHON_MAJOR_VERSION
 RUN apt-get update
-RUN apt-get install -y --no-install-recommends python3=${PYTHON_MAJOR_VERSION}.2-3
-RUN apt-get install -y --no-install-recommends python3-pip=20.3.4-4
-RUN pip3 install --no-cache-dir setuptools==60.8.2
-RUN pip3 install --no-cache-dir azure-cli==${AZURE_CLI_VERSION}
+RUN apt-get install -y --no-install-recommends python3=${PYTHON_MAJOR_VERSION}.2-1+b1
+RUN apt-get install -y --no-install-recommends python3-pip=23.0.1+dfsg-1
+# '--break-system-packages' option prevent errors when installing items with pip, without using venv.
+# It's not required in a throw-away container.
+RUN pip3 install --no-cache-dir setuptools==69.1.1 --break-system-packages
+RUN pip3 install --no-cache-dir azure-cli==${AZURE_CLI_VERSION} --break-system-packages
 
 # Build final image
 FROM debian:${DEBIAN_VERSION}
 LABEL maintainer="bgauduch@github"
 ARG PYTHON_MAJOR_VERSION
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-    ca-certificates=20210119 \
-    git=1:2.30.2-1 \
-    python3=${PYTHON_MAJOR_VERSION}.2-3 \
-    python3-distutils=${PYTHON_MAJOR_VERSION}.2-1 \
+    ca-certificates=20230311 \
+    git=1:2.39.2-1.1 \
+    python3=${PYTHON_MAJOR_VERSION}.2-1+b1 \
+    python3-distutils=${PYTHON_MAJOR_VERSION}.2-3 \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* \
   && update-alternatives --install /usr/bin/python python /usr/bin/python${PYTHON_MAJOR_VERSION} 1
diff --git a/README.md b/README.md
@@ -90,10 +90,10 @@ Do not hesitate to contribute by [filling an issue](https://github.com/zenika-op
   * check **Azure CLI** version on the [project release page](https://github.com/Azure/azure-cli/releases)
   * check **Terraform CLI** version (keep all minor versions from 0.11) available on the [project release page](https://github.com/hashicorp/terraform/releases)
 * Dockerfile:
-  * check **base image** version [on DockerHub](https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye)
+  * check **base image** version [on DockerHub](https://hub.docker.com/_/debian?tab=tags&page=1&name=bookworm)
   * check **OS package** versions on Debian package repository
-    * Available **Git** versions on the [Debian Packages repository](https://packages.debian.org/search?suite=bullseye&arch=any&searchon=names&keywords=git)
-    * Available **Python** versions on the [Debian packages repository](https://packages.debian.org/search?suite=bullseye&arch=any&searchon=names&keywords=python3)
+    * Available **Git** versions on the [Debian Packages repository](https://packages.debian.org/search?suite=bookworm&arch=any&searchon=names&keywords=git)
+    * Available **Python** versions on the [Debian packages repository](https://packages.debian.org/search?suite=bookworm&arch=any&searchon=names&keywords=python3)
     * same process for **all other packages**
   * check **Pip package** versions on [pypi](https://pypi.org/)
 * Github actions:
diff --git a/dev.sh b/dev.sh
@@ -13,14 +13,27 @@ set -eo pipefail
 IMAGE_NAME="zenika/terraform-azure-cli"
 [[ -n $3 ]] && IMAGE_TAG=$3 || IMAGE_TAG="dev"
 
+# Set platform for Hadolint image (only linux/arm64 or linux/arm64 supported)
+PLATEFORM="linux/$(uname -m)"
+
 # Lint Dockerfile
 echo "Linting Dockerfile..."
-docker run --rm --interactive --volume "${PWD}":/data --workdir /data hadolint/hadolint:2.5.0-alpine /bin/hadolint --config hadolint.yaml Dockerfile
-echo "Dockerfile successfully linted!"
+docker container run --rm --interactive \
+  --volume "${PWD}":/data \
+  --workdir /data \
+  --platform "${PLATEFORM}" \
+  hadolint/hadolint:2.12.0-alpine /bin/hadolint \
+  --config hadolint.yaml Dockerfile
+echo "Lint Successful!"
 
 # Build image
 echo "Building images with AZURE_CLI_VERSION=${AZ_VERSION} and TERRAFORM_VERSION=${TF_VERSION}..."
-docker image build --build-arg AZURE_CLI_VERSION="$AZ_VERSION" --build-arg TERRAFORM_VERSION="$TF_VERSION" -t $IMAGE_NAME:$IMAGE_TAG .
+docker buildx build \
+  --progress plain \
+  --platform "${PLATEFORM}" \
+  --build-arg AZURE_CLI_VERSION="${AZ_VERSION}" \
+  --build-arg TERRAFORM_VERSION="${TF_VERSION}" \
+  --tag ${IMAGE_NAME}:${IMAGE_TAG} .
 echo "Image successfully builded!"
 
 # Test image
@@ -29,6 +42,13 @@ export AZ_VERSION=${AZ_VERSION} && export TF_VERSION=${TF_VERSION}
 envsubst '${AZ_VERSION},${TF_VERSION}' < tests/container-structure-tests.yml.template > tests/container-structure-tests.yml
 echo "Test config successfully generated!"
 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.10.0 test --image $IMAGE_NAME:$IMAGE_TAG --config /tests.yml
+docker container run --rm --interactive \
+  --volume "${PWD}"/tests/container-structure-tests.yml:/tests.yml:ro \
+  --volume /var/run/docker.sock:/var/run/docker.sock:ro \
+  gcr.io/gcp-runtimes/container-structure-test:v1.15.0 test \
+  --image ${IMAGE_NAME}:${IMAGE_TAG} \
+  --config /tests.yml
+
+# cleanup
 unset AZ_VERSION
 unset TF_VERSION
diff --git a/supported_versions.json b/supported_versions.json
@@ -6,9 +6,15 @@
     "0.14.11",
     "0.15.5",
     "1.0.11",
-    "1.1.5"
+    "1.1.9",
+    "1.2.9",
+    "1.3.9",
+    "1.4.7",
+    "1.5.7",
+    "1.6.6",
+    "1.7.4"
   ],
   "azcli_version": [
-    "2.33.1"
+    "2.57.0"
   ]
 }
diff --git a/tests/container-structure-tests.yml.template b/tests/container-structure-tests.yml.template
@@ -11,12 +11,12 @@ commandTests:
   - name: "Check Python version"
     command: "python"
     args: ["--version"]
-    expectedOutput: ["Python 3.9.2"]
+    expectedOutput: ["Python 3.11.2"]
 
   - name: "Check Git version"
     command: "git"
     args: ["--version"]
-    expectedOutput: ["git version 2.30.2"]
+    expectedOutput: ["git version 2.39.2"]
 
   - name: "Check Terraform CLI version"
     command: "terraform"
