From f528da17774de71bc74a9164adef7cb584bb69a2 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Aug 2024 10:02:47 -0500 Subject: [PATCH 01/15] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 959a1d4c1..d4b37223a 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ It is strongly suggested to specify the `-DockerfilePath` option to avoid the ov ```powershell .\build.ps1 -DockerfilePath "*fedora/40/amd64*" -ImageBuilderCustomArgs "--dry-run" ``` - +e Partial paths and wildcards in the `-DockerfilePath` option are also supported. The following example will build all the Fedora Dockerfiles. ```powershell From db95b7d8cd7f7c50b943980454b19657fce469f6 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Aug 2024 10:11:24 -0500 Subject: [PATCH 02/15] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4b37223a..1b905762f 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ It is strongly suggested to specify the `-DockerfilePath` option to avoid the ov e Partial paths and wildcards in the `-DockerfilePath` option are also supported. The following example will build all the Fedora Dockerfiles. - ```powershell + ```powershells .\build.ps1 -DockerfilePath "*fedora/*" ``` From b471b8f013717ac78e16b59d2fb27456f5997a52 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Aug 2024 10:22:34 -0500 Subject: [PATCH 03/15] test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b905762f..f1bc2d333 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ e 3. Prepare a PR -## When do images get built +### When do images get built The images from this repository get built and published whenever one of the following occurs: From 4ecc21cebf84cb56691bea12c5273816b5a19494 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Aug 2024 10:26:35 -0500 Subject: [PATCH 04/15] test --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index f1bc2d333..e8e111779 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,6 @@ The images from this repository get built and published whenever one of the foll - The base image is updated (a new version of the image referred to by the [`FROM`](https://docs.docker.com/engine/reference/builder/#from) statement). ## How to identify the image digest - The images from this repo are being [rebuilt continuously](#when-do-images-get-built). As such, in order to diagnose issues/regressions, it is sometimes necessary to be able to identity the specific image used in CI/Helix test runs. This is useful when needing to examine a previously working version of the image. From a2b83381a4b27a39185415dc2a54c485d2cb7c9b Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Aug 2024 10:28:00 -0500 Subject: [PATCH 05/15] test --- .github/workflows/linter.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 433590431..fbc57dc41 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -3,7 +3,8 @@ name: Lint Code Base on: pull_request: - branches: [main] + branches: + - main permissions: {} From b6e1d7e5bb3b37c931581d3be92c3ba1b7b26fbf Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Aug 2024 10:28:50 -0500 Subject: [PATCH 06/15] test --- .github/workflows/linter.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index fbc57dc41..7b5d7893f 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -2,9 +2,7 @@ name: Lint Code Base on: - pull_request: - branches: - - main + pull_request: null permissions: {} From a385ae6385f88c86b907f7ba9c29fc852fd6570c Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Aug 2024 10:29:32 -0500 Subject: [PATCH 07/15] test --- .github/workflows/linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 7b5d7893f..ea0ed3cbd 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -23,7 +23,7 @@ jobs: # Full git history is needed to get a proper list of changed files within `super-linter` fetch-depth: 0 - name: Lint Code Base - uses: github/super-linter@v7 # https://github.com/github/super-linter + uses: github/super-linter@v7.0.0 # https://github.com/github/super-linter env: DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 509dff9f2ae56ffc662c9b3b708df683edf110ec Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 16 Aug 2024 10:32:23 -0500 Subject: [PATCH 08/15] test --- .github/workflows/linter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index ea0ed3cbd..9434d5492 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -23,7 +23,7 @@ jobs: # Full git history is needed to get a proper list of changed files within `super-linter` fetch-depth: 0 - name: Lint Code Base - uses: github/super-linter@v7.0.0 # https://github.com/github/super-linter + uses: github/super-linter@v6 # https://github.com/github/super-linter env: DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From b80c160eb35a91476c2ef64548ced0cf23a04c65 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 22 Aug 2024 14:18:09 -0500 Subject: [PATCH 09/15] Fix MD syntax --- .github/workflows/linter.yml | 3 +-- README.md | 9 +++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 9434d5492..ba1f4c0b2 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -1,4 +1,3 @@ - name: Lint Code Base on: @@ -18,7 +17,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: # Full git history is needed to get a proper list of changed files within `super-linter` fetch-depth: 0 diff --git a/README.md b/README.md index e8e111779..cc8d332f4 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ The following steps are a guideline for modifying/creating Dockerfiles. - Update the [CODEOWNERS](./CODEOWNERS) with the respective team code owner(s) (not individual users) for the Dockerfile(s) and list `@dotnet/dotnet-docker-reviewers` as a secondary owner. Team code owners must be assigned to each Dockerfile for maintenance and issue assignment purposes. -2. Validate the changes locally by running [build.ps1](./build.ps1). +1. Validate the changes locally by running [build.ps1](./build.ps1). It is strongly suggested to specify the `-DockerfilePath` option to avoid the overhead of building all the images. For example, if editing the [Fedora 40 Dockerfile](./src/fedora/40/amd64/Dockerfile), then run the following command to build just that Dockerfile. @@ -54,14 +54,14 @@ It is strongly suggested to specify the `-DockerfilePath` option to avoid the ov ```powershell .\build.ps1 -DockerfilePath "*fedora/40/amd64*" -ImageBuilderCustomArgs "--dry-run" ``` -e + Partial paths and wildcards in the `-DockerfilePath` option are also supported. The following example will build all the Fedora Dockerfiles. - ```powershells + ```powershell .\build.ps1 -DockerfilePath "*fedora/*" ``` -3. Prepare a PR +1. Prepare a PR ### When do images get built @@ -71,6 +71,7 @@ The images from this repository get built and published whenever one of the foll - The base image is updated (a new version of the image referred to by the [`FROM`](https://docs.docker.com/engine/reference/builder/#from) statement). ## How to identify the image digest + The images from this repo are being [rebuilt continuously](#when-do-images-get-built). As such, in order to diagnose issues/regressions, it is sometimes necessary to be able to identity the specific image used in CI/Helix test runs. This is useful when needing to examine a previously working version of the image. From 974c3a318e058ecc87c8ac6415fb1f2c3153bbb7 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 22 Aug 2024 14:24:46 -0500 Subject: [PATCH 10/15] Change config --- .github/workflows/linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index ba1f4c0b2..b811d8cf9 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -26,3 +26,4 @@ jobs: env: DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VALIDATE_MARKDOWN: true From defc9d59b122802c16678c9c80dc4c0c7e3cfa5e Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 22 Aug 2024 14:25:45 -0500 Subject: [PATCH 11/15] Enable Dockerfile lint --- .github/workflows/linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index b811d8cf9..55df78aa1 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -26,4 +26,5 @@ jobs: env: DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VALIDATE_DOCKERFILE_HADOLINT: true VALIDATE_MARKDOWN: true From d10960185c85209f3da96a52c5b7b643bb5b1761 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 22 Aug 2024 14:32:00 -0500 Subject: [PATCH 12/15] Exclude eng/common --- .github/workflows/linter.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 55df78aa1..e48bd7f98 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -25,6 +25,7 @@ jobs: uses: github/super-linter@v6 # https://github.com/github/super-linter env: DEFAULT_BRANCH: main + FILTER_REGEX_EXCLUDE: eng/common/.* GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} VALIDATE_DOCKERFILE_HADOLINT: true VALIDATE_MARKDOWN: true From d1942ad87d0287bf09ffed7d43e4604f008eec98 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 22 Aug 2024 14:34:21 -0500 Subject: [PATCH 13/15] revert numbering change --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cc8d332f4..4dd2a0b05 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ The following steps are a guideline for modifying/creating Dockerfiles. - Update the [CODEOWNERS](./CODEOWNERS) with the respective team code owner(s) (not individual users) for the Dockerfile(s) and list `@dotnet/dotnet-docker-reviewers` as a secondary owner. Team code owners must be assigned to each Dockerfile for maintenance and issue assignment purposes. -1. Validate the changes locally by running [build.ps1](./build.ps1). +2. Validate the changes locally by running [build.ps1](./build.ps1). It is strongly suggested to specify the `-DockerfilePath` option to avoid the overhead of building all the images. For example, if editing the [Fedora 40 Dockerfile](./src/fedora/40/amd64/Dockerfile), then run the following command to build just that Dockerfile. @@ -61,7 +61,7 @@ It is strongly suggested to specify the `-DockerfilePath` option to avoid the ov .\build.ps1 -DockerfilePath "*fedora/*" ``` -1. Prepare a PR +3. Prepare a PR ### When do images get built From ccfe555cadcae98972978070e99fd837ce712ef5 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 22 Aug 2024 14:40:08 -0500 Subject: [PATCH 14/15] Add config --- .github/linters/.hadolint.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/linters/.hadolint.yaml diff --git a/.github/linters/.hadolint.yaml b/.github/linters/.hadolint.yaml new file mode 100644 index 000000000..f8cbb9da2 --- /dev/null +++ b/.github/linters/.hadolint.yaml @@ -0,0 +1 @@ +failure-threshold: error From d9ea877fa195a9c66ec6c918f2db51258170704e Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Thu, 22 Aug 2024 14:44:43 -0500 Subject: [PATCH 15/15] Revert test change --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4dd2a0b05..959a1d4c1 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ It is strongly suggested to specify the `-DockerfilePath` option to avoid the ov 3. Prepare a PR -### When do images get built +## When do images get built The images from this repository get built and published whenever one of the following occurs: