From 4369d8ebc04433a8f483d4ade23206403399740b Mon Sep 17 00:00:00 2001 From: Aidan Delaney Date: Tue, 15 Oct 2024 07:40:12 +0000 Subject: [PATCH 1/4] Update vocabularies for vale Expand the vocabulary and move to new location Signed-off-by: Aidan Delaney --- .github/styles/Vocab/Buildpacks/accept.txt | 12 ++++++++++++ .../styles/confg/vocabularies/Buildpacks/accept.txt | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .github/styles/Vocab/Buildpacks/accept.txt delete mode 100644 .vale/styles/confg/vocabularies/Buildpacks/accept.txt diff --git a/.github/styles/Vocab/Buildpacks/accept.txt b/.github/styles/Vocab/Buildpacks/accept.txt new file mode 100644 index 000000000..b4eb66252 --- /dev/null +++ b/.github/styles/Vocab/Buildpacks/accept.txt @@ -0,0 +1,12 @@ +API(?s) +[Bb]uildpack(?s) +config +Dockerfile(?s) +GitHub +mixin(?s) +prepended +rebase +Rebasing +SBOM(?s) +semver +Syft \ No newline at end of file diff --git a/.vale/styles/confg/vocabularies/Buildpacks/accept.txt b/.vale/styles/confg/vocabularies/Buildpacks/accept.txt deleted file mode 100644 index ad5aa8b8a..000000000 --- a/.vale/styles/confg/vocabularies/Buildpacks/accept.txt +++ /dev/null @@ -1,2 +0,0 @@ -[Bb]uildpack(?s) -prepended \ No newline at end of file From 034ea0fc6090e0f098fe978b6254fda251f16078 Mon Sep 17 00:00:00 2001 From: Aidan Delaney Date: Wed, 16 Oct 2024 07:28:38 +0000 Subject: [PATCH 2/4] Pin version of vale linter Upstream are moving to v3, which we will follow in time Signed-off-by: Aidan Delaney --- .github/workflows/vale-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/vale-lint.yml b/.github/workflows/vale-lint.yml index 6061f9077..bb38a7da2 100644 --- a/.github/workflows/vale-lint.yml +++ b/.github/workflows/vale-lint.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: errata-ai/vale-action@reviewdog + - uses: errata-ai/vale-action@v2.1.1 with: fail_on_error: true token: ${{secrets.GITHUB_TOKEN}} From a7dccb441f48310abfb7bc8773332f32b4cc6800 Mon Sep 17 00:00:00 2001 From: Aidan Delaney Date: Wed, 16 Oct 2024 07:32:11 +0000 Subject: [PATCH 3/4] Use vale v2 layout Use the directory layout that matches the version of vale we have pinned. Signed-off-by: Aidan Delaney --- .../styles/{Vocab => config/vocabularies}/Buildpacks/accept.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/styles/{Vocab => config/vocabularies}/Buildpacks/accept.txt (100%) diff --git a/.github/styles/Vocab/Buildpacks/accept.txt b/.github/styles/config/vocabularies/Buildpacks/accept.txt similarity index 100% rename from .github/styles/Vocab/Buildpacks/accept.txt rename to .github/styles/config/vocabularies/Buildpacks/accept.txt From f50368c41867ee45d62c16350868c793137515fd Mon Sep 17 00:00:00 2001 From: GatinMI Date: Thu, 17 Oct 2024 10:36:15 +0300 Subject: [PATCH 4/4] Update run-base.md: fix Dockerfile template (#772) Remove errors in trailing lines Signed-off-by: GatinMI --- .../how-to/build-inputs/create-builder/run-base.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/docs/for-platform-operators/how-to/build-inputs/create-builder/run-base.md b/content/docs/for-platform-operators/how-to/build-inputs/create-builder/run-base.md index e355ecaf4..4d5d3788d 100644 --- a/content/docs/for-platform-operators/how-to/build-inputs/create-builder/run-base.md +++ b/content/docs/for-platform-operators/how-to/build-inputs/create-builder/run-base.md @@ -22,13 +22,13 @@ FROM ubuntu:jammy # Install packages that we want to make available at run time RUN apt-get update && \ apt-get install -y xz-utils ca-certificates && \ - rm -rf /var/lib/apt/lists/* \ + rm -rf /var/lib/apt/lists/* # Create user and group ARG cnb_uid=1000 ARG cnb_gid=1000 RUN groupadd cnb --gid ${cnb_gid} && \ - useradd --uid ${cnb_uid} --gid ${cnb_gid} -m -s /bin/bash cnb \ + useradd --uid ${cnb_uid} --gid ${cnb_gid} -m -s /bin/bash cnb # Set user and group USER ${cnb_uid}:${cnb_gid}