From 26f3556478d6db2815bf0afe3d9be03cfdbdaea2 Mon Sep 17 00:00:00 2001 From: Craig Date: Thu, 26 Sep 2024 10:05:08 -0700 Subject: [PATCH 01/26] update link wording Signed-off-by: Craig --- content/get-started/workshop/08_using_compose.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/get-started/workshop/08_using_compose.md b/content/get-started/workshop/08_using_compose.md index 90011a77d1c5..2fb2d57d4a67 100644 --- a/content/get-started/workshop/08_using_compose.md +++ b/content/get-started/workshop/08_using_compose.md @@ -36,7 +36,7 @@ In the `getting-started-app` directory, create a file named `compose.yaml`. ## Define the app service -In [part 7](./07_multi_container.md), you used the following command to start the application service. +In [part 6](./07_multi_container.md), you used the following command to start the application service. ```console $ docker run -dp 127.0.0.1:3000:3000 \ From 02e3b7bf19a269483cc22d58c376372387ca4057 Mon Sep 17 00:00:00 2001 From: felipecruz91 Date: Fri, 27 Sep 2024 11:16:29 +0200 Subject: [PATCH 02/26] chore(scout): Document CUPS CVEs in high-profile vuln policy Signed-off-by: felipecruz91 --- content/manuals/scout/policy/_index.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/content/manuals/scout/policy/_index.md b/content/manuals/scout/policy/_index.md index 596e2ec8f619..c02b196c9657 100644 --- a/content/manuals/scout/policy/_index.md +++ b/content/manuals/scout/policy/_index.md @@ -145,13 +145,17 @@ The list includes the following vulnerabilities: - [CVE-2023-38545 (cURL SOCKS5 heap buffer overflow)](https://scout.docker.com/v/CVE-2023-38545) - [CVE-2023-44487 (HTTP/2 Rapid Reset)](https://scout.docker.com/v/CVE-2023-44487) - [CVE-2024-3094 (XZ backdoor)](https://scout.docker.com/v/CVE-2024-3094) +- [CVE-2024-47176 (OpenPrinting - cups-browsed)](https://scout.docker.com/v/CVE-2024-47176) +- [CVE-2024-47076 (OpenPrinting - libcupsfilters)](https://scout.docker.com/v/CVE-2024-47076) +- [CVE-2024-47175 (OpenPrinting- libppd)](https://scout.docker.com/v/CVE-2024-47175) +- [CVE-2024-47177 (OpenPrinting - cups-filters)](https://scout.docker.com/v/CVE-2024-47177) You can configure the CVEs included in this list by creating a custom policy. Custom configuration options include: - **CVEs to avoid**: Specify the CVEs that you want to avoid in your artifacts. - Default: `CVE-2014-0160`, `CVE-2021-44228`, `CVE-2023-38545`, `CVE-2023-44487`, `CVE-2024-3094` + Default: `CVE-2014-0160`, `CVE-2021-44228`, `CVE-2023-38545`, `CVE-2023-44487`, `CVE-2024-3094`, `CVE-2024-47176`, `CVE-2024-47076`, `CVE-2024-47175`, `CVE-2024-47177` - **CISA KEV**: Enable tracking of vulnerabilities from CISA's Known Exploited Vulnerabilities (KEV) catalog From ab3b346cfc415b013adf55be3e4b6224a0335ad5 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 11:41:47 +0200 Subject: [PATCH 03/26] deps: update pagefind to v1.1.1 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- Dockerfile | 2 +- netlify.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9dafa32d3138..684f30ae1935 100644 --- a/Dockerfile +++ b/Dockerfile @@ -123,7 +123,7 @@ EOT # pagefind installs the Pagefind runtime FROM base AS pagefind -ARG PAGEFIND_VERSION=1.1.0 +ARG PAGEFIND_VERSION=1.1.1 COPY --from=build /out ./public RUN --mount=type=bind,src=pagefind.yml,target=pagefind.yml \ npx pagefind@v${PAGEFIND_VERSION} --output-path "/pagefind" diff --git a/netlify.toml b/netlify.toml index ede05520bf26..a69dd0a2fe86 100644 --- a/netlify.toml +++ b/netlify.toml @@ -9,4 +9,4 @@ HUGO_ENABLEGITINFO = "true" HUGO_ENVIRONMENT = "preview" [context.deploy-preview] -command = "hugo --gc --minify -b $DEPLOY_PRIME_URL && npx pagefind@v1.1.0" +command = "hugo --gc --minify -b $DEPLOY_PRIME_URL && npx pagefind@v1.1.1" From 55e5c95981883e46e6e4ed496faf7204b72e1b46 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 11:44:28 +0200 Subject: [PATCH 04/26] deps(dev): update markdownlint@0.35.0, markdownlint-cli2@0.14.0 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- Dockerfile | 2 +- package-lock.json | 16 ++++++++-------- package.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 684f30ae1935..fc4188ee8d47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ ARG DOCS_URL RUN hugo --gc --minify -d /out -e $HUGO_ENV -b $DOCS_URL # lint lints markdown files -FROM davidanson/markdownlint-cli2:v0.13.0 AS lint +FROM davidanson/markdownlint-cli2:v0.14.0 AS lint USER root RUN --mount=type=bind,target=. \ /usr/local/bin/markdownlint-cli2 \ diff --git a/package-lock.json b/package-lock.json index 89ee03a90653..1cfb2ae60f58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "tailwindcss": "^3.4.4" }, "devDependencies": { - "markdownlint": "^0.34.0", + "markdownlint": "^0.35.0", "prettier": "^3.3.3", "prettier-plugin-go-template": "^0.0.15", "prettier-plugin-tailwindcss": "^0.6.5" @@ -977,13 +977,13 @@ } }, "node_modules/markdownlint": { - "version": "0.34.0", - "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.34.0.tgz", - "integrity": "sha512-qwGyuyKwjkEMOJ10XN6OTKNOVYvOIi35RNvDLNxTof5s8UmyGHlCdpngRHoRGNvQVGuxO3BJ7uNSgdeX166WXw==", + "version": "0.35.0", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.35.0.tgz", + "integrity": "sha512-wgp8yesWjFBL7bycA3hxwHRdsZGJhjhyP1dSxKVKrza0EPFYtn+mHtkVy6dvP1kGSjovyG5B8yNP6Frj0UFUJg==", "dev": true, "dependencies": { "markdown-it": "14.1.0", - "markdownlint-micromark": "0.1.9" + "markdownlint-micromark": "0.1.10" }, "engines": { "node": ">=18" @@ -993,9 +993,9 @@ } }, "node_modules/markdownlint-micromark": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.9.tgz", - "integrity": "sha512-5hVs/DzAFa8XqYosbEAEg6ok6MF2smDj89ztn9pKkCtdKHVdPQuGMH7frFfYL9mLkvfFe4pTyAMffLbjf3/EyA==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.10.tgz", + "integrity": "sha512-no5ZfdqAdWGxftCLlySHSgddEjyW4kui4z7amQcGsSKfYC5v/ou+8mIQVyg9KQMeEZLNtz9OPDTj7nnTnoR4FQ==", "dev": true, "engines": { "node": ">=18" diff --git a/package.json b/package.json index da8f7f00ddcd..82b7c1b3c193 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "tailwindcss": "^3.4.4" }, "devDependencies": { - "markdownlint": "^0.34.0", + "markdownlint": "^0.35.0", "prettier": "^3.3.3", "prettier-plugin-go-template": "^0.0.15", "prettier-plugin-tailwindcss": "^0.6.5" From d3b966e9f6741d50749ba163245cb9ca7e570baa Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:04:33 +0200 Subject: [PATCH 05/26] deps: update material-symbols icons to v0.23.0 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/contribute/components/icons.md | 8 ++++---- content/manuals/admin/organization/_index.md | 2 +- content/manuals/engine/_index.md | 4 ++-- content/reference/compose-file/_index.md | 2 +- layouts/_default/_markup/render-codeblock.html | 4 ++-- layouts/partials/components/accordion.html | 4 ++-- layouts/partials/github-links.html | 2 +- layouts/partials/pagination.html | 8 ++++---- layouts/partials/sidebar/mainnav.html | 4 ++-- layouts/partials/sidebar/sections.html | 4 ++-- package-lock.json | 8 ++++---- package.json | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/content/contribute/components/icons.md b/content/contribute/components/icons.md index e32937495fe9..b89533075d26 100644 --- a/content/contribute/components/icons.md +++ b/content/contribute/components/icons.md @@ -57,11 +57,11 @@ grid: icon: "database" description: Icon name = database - title: "logs" - icon: "feed" - description: Icon name = feed + icon: "text_snippet" + description: Icon name = text_snippet - title: "Prune/cut" - icon: "cut" - description: Icon name = cut + icon: "content_cut" + description: Icon name = content_cut - title: "Configure" icon: "tune" description: Icon name = tune diff --git a/content/manuals/admin/organization/_index.md b/content/manuals/admin/organization/_index.md index 605c5eb2690d..53cec8882596 100644 --- a/content/manuals/admin/organization/_index.md +++ b/content/manuals/admin/organization/_index.md @@ -15,7 +15,7 @@ grid: link: /admin/organization/members/ - title: Activity logs description: Learn how to audit the activities of your members. - icon: feed + icon: text_snippet link: /admin/organization/activity-logs/ - title: Image Access Management description: Control which types of images your developers can pull. diff --git a/content/manuals/engine/_index.md b/content/manuals/engine/_index.md index 689e64f4fec1..6a2e265d7f9e 100644 --- a/content/manuals/engine/_index.md +++ b/content/manuals/engine/_index.md @@ -19,11 +19,11 @@ grid: link: /network - title: Container logs description: Learn how to view and read container logs. - icon: feed + icon: text_snippet link: /config/containers/logging/ - title: Prune description: Tidy up unused resources. - icon: cut + icon: content_cut link: /config/pruning - title: Configure the daemon description: Delve into the configuration options of the Docker daemon. diff --git a/content/reference/compose-file/_index.md b/content/reference/compose-file/_index.md index c85c63670ca3..f29f59f40235 100644 --- a/content/reference/compose-file/_index.md +++ b/content/reference/compose-file/_index.md @@ -10,7 +10,7 @@ toc_min: 1 grid: - title: Version and name top-level element description: Understand version and name attributes for Compose. - icon: feed + icon: text_snippet link: /reference/compose-file/version-and-name/ - title: Services top-level element description: Explore all services attributes for Compose. diff --git a/layouts/_default/_markup/render-codeblock.html b/layouts/_default/_markup/render-codeblock.html index d13518ac607f..ce6e243cb48e 100644 --- a/layouts/_default/_markup/render-codeblock.html +++ b/layouts/_default/_markup/render-codeblock.html @@ -21,7 +21,7 @@
@@ -29,7 +29,7 @@
diff --git a/layouts/partials/components/accordion.html b/layouts/partials/components/accordion.html index e5ef7c3728fb..93fc14fb302a 100644 --- a/layouts/partials/components/accordion.html +++ b/layouts/partials/components/accordion.html @@ -8,8 +8,8 @@ {{- end }} {{ .title }} - {{ partialCached "icon" "expand_less" "expand_less" }} - {{ partialCached "icon" "expand_more" "expand_more" }} + {{ partialCached "icon" "arrow_drop_up" "arrow_drop_up" }} + {{ partialCached "icon" "arrow_drop_down" "arrow_drop_down" }}
{{ markdownify .body }} diff --git a/layouts/partials/github-links.html b/layouts/partials/github-links.html index 8f3bea515bbf..b10ebe2d7faf 100644 --- a/layouts/partials/github-links.html +++ b/layouts/partials/github-links.html @@ -12,7 +12,7 @@ {{ end }} {{ end }}

- {{ partialCached "icon" "done" "done" }} + {{ partialCached "icon" "check" "check" }} {{- T "requestChanges" -}} diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index a3f203e264ae..de276f98ccc3 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -11,7 +11,7 @@

  • - {{- partialCached "icon" "navigate_before" "navigate_before" -}} + {{- partialCached "icon" "chevron_backward" "chevron_backward" -}}
    • @@ -19,7 +19,7 @@
  • - {{- partialCached "icon" "navigate_before" "navigate_before" -}} + {{- partialCached "icon" "chevron_backward" "chevron_backward" -}}
    • @@ -50,7 +50,7 @@
  • - {{- partialCached "icon" "navigate_next" "navigate_next" -}} + {{- partialCached "icon" "chevron_forward" "chevron_forward" -}}
    • @@ -58,7 +58,7 @@
  • - {{- partialCached "icon" "navigate_next" "navigate_next" -}} + {{- partialCached "icon" "chevron_forward" "chevron_forward" -}}
    • diff --git a/layouts/partials/sidebar/mainnav.html b/layouts/partials/sidebar/mainnav.html index 204d52e4ee42..cb908f00a41a 100644 --- a/layouts/partials/sidebar/mainnav.html +++ b/layouts/partials/sidebar/mainnav.html @@ -18,10 +18,10 @@
    diff --git a/layouts/partials/sidebar/sections.html b/layouts/partials/sidebar/sections.html index 78a9ae09511e..6dcb7b54c032 100644 --- a/layouts/partials/sidebar/sections.html +++ b/layouts/partials/sidebar/sections.html @@ -48,10 +48,10 @@ diff --git a/package-lock.json b/package-lock.json index 1cfb2ae60f58..be81233b2bba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@alpinejs/focus": "^3.14.1", "@alpinejs/persist": "^3.14.1", "@floating-ui/dom": "^1.6.5", - "@material-symbols/svg-400": "^0.14.6", + "@material-symbols/svg-400": "^0.23.0", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "^0.5.13", "alpinejs": "^3.14.1", @@ -142,9 +142,9 @@ } }, "node_modules/@material-symbols/svg-400": { - "version": "0.14.6", - "resolved": "https://registry.npmjs.org/@material-symbols/svg-400/-/svg-400-0.14.6.tgz", - "integrity": "sha512-4uxXEyKljpfwlEQQE5xpN0ZOLduXC3ClCkwNtsM6xy8CLkVP1x32s8BPYHrpfGdhNNnKLkl+p8vh7VBqZi8D4A==" + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/@material-symbols/svg-400/-/svg-400-0.23.0.tgz", + "integrity": "sha512-bsvGmBds729rZYOCOgxs4FjpktXfkhcprsCNPv+PRIDE3K/b30bnOsFAylUUfJ6cnHoXucS672VdNe80YIUxwA==" }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", diff --git a/package.json b/package.json index 82b7c1b3c193..16bde2bcb854 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@alpinejs/focus": "^3.14.1", "@alpinejs/persist": "^3.14.1", "@floating-ui/dom": "^1.6.5", - "@material-symbols/svg-400": "^0.14.6", + "@material-symbols/svg-400": "^0.23.0", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "^0.5.13", "alpinejs": "^3.14.1", From a9179a5086cdbb43363652bbb393b03c8bc043c4 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:05:52 +0200 Subject: [PATCH 06/26] deps: update @floating-ui/dom to v1.6.11 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index be81233b2bba..edec5cdee384 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@alpinejs/collapse": "^3.14.1", "@alpinejs/focus": "^3.14.1", "@alpinejs/persist": "^3.14.1", - "@floating-ui/dom": "^1.6.5", + "@floating-ui/dom": "^1.6.11", "@material-symbols/svg-400": "^0.23.0", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "^0.5.13", @@ -69,18 +69,18 @@ } }, "node_modules/@floating-ui/dom": { - "version": "1.6.5", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.5.tgz", - "integrity": "sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==", + "version": "1.6.11", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz", + "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==", "dependencies": { - "@floating-ui/core": "^1.0.0", - "@floating-ui/utils": "^0.2.0" + "@floating-ui/core": "^1.6.0", + "@floating-ui/utils": "^0.2.8" } }, "node_modules/@floating-ui/utils": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.1.tgz", - "integrity": "sha512-9TANp6GPoMtYzQdt54kfAyMmz1+osLlXdg2ENroU7zzrtflTLrrC/lgrIfaSe+Wu0b89GKccT7vxXA0MoAIO+Q==" + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz", + "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==" }, "node_modules/@isaacs/cliui": { "version": "8.0.2", diff --git a/package.json b/package.json index 16bde2bcb854..a074eb62cc89 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@alpinejs/collapse": "^3.14.1", "@alpinejs/focus": "^3.14.1", "@alpinejs/persist": "^3.14.1", - "@floating-ui/dom": "^1.6.5", + "@floating-ui/dom": "^1.6.11", "@material-symbols/svg-400": "^0.23.0", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "^0.5.13", From 31c573c27f7c4d0cb52d43638ea116458450ba49 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:06:34 +0200 Subject: [PATCH 07/26] deps: update autoprefixer to v10.4.20 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- package-lock.json | 68 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/package-lock.json b/package-lock.json index edec5cdee384..ab8a89c61c54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "^0.5.13", "alpinejs": "^3.14.1", - "autoprefixer": "^10.4.19", + "autoprefixer": "^10.4.20", "postcss": "^8.4.38", "postcss-cli": "^11.0.0", "postcss-import": "^16.1.0", @@ -295,9 +295,9 @@ "dev": true }, "node_modules/autoprefixer": { - "version": "10.4.19", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz", - "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==", + "version": "10.4.20", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz", + "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==", "funding": [ { "type": "opencollective", @@ -313,11 +313,11 @@ } ], "dependencies": { - "browserslist": "^4.23.0", - "caniuse-lite": "^1.0.30001599", + "browserslist": "^4.23.3", + "caniuse-lite": "^1.0.30001646", "fraction.js": "^4.3.7", "normalize-range": "^0.1.2", - "picocolors": "^1.0.0", + "picocolors": "^1.0.1", "postcss-value-parser": "^4.2.0" }, "bin": { @@ -363,9 +363,9 @@ } }, "node_modules/browserslist": { - "version": "4.23.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz", - "integrity": "sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==", + "version": "4.24.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz", + "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==", "funding": [ { "type": "opencollective", @@ -381,10 +381,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001629", - "electron-to-chromium": "^1.4.796", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.16" + "caniuse-lite": "^1.0.30001663", + "electron-to-chromium": "^1.5.28", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" }, "bin": { "browserslist": "cli.js" @@ -402,9 +402,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001636", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", - "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", + "version": "1.0.30001664", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz", + "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==", "funding": [ { "type": "opencollective", @@ -590,9 +590,9 @@ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" }, "node_modules/electron-to-chromium": { - "version": "1.4.810", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.810.tgz", - "integrity": "sha512-Kaxhu4T7SJGpRQx99tq216gCq2nMxJo+uuT6uzz9l8TVN2stL7M06MIIXAtr9jsrLs2Glflgf2vMQRepxawOdQ==" + "version": "1.5.29", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz", + "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -612,9 +612,9 @@ } }, "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "engines": { "node": ">=6" } @@ -1080,9 +1080,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==" + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==" }, "node_modules/normalize-path": { "version": "3.0.0", @@ -1156,9 +1156,9 @@ } }, "node_modules/picocolors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", - "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz", + "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==" }, "node_modules/picomatch": { "version": "2.3.1", @@ -1976,9 +1976,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz", - "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz", + "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==", "funding": [ { "type": "opencollective", @@ -1994,8 +1994,8 @@ } ], "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.1" + "escalade": "^3.2.0", + "picocolors": "^1.1.0" }, "bin": { "update-browserslist-db": "cli.js" diff --git a/package.json b/package.json index a074eb62cc89..c8fb1cbaf7f7 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "^0.5.13", "alpinejs": "^3.14.1", - "autoprefixer": "^10.4.19", + "autoprefixer": "^10.4.20", "postcss": "^8.4.38", "postcss-cli": "^11.0.0", "postcss-import": "^16.1.0", From a5d0beb21d861470dcb34f44149658846b3e2885 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:07:12 +0200 Subject: [PATCH 08/26] deps: update postcss to v8.4.47 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ab8a89c61c54..a7c44da9037f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@tailwindcss/typography": "^0.5.13", "alpinejs": "^3.14.1", "autoprefixer": "^10.4.20", - "postcss": "^8.4.38", + "postcss": "^8.4.47", "postcss-cli": "^11.0.0", "postcss-import": "^16.1.0", "tailwindcss": "^3.4.4" @@ -1188,9 +1188,9 @@ } }, "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.47", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", + "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", "funding": [ { "type": "opencollective", @@ -1207,8 +1207,8 @@ ], "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" + "picocolors": "^1.1.0", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" @@ -1660,9 +1660,9 @@ } }, "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "engines": { "node": ">=0.10.0" } diff --git a/package.json b/package.json index c8fb1cbaf7f7..2f7d7886a343 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@tailwindcss/typography": "^0.5.13", "alpinejs": "^3.14.1", "autoprefixer": "^10.4.20", - "postcss": "^8.4.38", + "postcss": "^8.4.47", "postcss-cli": "^11.0.0", "postcss-import": "^16.1.0", "tailwindcss": "^3.4.4" From 0b30dbd2318feec376db8f60f29aeb5fe9f9768f Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:07:41 +0200 Subject: [PATCH 09/26] deps: update tailwindcss to v3.4.13 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a7c44da9037f..f143c74845c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "postcss": "^8.4.47", "postcss-cli": "^11.0.0", "postcss-import": "^16.1.0", - "tailwindcss": "^3.4.4" + "tailwindcss": "^3.4.13" }, "devDependencies": { "markdownlint": "^0.35.0", @@ -1801,9 +1801,9 @@ "integrity": "sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==" }, "node_modules/tailwindcss": { - "version": "3.4.4", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz", - "integrity": "sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==", + "version": "3.4.13", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.13.tgz", + "integrity": "sha512-KqjHOJKogOUt5Bs752ykCeiwvi0fKVkr5oqsFNt/8px/tA8scFPIlkygsf6jXrfCqGHz7VflA6+yytWuM+XhFw==", "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", diff --git a/package.json b/package.json index 2f7d7886a343..ddfa3199fc30 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "postcss": "^8.4.47", "postcss-cli": "^11.0.0", "postcss-import": "^16.1.0", - "tailwindcss": "^3.4.4" + "tailwindcss": "^3.4.13" }, "devDependencies": { "markdownlint": "^0.35.0", From cac579e7602dd84e3250a815f5ac2ac6126ee8e0 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:09:08 +0200 Subject: [PATCH 10/26] deps(dev): update prettier-plugin-tailwindcss to v0.6.8 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- package-lock.json | 12 ++++++++---- package.json | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f143c74845c0..1fd80e3e0206 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "markdownlint": "^0.35.0", "prettier": "^3.3.3", "prettier-plugin-go-template": "^0.0.15", - "prettier-plugin-tailwindcss": "^0.6.5" + "prettier-plugin-tailwindcss": "^0.6.8" } }, "node_modules/@alloc/quick-lru": { @@ -1435,9 +1435,9 @@ } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.5.tgz", - "integrity": "sha512-axfeOArc/RiGHjOIy9HytehlC0ZLeMaqY09mm8YCkMzznKiDkwFzOpBvtuhuv3xG5qB73+Mj7OCe2j/L1ryfuQ==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.8.tgz", + "integrity": "sha512-dGu3kdm7SXPkiW4nzeWKCl3uoImdd5CTZEJGxyypEPL37Wj0HT2pLqjrvSei1nTeuQfO4PUfjeW5cTUNRLZ4sA==", "dev": true, "engines": { "node": ">=14.21.3" @@ -1454,6 +1454,7 @@ "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", "prettier-plugin-marko": "*", + "prettier-plugin-multiline-arrays": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-sort-imports": "*", @@ -1491,6 +1492,9 @@ "prettier-plugin-marko": { "optional": true }, + "prettier-plugin-multiline-arrays": { + "optional": true + }, "prettier-plugin-organize-attributes": { "optional": true }, diff --git a/package.json b/package.json index ddfa3199fc30..d02eb6539b37 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,6 @@ "markdownlint": "^0.35.0", "prettier": "^3.3.3", "prettier-plugin-go-template": "^0.0.15", - "prettier-plugin-tailwindcss": "^0.6.5" + "prettier-plugin-tailwindcss": "^0.6.8" } } From 79ea6e636d0db43d7bca887d8a1f270d7b90a673 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:11:46 +0200 Subject: [PATCH 11/26] deps: update hugo to v0.134.3 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- Dockerfile | 2 +- netlify.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc4188ee8d47..53dc8abb5087 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN npm install # hugo downloads and extracts the Hugo binary FROM base AS hugo -ARG HUGO_VERSION=0.132.0 +ARG HUGO_VERSION=0.134.3 ARG TARGETARCH WORKDIR /tmp/hugo RUN wget -O "hugo.tar.gz" "https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-${TARGETARCH}.tar.gz" diff --git a/netlify.toml b/netlify.toml index a69dd0a2fe86..05b792caa331 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ publish = "public" [context.deploy-preview.environment] NODE_VERSION = "20" NODE_ENV = "production" -HUGO_VERSION = "0.132.0" +HUGO_VERSION = "0.134.3" HUGO_ENABLEGITINFO = "true" HUGO_ENVIRONMENT = "preview" From ae74c20dde54fda74d19dfba0b37d3c2d8057868 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:15:42 +0200 Subject: [PATCH 12/26] deps: update go to v1.23 Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- Dockerfile | 2 +- go.mod | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 53dc8abb5087..58f4768e1c1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # ALPINE_VERSION sets the Alpine Linux version for all Alpine stages ARG ALPINE_VERSION=3.20 # GO_VERSION sets the Go version for the base stage -ARG GO_VERSION=1.22 +ARG GO_VERSION=1.23 # HTML_TEST_VERSION sets the wjdp/htmltest version for HTML testing ARG HTMLTEST_VERSION=0.17.0 diff --git a/go.mod b/go.mod index f3b04359a2e9..e40c802f8750 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/docker/docs -go 1.21.0 - -toolchain go1.22.5 +go 1.23.1 require ( github.com/docker/buildx v0.17.0 // indirect From 183b0dcdd09487e8451377abb52ff5b2cd532ad8 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:28:32 +0200 Subject: [PATCH 13/26] vale: improve ignores for hugo markup Shortcode tags spanning over multiple lines were not being ignored Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- .vale.ini | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.vale.ini b/.vale.ini index c8101f4fb288..710e13b2ff2f 100644 --- a/.vale.ini +++ b/.vale.ini @@ -3,7 +3,15 @@ MinAlertLevel = suggestion Vocab = Docker -Packages = Hugo - [*.md] BasedOnStyles = Vale, Docker +# Exclude `{{< ... >}}`, `{{% ... %}}`, [Who]({{< ... >}}) +TokenIgnores = ({{[%<] .* [%>]}}.*?{{[%<] ?/.* [%>]}}), \ +(\[.+\]\({{< .+ >}}\)), \ +[^\S\r\n]({{[%<] \w+ .+ [%>]}})\s, \ +[^\S\r\n]({{[%<](?:/\*) .* (?:\*/)[%>]}})\s, \ +(?sm)({{[%<] .*?\s[%>]}}) + +# Exclude `{{< myshortcode `This is some HTML, ... >}}` +BlockIgnores = (?sm)^({{[%<] \w+ [^{]*?\s[%>]}})\n$, \ +(?s) *({{< highlight [^>]* ?>}}.*?{{< ?/ ?highlight >}}) From 3cbec0b9f5d41bcc4b8463d1cf911ffe98753e90 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:29:13 +0200 Subject: [PATCH 14/26] vale: fix TLA detection for Acronyms rule The Acronyms rule was not consistently detecting TLAs Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- _vale/Docker/Acronyms.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_vale/Docker/Acronyms.yml b/_vale/Docker/Acronyms.yml index 337fe998a1de..e9b451a3c36f 100644 --- a/_vale/Docker/Acronyms.yml +++ b/_vale/Docker/Acronyms.yml @@ -4,8 +4,8 @@ link: https://docs.docker.com/contribute/style/grammar/#acronyms-and-initialisms level: warning ignorecase: false # Ensures that the existence of 'first' implies the existence of 'second'. -first: '\b[^!]([A-Z]{3,5})\b' -second: '(?:\b[A-Za-z]+(?: |\n))+\(([A-Z]{3,5})\)' +first: '\b([A-Z]{3,5})\b' +second: '(?:\b[A-Z][a-z]+ )+\(([A-Z]{3,5})\)' # ... with the exception of these: exceptions: - API From a634846f29aff62266ec5d3ca4b1672aa228e5e2 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:35:32 +0200 Subject: [PATCH 15/26] vale: add some common TLAs Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- _vale/Docker/Acronyms.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/_vale/Docker/Acronyms.yml b/_vale/Docker/Acronyms.yml index e9b451a3c36f..81b0e6d7d251 100644 --- a/_vale/Docker/Acronyms.yml +++ b/_vale/Docker/Acronyms.yml @@ -11,6 +11,7 @@ exceptions: - API - ARM - ASP + - AUFS - AWS - BIOS - CLI @@ -45,6 +46,7 @@ exceptions: - LESS - LLDB - NET + - NFS - NOTE - NVDA - OSS @@ -62,6 +64,7 @@ exceptions: - SCSS - SDK - SQL + - SSD - SSH - SSL - SVG @@ -72,6 +75,7 @@ exceptions: - URI - URL - USB + - USD - UTF - VAT - WSL From 564705bb739b4a542abb064c165d507d5c9a42c2 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:37:10 +0200 Subject: [PATCH 16/26] vale: ignore "TIP" TLA (because it's used in "tip" alerts) Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- _vale/Docker/Acronyms.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_vale/Docker/Acronyms.yml b/_vale/Docker/Acronyms.yml index 81b0e6d7d251..c1fa32d44838 100644 --- a/_vale/Docker/Acronyms.yml +++ b/_vale/Docker/Acronyms.yml @@ -70,6 +70,7 @@ exceptions: - SVG - TBD - TCP + - TIP - TODO - TTY - URI From 6eae55dca844deed0ebe2f6ef1a44de8904ff754 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:37:32 +0200 Subject: [PATCH 17/26] chore: fix some lint warnings in devicemapper docs Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- .../storage/drivers/device-mapper-driver.md | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/content/manuals/engine/storage/drivers/device-mapper-driver.md b/content/manuals/engine/storage/drivers/device-mapper-driver.md index d87da68950bb..3b0dfb29d34e 100644 --- a/content/manuals/engine/storage/drivers/device-mapper-driver.md +++ b/content/manuals/engine/storage/drivers/device-mapper-driver.md @@ -145,10 +145,11 @@ After you have satisfied the [prerequisites](#prerequisites), follow the steps below to configure Docker to use the `devicemapper` storage driver in `direct-lvm` mode. -> [!WARNING]: Changing the storage driver makes any containers you have already - created inaccessible on the local system. Use `docker save` to save containers, - and push existing images to Docker Hub or a private repository, so you do not - need to recreate them later. +> [!WARNING] +> Changing the storage driver makes any containers you have already +> created inaccessible on the local system. Use `docker save` to save containers, +> and push existing images to Docker Hub or a private repository, so you do not +> need to recreate them later. #### Allow Docker to configure direct-lvm mode @@ -191,8 +192,9 @@ See all storage options for each storage driver in the Restart Docker for the changes to take effect. Docker invokes the commands to configure the block device for you. -> [!WARNING]: Changing these values after Docker has prepared the block device -> for you is not supported and causes an error. +> [!WARNING] +> Changing these values after Docker has prepared the block device for you is +> not supported and causes an error. You still need to [perform periodic maintenance tasks](#manage-devicemapper). @@ -227,8 +229,9 @@ assumes that the Docker daemon is in the `stopped` state. 4. Create a physical volume on your block device from step 1, using the `pvcreate` command. Substitute your device name for `/dev/xvdf`. - > [!WARNING]: The next few steps are destructive, so be sure that you have - > specified the correct device! + > [!WARNING] + > The next few steps are destructive, so be sure that you have specified + > the correct device. ```console $ sudo pvcreate /dev/xvdf @@ -651,7 +654,8 @@ $ sudo lvchange -ay docker/thinpool ## How the `devicemapper` storage driver works -> [!WARNING]: Do not directly manipulate any files or directories within +> [!WARNING] +> Do not directly manipulate any files or directories within > `/var/lib/docker/`. These files and directories are managed by Docker. Use the `lsblk` command to see the devices and their pools, from the operating @@ -835,7 +839,7 @@ storage driver. files generated by a container are still stored in Docker's dataroot directory, by default `/var/lib/docker`. If your containers generate lots of log messages, this may lead to increased disk usage or the inability to manage your system due - to a full disk. You can configure a + to a full disk. You can configure a [log driver](/manuals/engine/logging/configure.md) to store your container logs externally. From ed52f03cb65b58ee33553e61d6531a45631b1137 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:39:06 +0200 Subject: [PATCH 18/26] vale: add snapshotter(s) to vocabulary Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- _vale/config/vocabularies/Docker/accept.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_vale/config/vocabularies/Docker/accept.txt b/_vale/config/vocabularies/Docker/accept.txt index b6c03f848c08..0bbe9e80bd70 100644 --- a/_vale/config/vocabularies/Docker/accept.txt +++ b/_vale/config/vocabularies/Docker/accept.txt @@ -1,5 +1,6 @@ A?GPL(v3)? APIs? +snapshotters? ARM Netplan AWS From 7a8b36eac443e3fa9d5de738427d4f2bf24d0da6 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:39:32 +0200 Subject: [PATCH 19/26] chore: sort vocabulary accept.txt Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- _vale/config/vocabularies/Docker/accept.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_vale/config/vocabularies/Docker/accept.txt b/_vale/config/vocabularies/Docker/accept.txt index 0bbe9e80bd70..d4c7fa9541bf 100644 --- a/_vale/config/vocabularies/Docker/accept.txt +++ b/_vale/config/vocabularies/Docker/accept.txt @@ -1,8 +1,6 @@ A?GPL(v3)? APIs? -snapshotters? ARM -Netplan AWS Admin Console Amazon @@ -36,7 +34,6 @@ Ddosify Debootstrap Dev Environments? Django -Docker's Docker Build Cloud Docker Business Docker Dasboard @@ -46,6 +43,7 @@ Docker Extension Docker Hub Docker Scout Docker Team +Docker's Docker-Sponsored Open Source Dockerfile Dockerize @@ -84,6 +82,7 @@ Mail(chimp|gun) Microsoft MySQL NAT +Netplan Nginx Nuxeo OAuth @@ -177,6 +176,7 @@ npm osquery osxfs runc +snapshotters? stdin stdout subnet From e6af3527cb4ce9ba31b47889fd24b066dc7b3449 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Fri, 27 Sep 2024 14:40:18 +0200 Subject: [PATCH 20/26] vale: add Btrfs to vocabulary Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- _vale/config/vocabularies/Docker/accept.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/_vale/config/vocabularies/Docker/accept.txt b/_vale/config/vocabularies/Docker/accept.txt index d4c7fa9541bf..35a06b4664e0 100644 --- a/_vale/config/vocabularies/Docker/accept.txt +++ b/_vale/config/vocabularies/Docker/accept.txt @@ -11,6 +11,7 @@ Artifactory Autobuild Autotest Azure +Btrfs BuildKit BusyBox CISA From 2966d9d28e8f893b909cd1fad0fc97876c0b1a64 Mon Sep 17 00:00:00 2001 From: crazy-max <1951866+crazy-max@users.noreply.github.com> Date: Fri, 13 Sep 2024 15:54:02 +0000 Subject: [PATCH 21/26] vendor: github.com/docker/buildx v0.17.1 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- _vendor/modules.txt | 2 +- go.mod | 4 ++-- go.sum | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 6bd7896d1e6b..ef5eccf8c37b 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/moby/moby v27.3.1+incompatible # github.com/moby/buildkit v0.16.0 -# github.com/docker/buildx v0.17.0 +# github.com/docker/buildx v0.17.1 # github.com/docker/cli v27.3.1+incompatible # github.com/docker/compose/v2 v2.29.6 # github.com/docker/scout-cli v1.13.0 diff --git a/go.mod b/go.mod index f3b04359a2e9..26ec549be399 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21.0 toolchain go1.22.5 require ( - github.com/docker/buildx v0.17.0 // indirect + github.com/docker/buildx v0.17.1 // indirect github.com/docker/cli v27.3.1+incompatible // indirect github.com/docker/compose/v2 v2.29.6 // indirect github.com/docker/scout-cli v1.13.0 // indirect @@ -14,7 +14,7 @@ require ( ) replace ( - github.com/docker/buildx => github.com/docker/buildx v0.17.0 + github.com/docker/buildx => github.com/docker/buildx v0.17.1 github.com/docker/cli => github.com/docker/cli v27.3.1+incompatible github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.29.2 github.com/docker/scout-cli => github.com/docker/scout-cli v1.13.0 diff --git a/go.sum b/go.sum index ffb89661e209..8259a1d72de5 100644 --- a/go.sum +++ b/go.sum @@ -80,6 +80,8 @@ github.com/docker/buildx v0.16.2 h1:SPcyEiiCZEntJQ+V0lJI8ZudUrki2v1qUqmC/NqxDDs= github.com/docker/buildx v0.16.2/go.mod h1:by+CuE4Q+2NvECkIhNcWe89jjbHADCrDlzS9MRgbv2k= github.com/docker/buildx v0.17.0 h1:Z+QQxsJJPldaeU/4aNXoudFwDDK0/ALFYmDcP5q5fiY= github.com/docker/buildx v0.17.0/go.mod h1:sBKkoZFs+R2D6ARyQ4/GE/FQHHFsl9PkHdvv/GXAsMo= +github.com/docker/buildx v0.17.1 h1:9ob2jGp4+W9PxWw68GsoNFp+eYFc7eUoRL9VljLCSM4= +github.com/docker/buildx v0.17.1/go.mod h1:kJOhOhS47LRvrLFRulFiO5SE6VJf54yYMn7DzjgO5W0= github.com/docker/cli v24.0.2+incompatible h1:QdqR7znue1mtkXIJ+ruQMGQhpw2JzMJLRXp6zpzF6tM= github.com/docker/cli v24.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v24.0.4+incompatible h1:Y3bYF9ekNTm2VFz5U/0BlMdJy73D+Y1iAAZ8l63Ydzw= From fbacec6a47ff709a1e3025a7463f16df9e463b51 Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Sun, 29 Sep 2024 19:46:40 -0400 Subject: [PATCH 22/26] update shown contents of Spring project The Dockerfile and Dockerfile.multi are created in later steps. The `springbootdocker` directory appears to be named `spring_boot_docker` in current download. --- .../docker-concepts/building-images/multi-stage-builds.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/content/get-started/docker-concepts/building-images/multi-stage-builds.md b/content/get-started/docker-concepts/building-images/multi-stage-builds.md index 6ddc5522e2d8..f2c90777bb8e 100644 --- a/content/get-started/docker-concepts/building-images/multi-stage-builds.md +++ b/content/get-started/docker-concepts/building-images/multi-stage-builds.md @@ -75,8 +75,6 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create ```plaintext spring-boot-docker - ├── Dockerfile - ├── Dockerfile.multi ├── HELP.md ├── mvnw ├── mvnw.cmd @@ -86,7 +84,7 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create │ ├── java │ │ └── com │ │ └── example - │ │ └── springbootdocker + │ │ └── spring_boot_docker │ │ └── SpringBootDockerApplication.java │ └── resources │ ├── application.properties @@ -96,10 +94,10 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create └── java └── com └── example - └── springbootdocker + └── spring_boot_docker └── SpringBootDockerApplicationTests.java - 15 directories, 9 files + 15 directories, 7 files ``` The `src/main/java` directory contains your project's source code, the `src/test/java` directory From acb62e77fc9aaefe49eb75ae20a3993f4a3e16a1 Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Sun, 29 Sep 2024 19:49:22 -0400 Subject: [PATCH 23/26] fix references of `springbootdocker` Directory is `spring_boot_docker`, not `springbootdocker` --- .../docker-concepts/building-images/multi-stage-builds.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/get-started/docker-concepts/building-images/multi-stage-builds.md b/content/get-started/docker-concepts/building-images/multi-stage-builds.md index f2c90777bb8e..ea8f51710f70 100644 --- a/content/get-started/docker-concepts/building-images/multi-stage-builds.md +++ b/content/get-started/docker-concepts/building-images/multi-stage-builds.md @@ -110,12 +110,12 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create 4. Create a RESTful web service that displays "Hello World!". - Under the `src/main/java/com/example/springbootdocker/` directory, you can modify your + Under the `src/main/java/com/example/spring_boot_docker/` directory, you can modify your `SpringBootDockerApplication.java` file with the following content: ```java - package com.example.springbootdocker; + package com.example.spring_boot_docker; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -139,7 +139,7 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create } ``` - The `SpringbootDockerApplication.java` file starts by declaring your `com.example.springbootdocker` package and importing necessary Spring frameworks. This Java file creates a simple Spring Boot web application that responds with "Hello World" when a user visits its homepage. + The `SpringbootDockerApplication.java` file starts by declaring your `com.example.spring_boot_docker` package and importing necessary Spring frameworks. This Java file creates a simple Spring Boot web application that responds with "Hello World" when a user visits its homepage. ### Create the Dockerfile From 3c5df97494a67d68fc177d74cc5f728f6ffa96dc Mon Sep 17 00:00:00 2001 From: Kevin Albertson Date: Sun, 29 Sep 2024 19:57:41 -0400 Subject: [PATCH 24/26] update rendered output --- .../building-images/multi-stage-builds.md | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/content/get-started/docker-concepts/building-images/multi-stage-builds.md b/content/get-started/docker-concepts/building-images/multi-stage-builds.md index ea8f51710f70..f50bd040dc85 100644 --- a/content/get-started/docker-concepts/building-images/multi-stage-builds.md +++ b/content/get-started/docker-concepts/building-images/multi-stage-builds.md @@ -236,20 +236,21 @@ Now that you have the project, you’re ready to create the `Dockerfile`. You'll then see output similar to the following in the container log: ```plaintext - [INFO] --- spring-boot:3.3.0-M3:run (default-cli) @ spring-boot-docker --- + [INFO] --- spring-boot:3.3.4:run (default-cli) @ spring-boot-docker --- [INFO] Attaching agents: [] - . ____ _ __ _ _ - /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ - ( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \ - \\/ ___)| |_)| | | | | || (_| | ) ) ) ) - ' |____| .__|_| |_|_| |_\__, | / / / / - =========|_|==============|___/=/_/_/_/ - - :: Spring Boot :: (v3.3.0-M3) - - 2024-04-04T15:36:47.202Z INFO 42 --- [spring-boot-docker] [ main] - c.e.s.SpringBootDockerApplication : Starting SpringBootDockerApplication using Java - 21.0.2 with PID 42 (/app/target/classes started by root in /app) + + . ____ _ __ _ _ + /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ + ( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \ + \\/ ___)| |_)| | | | | || (_| | ) ) ) ) + ' |____| .__|_| |_|_| |_\__, | / / / / + =========|_|==============|___/=/_/_/_/ + + :: Spring Boot :: (v3.3.4) + + 2024-09-29T23:54:07.157Z INFO 159 --- [spring-boot-docker] [ main] + c.e.s.SpringBootDockerApplication : Starting SpringBootDockerApplication using Java + 21.0.2 with PID 159 (/app/target/classes started by root in /app) …. ``` From 365dac4bdb402ff92c72c177ed453753b90ef5c6 Mon Sep 17 00:00:00 2001 From: Craig Gumbley Date: Mon, 30 Sep 2024 09:34:57 +0100 Subject: [PATCH 25/26] msi: FAQ for MDM installs (#21024) * msi: FAQ for MDM installs * Tweak group guidance Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> --------- Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> --- content/manuals/desktop/install/msi/faq.md | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/content/manuals/desktop/install/msi/faq.md b/content/manuals/desktop/install/msi/faq.md index f99d10ac00aa..94565b4c8e6f 100644 --- a/content/manuals/desktop/install/msi/faq.md +++ b/content/manuals/desktop/install/msi/faq.md @@ -42,3 +42,35 @@ You can suppress reboots by using the `/norestart` option when launching the ins ```powershell msiexec /i "DockerDesktop.msi" /L*V ".\msi.log" /norestart ``` + +### Why isn't the `docker-users` group populated when the MSI is installed with Intune or another MDM solution? + +It's common for MDM solutions to install applications in the context of the system account. This means that the `docker-users` group isn't populated with the user's account, as the system account doesn't have access to the user's context. + +As an example, you can reproduce this by running the installer with `psexec` in an elevated command prompt: + +```powershell +psexec -i -s msiexec /i "DockerDesktop.msi" +``` +The installation should complete successfully, but the `docker-users` group won't be populated. + +As a workaround, you can create a script that runs in the context of the user account. + +The script would be responsible for creating the `docker-users` group and populating it with the correct user. + +Here's an example script that creates the `docker-users` group and adds the current user to it (requirements may vary depending on environment): + +```powershell +$Group = "docker-users" +$CurrentUser = [System.Security.Principal.WindowsIdentity]::GetCurrent().Name + +# Create the group +New-LocalGroup -Name $Group + +# Add the user to the group +Add-LocalGroupMember -Group $Group -Member $CurrentUser +``` + +> [!NOTE] +> +> After adding a new user to the `docker-users` group, the user must sign out and then sign back in for the changes to take effect. \ No newline at end of file From d355d226c0a0d676184cbcf04b8a0ff461c3aa35 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:31:00 +0200 Subject: [PATCH 26/26] =?UTF-8?q?scout:=20"CVEs=20to=20avoid"=20=E2=86=92?= =?UTF-8?q?=20"Excluded=20CVEs"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/manuals/scout/policy/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manuals/scout/policy/_index.md b/content/manuals/scout/policy/_index.md index c02b196c9657..afed23f95d7b 100644 --- a/content/manuals/scout/policy/_index.md +++ b/content/manuals/scout/policy/_index.md @@ -153,9 +153,9 @@ The list includes the following vulnerabilities: You can configure the CVEs included in this list by creating a custom policy. Custom configuration options include: -- **CVEs to avoid**: Specify the CVEs that you want to avoid in your artifacts. +- **Excluded CVEs**: Specify the CVEs that you want this policy to ignore. - Default: `CVE-2014-0160`, `CVE-2021-44228`, `CVE-2023-38545`, `CVE-2023-44487`, `CVE-2024-3094`, `CVE-2024-47176`, `CVE-2024-47076`, `CVE-2024-47175`, `CVE-2024-47177` + Default: `[]` (none of the high-profile CVEs are ignored) - **CISA KEV**: Enable tracking of vulnerabilities from CISA's Known Exploited Vulnerabilities (KEV) catalog