Updated Dockerfile to resolve build issues due to vintage #131
+209
−141
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,4 +20,4 @@ jobs: | |
| with: | ||
| username: ${{ secrets.DOCKERHUB_USERNAME }} | ||
| password: ${{ secrets.DOCKERHUB_PASS }} | ||
| repository: ${{ secrets.DOCKERHUB_USERNAME }}/terraform-azure-cli | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,43 @@ | ||||||
| name: Load Supported Versions | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. 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 |
||||||
|
|
||||||
| on: | ||||||
| workflow_call: | ||||||
| outputs: | ||||||
| azcli_version: | ||||||
| description: "Latest supported azcli version" | ||||||
| value: ${{ jobs.load_versions.outputs.azcli_version }} | ||||||
| tf_version: | ||||||
| description: "Latest supported terraform version" | ||||||
| value: ${{ jobs.load_versions.outputs.tf_version }} | ||||||
| workflow_dispatch: | ||||||
|
|
||||||
| jobs: | ||||||
| load_versions: | ||||||
| runs-on: ubuntu-20.04 | ||||||
| outputs: | ||||||
| azcli_version: ${{ env.azcli_version }} | ||||||
| tf_version: ${{ env.tf_version }} | ||||||
|
|
||||||
| steps: | ||||||
| - name: Check out the repo | ||||||
| uses: actions/checkout@v3 | ||||||
|
|
||||||
| - name: Save supported versions as output | ||||||
| id: set-matrix | ||||||
| run: | | ||||||
| echo "azcli_version=$(jq -r '.azcli_version | sort | .[-1]' supported_versions.json)" >> $GITHUB_ENV | ||||||
| echo "tf_version=$(jq -r '.tf_version | sort | .[-1]' supported_versions.json)" >> $GITHUB_ENV | ||||||
|
|
||||||
| - name: output | ||||||
| run: | | ||||||
| echo $azcli_version | ||||||
| echo $tf_version | ||||||
|
|
||||||
| display_versions: | ||||||
| needs: load_versions | ||||||
| runs-on: ubuntu-latest | ||||||
| steps: | ||||||
| - name: Access Variable | ||||||
| run: | | ||||||
| echo "azcli_version=${{ needs.load_versions.outputs.azcli_version }}" | ||||||
| echo "tf_version=${{ needs.load_versions.outputs.tf_version }}" | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,50 @@ | ||||||
| name: Load Supported Versions | ||||||
|
There was a problem hiding this comment. Maybe I didn't understand correctly, but aren't The only difference I can sport is EDIT : In that cas, a plural on outputs would be nice 😉 |
||||||
|
|
||||||
| on: | ||||||
| workflow_call: | ||||||
| outputs: | ||||||
| matrix: | ||||||
| description: "Matrix of supported versions" | ||||||
| value: ${{ jobs.load_versions.outputs.matrix }} | ||||||
| azcli_version: | ||||||
|
There was a problem hiding this comment.
Suggested change
Beware of references elsewhere in the code |
||||||
| description: "Matrix of supported azcli versions" | ||||||
| value: ${{ jobs.load_versions.outputs.azcli_version }} | ||||||
| tf_version: | ||||||
|
There was a problem hiding this comment.
Suggested change
Beware of references elsewhere in the code |
||||||
| description: "Matrix of supported terraform versions" | ||||||
| value: ${{ jobs.load_versions.outputs.tf_version }} | ||||||
| workflow_dispatch: | ||||||
|
|
||||||
| jobs: | ||||||
| load_versions: | ||||||
| runs-on: ubuntu-20.04 | ||||||
| outputs: | ||||||
| azcli_version: ${{ env.azcli_version }} | ||||||
| tf_version: ${{ env.tf_version }} | ||||||
| matrix: ${{ env.matrix }} | ||||||
|
|
||||||
| steps: | ||||||
| - name: Check out the repo | ||||||
| uses: actions/checkout@v3 | ||||||
|
|
||||||
| - name: Save supported versions as output | ||||||
| id: set-matrix | ||||||
| run: | | ||||||
| echo "azcli_version=$(jq -r -c '.azcli_version | sort | reverse' supported_versions.json)" >> $GITHUB_ENV | ||||||
| echo "tf_version=$(jq -r -c '.tf_version | sort | reverse' supported_versions.json)" >> $GITHUB_ENV | ||||||
| echo -e matrix=\{"azcli_version": $(jq -r -c '.azcli_version | sort | reverse' supported_versions.json), "tf_version": $(jq -r -c '.tf_version | sort | reverse' supported_versions.json)\} >> $GITHUB_ENV | ||||||
|
|
||||||
| - name: output | ||||||
| run: | | ||||||
| echo $azcli_version | ||||||
| echo $tf_version | ||||||
| echo $matrix | ||||||
|
|
||||||
| display_versions: | ||||||
| needs: load_versions | ||||||
| runs-on: ubuntu-latest | ||||||
| steps: | ||||||
| - name: Access Variable | ||||||
| run: | | ||||||
| echo "azcli_version=${{ needs.load_versions.outputs.azcli_version }}" | ||||||
| echo "tf_version=${{ needs.load_versions.outputs.tf_version }}" | ||||||
| echo "matrix=${{ needs.load_versions.outputs.matrix }}" | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,37 +15,35 @@ on: | |
| - ".github/workflows/push-latest.yml" | ||
|
|
||
| env: | ||
| IMAGE_NAME: "terraform-azure-cli" | ||
| IMAGE_TAG: "latest" | ||
|
|
||
| jobs: | ||
| latest_version: | ||
| uses: ./.github/workflows/include_latest-version.yml | ||
|
|
||
| build_push_latest: | ||
| runs-on: ubuntu-20.04 | ||
| needs: latest_version | ||
|
|
||
| steps: | ||
| - name: Check out the repo | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Build image | ||
| run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${{ needs.latest_version.outputs.tf_version }} --build-arg AZURE_CLI_VERSION=${{ needs.latest_version.outputs.azcli_version }} --tag ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG | ||
|
|
||
| - name: Login to Docker Hub registry | ||
| run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin | ||
|
|
||
| - name: Push image to registry | ||
| run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG | ||
|
|
||
| - name: Save image | ||
| run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:$IMAGE_TAG | ||
|
Comment on lines
-42
to
+43
There was a problem hiding this comment. The Dockerhub_username secret might not alway be "Zenika" and is not intended to identify the container registry name, so I would suggest to keep the |
||
|
|
||
| - name: Upload image artifact | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }} | ||
| path: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}.tar | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,35 +6,18 @@ on: | |
| types: [published] | ||
|
|
||
| jobs: | ||
| load_versions: | ||
| uses: ./.github/workflows/include_supported-versions.yml | ||
|
|
||
| build_push_release: | ||
| runs-on: ubuntu-20.04 | ||
| needs: | ||
| - load_versions | ||
|
|
||
| strategy: | ||
| matrix: ${{ fromJSON(needs.load_versions.outputs.matrix) }} | ||
|
|
||
| env: | ||
| IMAGE_NAME: "terraform-azure-cli" | ||
|
|
||
| steps: | ||
|
|
@@ -48,19 +31,21 @@ jobs: | |
| run: echo "IMAGE_RELEASE_TAG=release-${RELEASE_TAG}_terraform-${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }}" >> $GITHUB_ENV | ||
|
|
||
| - name: Build image | ||
| 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} | ||
|
Comment on lines
-51
to
+34
There was a problem hiding this comment. Same feedback as in push-latest workflow, we might be better off keeping ORGANIZATION env var |
||
|
|
||
| - name: Login to Docker Hub registry | ||
| run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin | ||
|
|
||
| - name: Push image to registry | ||
| run: | | ||
| docker images | ||
| docker push ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG} | ||
|
|
||
| - name: Save image | ||
| run: docker image save -o ${IMAGE_NAME}-${IMAGE_RELEASE_TAG}.tar ${{ secrets.DOCKERHUB_USERNAME }}/${IMAGE_NAME}:${IMAGE_RELEASE_TAG} | ||
|
|
||
| - name: Upload image artifact | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_RELEASE_TAG }} | ||
| path: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_RELEASE_TAG }}.tar | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| name: test_supported-versions.yaml | ||
| on: | ||
| push: | ||
| jobs: | ||
| load_versions: | ||
| uses: ./.github/workflows/include_supported-versions.yml | ||
|
|
||
| latest_version: | ||
| uses: ./.github/workflows/include_latest-version.yml | ||
|
|
||
| check_values: | ||
| runs-on: ubuntu-latest | ||
| needs: load_versions | ||
| strategy: | ||
| matrix: ${{ fromJSON(needs.load_versions.outputs.matrix) }} | ||
| steps: | ||
| - name: Test access to values | ||
| run: | | ||
| echo ${{ needs.load_versions.outputs.matrix }} | ||
| echo tf_${{ matrix.tf_version }}_azcli-${{ matrix.azcli_version }} | ||
|
|
||
| check_latest: | ||
| runs-on: ubuntu-latest | ||
| needs: latest_version | ||
| steps: | ||
| - name: Test access to values | ||
| run: | | ||
| echo terraform: ${{ needs.latest_version.outputs.tf_version }} | ||
| echo azcli: ${{ needs.latest_version.outputs.azcli_version }} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using reusables workflow is a very nice addition, much more DRY this way !
If possible, it might be a good idea to shrink their names and store them in a subdirectories, for instance
.github/workflows/reusables/latest-version.yml. What do you think ?