Merge branch 'main' into feat/update-node-js-guide

Author: kristiyan-velkov

.github/CODEOWNERS

@@ -3,7 +3,7 @@
 
 # For more details, see https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-/content/manuals/build/ @aevesdocker
+/content/manuals/build/ @dvdksn
 
 /content/manuals/build-cloud/ @craig-osterhout
 
@@ -19,11 +19,11 @@
 
 /content/manuals/docker-hub/ @craig-osterhout
 
-/content/manuals/engine/ @usha-mandya
+/content/manuals/engine/ @dvdksn
 
-/content/reference/api/engine/ @usha-mandya
+/content/reference/api/engine/ @dvdksn
 
-/content/reference/cli/ @usha-mandya
+/content/reference/cli/ @dvdksn
 
 /content/manuals/subscription/ @sarahsanders-docker
 
@@ -35,9 +35,9 @@
 
 /content/manuals/accounts/ @sarahsanders-docker
 
-/content/manuals/ai/ @usha-mandya
+/content/manuals/ai/ @dvdksn
 
-/_vendor @sarahsanders-docker
+/_vendor @dvdksn
 
 /content/manuals/offload/ @craig-osterhout
 

.github/workflows/deploy.yml

@@ -37,7 +37,6 @@ jobs:
             DOCS_URL="https://docs.docker.com"
             DOCS_AWS_IAM_ROLE="arn:aws:iam::710015040892:role/prod-docs-docs.docker.com-20220818202218674300000001"
             DOCS_S3_BUCKET="prod-docs-docs.docker.com"
-            DOCS_S3_CONFIG="s3-config.json"
             DOCS_CLOUDFRONT_ID="E228TTN20HNU8F"
             DOCS_LAMBDA_FUNCTION_REDIRECTS="DockerDocsRedirectFunction-prod"
             DOCS_SLACK_MSG="Successfully deployed docs from the main branch. $DOCS_URL"
@@ -46,7 +45,6 @@ jobs:
             DOCS_URL="https://docs-labs.docker.com"
             DOCS_AWS_IAM_ROLE="arn:aws:iam::710015040892:role/labs-docs-docs.docker.com-20220818202218402500000001"
             DOCS_S3_BUCKET="labs-docs-docs.docker.com"
-            DOCS_S3_CONFIG="s3-config.json"
             DOCS_CLOUDFRONT_ID="E1MYDYF65FW3HG"
             DOCS_LAMBDA_FUNCTION_REDIRECTS="DockerDocsRedirectFunction-labs"
           else
@@ -63,7 +61,6 @@ jobs:
           echo "DOCS_AWS_REGION=$DOCS_AWS_REGION" >> $GITHUB_ENV
           echo "DOCS_AWS_IAM_ROLE=$DOCS_AWS_IAM_ROLE" >> $GITHUB_ENV
           echo "DOCS_S3_BUCKET=$DOCS_S3_BUCKET" >> $GITHUB_ENV
-          echo "DOCS_S3_CONFIG=$DOCS_S3_CONFIG" >> $GITHUB_ENV
           echo "DOCS_CLOUDFRONT_ID=$DOCS_CLOUDFRONT_ID" >> $GITHUB_ENV
           echo "DOCS_LAMBDA_FUNCTION_REDIRECTS=$DOCS_LAMBDA_FUNCTION_REDIRECTS" >> $GITHUB_ENV
           echo "DOCS_SLACK_MSG=$DOCS_SLACK_MSG" >> $GITHUB_ENV
@@ -100,7 +97,6 @@ jobs:
         if: ${{ env.DOCS_S3_BUCKET != '' }}
         run: |
           aws --region ${{ env.DOCS_AWS_REGION }} s3 sync \
-            --acl public-read \
             --delete \
             --exclude "*" \
             --include "*.webp" \
@@ -109,23 +105,9 @@ jobs:
             --content-type="image/webp" \
             public s3://${{ env.DOCS_S3_BUCKET }}/
           aws --region ${{ env.DOCS_AWS_REGION }} s3 sync \
-            --acl public-read \
             --delete \
             --exclude "*.webp" \
             public s3://${{ env.DOCS_S3_BUCKET }}/
-      -
-        name: Update S3 config
-        if: ${{ env.DOCS_S3_BUCKET != '' && env.DOCS_S3_CONFIG != '' }}
-        uses: docker/bake-action@v6
-        with:
-          source: .
-          files: |
-            docker-bake.hcl
-          targets: aws-s3-update-config
-        env:
-          AWS_REGION: ${{ env.DOCS_AWS_REGION }}
-          AWS_S3_BUCKET: ${{ env.DOCS_S3_BUCKET }}
-          AWS_S3_CONFIG: ${{ env.DOCS_S3_CONFIG }}
       -
         name: Update Cloudfront config
         if: ${{ env.DOCS_CLOUDFRONT_ID != '' }}

.markdownlint.json

@@ -13,12 +13,13 @@
   "no-space-in-code": true,
   "no-space-in-links": true,
   "no-empty-links": true,
-  "ol-prefix": {"style": "one_or_ordered"},
+  "ol-prefix": { "style": "one_or_ordered" },
   "no-reversed-links": true,
   "reference-links-images": {
     "shortcut_syntax": false
   },
   "fenced-code-language": true,
   "table-pipe-style": true,
-  "table-column-count": true
+  "table-column-count": true,
+	"descriptive-link-text": { "prohibited_texts": ["click here","here","link","more","learn more","find out more"]}
 }

CONTRIBUTING.md

@@ -115,6 +115,7 @@ update the CLI reference docs, refer to the corresponding repository:
 - [docker/cli](https://github.com/docker/cli)
 - [docker/buildx](https://github.com/docker/buildx)
 - [docker/compose](https://github.com/docker/compose)
+- [docker/model-runner](https://github.com/docker/model-runner)
 
 Feel free to raise an issue on this repository if you're not sure how to
 proceed, and we'll help out.

Dockerfile

@@ -53,13 +53,12 @@ RUN --mount=type=cache,target=/tmp/hugo_cache \
     hugo --gc --minify -e $HUGO_ENV -b $DOCS_URL
 
 # lint lints markdown files
-FROM davidanson/markdownlint-cli2:v0.14.0 AS lint
-USER root
+FROM ghcr.io/igorshubovych/markdownlint-cli:v0.45.0 AS lint
 RUN --mount=type=bind,target=. \
-    /usr/local/bin/markdownlint-cli2 \
+    markdownlint \
     "content/**/*.md" \
-    "#content/manuals/engine/release-notes/*.md" \
-    "#content/manuals/desktop/previous-versions/*.md"
+    --ignore "content/manuals/engine/release-notes/*.md" \
+    --ignore "content/manuals/desktop/previous-versions/*.md"
 
 # test validates HTML output and checks for broken links
 FROM wjdp/htmltest:v${HTMLTEST_VERSION} AS test

_vale/config/vocabularies/Docker/accept.txt

@@ -1,11 +1,14 @@
 (?i)[A-Z]{2,}'?s
-
+jq
+ripgrep
+sandboxing
 Adreno
 Aleksandrov
 Amazon
 Anchore
 Apple
 Artifactory
+armhf
 auditable
 autolock
 Azure
@@ -36,6 +39,7 @@ config
 containerd
 Couchbase
 CouchDB
+Crowdstrike
 datacenter
 Datadog
 Ddosify
@@ -72,6 +76,7 @@ EPERM
 ESXi
 Ethernet
 exploitability
+[Ff]ailover
 Fargate
 Fedora
 firewalld
@@ -154,6 +159,7 @@ PAT
 perl
 pgAdmin
 PKG
+plaintext
 plist
 Postgres
 PowerShell
@@ -224,6 +230,7 @@ Zsh
 [Aa]gentic
 [Aa]utobuilds?
 [Aa]utotests?
+[Aa]utoscaling
 [Bb]uildx
 [Bb]uildpack(s)?
 [Bb]uildx
@@ -232,6 +239,7 @@ Zsh
 [Cc]onfigs
 [dD]eduplicate
 [Dd]ev
+[Dd]iscoverability
 [Dd]istroless
 [Ff]ilepaths?
 [Ff]iletypes?
@@ -269,6 +277,7 @@ Zsh
 [Ss]yscalls?
 [Ss]ysfs
 [Tt]eardown
+[Tt]echnographic
 [Tt]odo
 [Tt]oolchains?
 [Uu]narchived?