Updated Dockerfile to resolve build issues due to vintage #131

Jubblin · 2023-08-10T11:58:49Z

Updated Dockerfile to resolve Dockerfile build issues, updated actions to the latest versions, and made workflows more generic so they can be built on more simply by others moving forward.

Merge refactor --------- Co-authored-by: Richard Worwood <richard.worwood@endava.com>

* Update supported_versions.json to latest * Update supported_versions.json * Update supported_versions.json * Update supported_versions.json * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update Dockerfil formatting and safety * Push update to Dockerfile * specify devian version * add gosu * remove gosu * switch to curl * specify azure-cli version * simplify structure * update versions * change setuptools version * switch to 58 * uses DOCKERHUB_USERNAME secret as * correct push name --------- Co-authored-by: Richard Worwood <richard.worwood@endava.com>

* Update to push using secrets * Update Dockerfile "Remove line" --------- Co-authored-by: Richard Worwood <richard.worwood@endava.com>

Bumps [plexsystems/container-structure-test-action](https://github.com/plexsystems/container-structure-test-action) from 0.2.0 to 0.3.0. - [Release notes](https://github.com/plexsystems/container-structure-test-action/releases) - [Commits](plexsystems/container-structure-test-action@v0.2.0...v0.3.0) --- updated-dependencies: - dependency-name: plexsystems/container-structure-test-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 3. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@v2...v3) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…#9) * Create supported-versions.yml * Create test-harness for testing supported versions workflow * Update build-test.yml * Update supported-versions.yml * Update test-harness.yml * Update test-harness.yml * commit test for supported-versions workflow * test for matrix content * add latest version workflow * move from includes/ directory and rename to includes_ * update to use include_latest-version.yml --------- Co-authored-by: Richard Worwood <richard.worwood@endava.com>

…s using artifact repository (#11) * Simplified build-test.yml to remove need to upload and download images to artifact repository

bgauduch · 2023-08-23T18:38:27Z

Hello @Jubblin 👋

Thanks a lot for the incredible work injected into this PR 🤩
I'm very sorry for the answer delay and will start the review right now.

As a matter of fact, I'm looking for maintainers for this project (and also for the AWS sibling) !
Would you be interested to work more closely on those subjects ?

bgauduch

What a nice work @Jubblin , thanks a lot 🙏

Many questions and comments after this review 🙂
I will keep an eye closely on this MR to improve the project ASAP 🚀

bgauduch · 2023-08-23T18:45:15Z

Dockerfile

+RUN apt-get update && \
+    apt-get install --no-install-recommends -y \
+    curl=7.74.0-1.3+deb11u7 \
+    ca-certificates=20210119 \
+    unzip=6.0-26+deb11u1 \
+    gnupg=2.2.27-2+deb11u2 && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*


As this Dockerfile follow the multi-stages build pattern :

Optimizing throw-away stages is not required, as additional image layers won't end up in the final runtime stage

Keeping each instruction in a separated layer allow a more efficient use of build caching

So I would suggest to revert this changes 😉

bgauduch · 2023-08-23T18:45:53Z

Dockerfile

+RUN curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS && \
+    curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
+    curl -Os https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_SHA256SUMS.sig
 COPY hashicorp.asc hashicorp.asc
-RUN gpg --import hashicorp.asc
-RUN gpg --verify terraform_${TERRAFORM_VERSION}_SHA256SUMS.sig terraform_${TERRAFORM_VERSION}_SHA256SUMS
+RUN gpg --import hashicorp.asc && \
+    gpg --verify terraform_${TERRAFORM_VERSION}_SHA256SUMS.sig terraform_${TERRAFORM_VERSION}_SHA256SUMS
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN grep terraform_${TERRAFORM_VERSION}_linux_amd64.zip terraform_${TERRAFORM_VERSION}_SHA256SUMS | sha256sum -c -
-RUN unzip -j terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+RUN grep terraform_${TERRAFORM_VERSION}_linux_amd64.zip terraform_${TERRAFORM_VERSION}_SHA256SUMS | sha256sum -c - && \
+    unzip -j terraform_${TERRAFORM_VERSION}_linux_amd64.zip


Same comment as above 🙂

bgauduch · 2023-08-23T18:46:16Z

Dockerfile

+RUN apt-get update && \
+  apt-get install -y --no-install-recommends \
+  python3=${PYTHON_MAJOR_VERSION}.2-3 \
+  python3-pip=20.3.4-4+deb11u1 && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/* && \
+  pip3 install --no-cache-dir setuptools==58 && \
+  pip3 install --no-cache-dir azure-cli==${AZURE_CLI_VERSION}


Same comment as above here too 🙂

bgauduch · 2023-08-23T18:48:00Z

README.md

+[![lint-dockerfile](https://github.com/worwoods/terraform-azure-cli/actions/workflows/lint-dockerfile.yml/badge.svg)](https://github.com/worwoods/terraform-azure-cli/actions/workflows/lint-dockerfile.yml)
+[![build-test](https://github.com/worwoods/terraform-azure-cli/actions/workflows/build-test.yml/badge.svg)](https://github.com/worwoods/terraform-azure-cli/actions/workflows/build-test.yml)
+[![push-latest](https://github.com/worwoods/terraform-azure-cli/actions/workflows/push-latest.yml/badge.svg)](https://github.com/worwoods/terraform-azure-cli/actions/workflows/push-latest.yml)
+[![release](https://github.com/worwoods/terraform-azure-cli/actions/workflows/release.yml/badge.svg)](https://github.com/worwoods/terraform-azure-cli/actions/workflows/release.yml)

-[![Update Docker Hub Description](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/dockerhub-description.yml/badge.svg)](https://github.com/zenika-open-source/terraform-azure-cli/actions/workflows/dockerhub-description.yml)
+[![Update Docker Hub Description](https://github.com/worwoods/terraform-azure-cli/actions/workflows/dockerhub-description.yml/badge.svg)](https://github.com/worwoods/terraform-azure-cli/actions/workflows/dockerhub-description.yml)
 [![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/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/worwoods/terraform-azure-cli.svg)](https://hub.docker.com/r/worwoods/terraform-azure-cli/)

 <p align="center">
-  <a href="https://azure.microsoft.com"><img width="200" src="https://github.com/Zenika/terraform-azure-cli/raw/master/resources/azure-logo.png"></a>
-  <a href="https://www.terraform.io/"><img width="200" src="https://github.com/Zenika/terraform-azure-cli/raw/master/resources/terraform-logo.png"></a>
+  <a href="https://azure.microsoft.com"><img width="200" src="https://github.com/worwoods/terraform-azure-cli/raw/master/resources/azure-logo.png"></a>
+  <a href="https://www.terraform.io/"><img width="200" src="https://github.com/worwoods/terraform-azure-cli/raw/master/resources/terraform-logo.png"></a>
 </p>


I believe you changes this to test the badges and images, but we want to keep upstream references on https://github.com/zenika-open-source/terraform-azure-cli here 😉

bgauduch · 2023-08-23T18:49:27Z

README.md

-Available image tags can be found on the Docker Hub registry: [zenika/terraform-azure-cli](https://hub.docker.com/r/zenika/terraform-azure-cli/tags)
+Available image tags can be found on the Docker Hub registry: [worwoods/terraform-azure-cli](https://hub.docker.com/r/worwoods/terraform-azure-cli/tags)


Same here, we want to keep the reference on Zenika registry

bgauduch · 2023-08-23T21:25:20Z

.github/workflows/release.yml

-        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AZURE_CLI_VERSION=${{ matrix.azcli_version }} --tag ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
+        run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AZURE_CLI_VERSION=${{ matrix.azcli_version }} --tag ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}


Same feedback as in push-latest workflow, we might be better off keeping ORGANIZATION env var

bgauduch · 2023-08-23T21:32:41Z

.github/workflows/include_supported-versions.yml

@@ -0,0 +1,50 @@
+name: Load Supported Versions


Maybe I didn't understand correctly, but aren't include_latest-version and include_supported-versions.yml a bit of a duplication ?

The only difference I can sport is sort | reverse VS sort | .[-1] for both TF and AWSCLI versions, I'm not sure to quite understand the use case.

EDIT :
Oh okay the difference is the latest version for each VS a matrix of all versions for each tool.

In that cas, a plural on outputs would be nice 😉

bgauduch · 2023-08-23T21:38:23Z

.github/workflows/include_supported-versions.yml

+      matrix:
+        description: "Matrix of supported versions"
+        value: ${{ jobs.load_versions.outputs.matrix }}
+      azcli_version:


Suggested change

azcli_version:

azcli_versions:

Beware of references elsewhere in the code

bgauduch · 2023-08-23T21:38:36Z

.github/workflows/include_supported-versions.yml

+      azcli_version:
+        description: "Matrix of supported azcli versions"
+        value: ${{ jobs.load_versions.outputs.azcli_version }}
+      tf_version:


Suggested change

tf_version:

tf_versions:

Beware of references elsewhere in the code

bgauduch · 2023-08-23T21:40:34Z

.github/workflows/include_latest-version.yml

@@ -0,0 +1,43 @@
+name: Load Supported Versions


As you stated in the name, it might be better to keep the file name plural as latest version is exposed for multi tools, what do you think ?

That would be: .github/workflows/include_latest-versions.yml

Jubblin and others added 17 commits August 9, 2023 12:48

Update dockerhub-description.yml (#1)

64e1059

Merge version update changes (#2)

7a86c3e

Merge refactor --------- Co-authored-by: Richard Worwood <richard.worwood@endava.com>

update to use ORGANIZATION vars

655cec7

Merge branch 'master' of https://github.com/worwoods/terraform-azure-cli

e83e997

Jubblin patch 1 (#4)

22bcf11

* Update to push using secrets * Update Dockerfile "Remove line" --------- Co-authored-by: Richard Worwood <richard.worwood@endava.com>

update to actions/upload-artifact@v3

422aba6

Update README.md

3385c7d

Update README.md

701b080

Update release.yml

95d23c3

Update build-test.yml (#8)

09551c3

Simplified build-test.yml to remove need to upload and download image…

42f6733

…s using artifact repository (#11) * Simplified build-test.yml to remove need to upload and download images to artifact repository

Update supported_versions.json (#14)

0c24711

bgauduch requested changes Aug 23, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated Dockerfile to resolve build issues due to vintage #131

Updated Dockerfile to resolve build issues due to vintage #131

Jubblin commented Aug 10, 2023

bgauduch commented Aug 23, 2023

bgauduch left a comment •

edited

bgauduch Aug 23, 2023

bgauduch Aug 23, 2023

bgauduch Aug 23, 2023

bgauduch Aug 23, 2023 •

edited

bgauduch Aug 23, 2023

bgauduch Aug 23, 2023

bgauduch Aug 23, 2023

bgauduch Aug 23, 2023

bgauduch Aug 23, 2023

bgauduch Aug 23, 2023

		Available image tags can be found on the Docker Hub registry: [zenika/terraform-azure-cli](https://hub.docker.com/r/zenika/terraform-azure-cli/tags)
		Available image tags can be found on the Docker Hub registry: [worwoods/terraform-azure-cli](https://hub.docker.com/r/worwoods/terraform-azure-cli/tags)

		run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AZURE_CLI_VERSION=${{ matrix.azcli_version }} --tag ${ORGANIZATION}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}
		run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ matrix.tf_version }} --build-arg AZURE_CLI_VERSION=${{ matrix.azcli_version }} --tag ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG}

Updated Dockerfile to resolve build issues due to vintage #131

Are you sure you want to change the base?

Updated Dockerfile to resolve build issues due to vintage #131

Conversation

Jubblin commented Aug 10, 2023

bgauduch commented Aug 23, 2023

bgauduch left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bgauduch Aug 23, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bgauduch left a comment •

edited

bgauduch Aug 23, 2023 •

edited