Skip to content

Commit 5e07ea5

Browse files
authored
Merge pull request #21433 from docker/published-update
publish updates from main
2 parents 09fae09 + 5b23d3e commit 5e07ea5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+558
-151
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@
3737

3838
/content/manuals/accounts/ @sarahsanders-docker
3939

40+
/hack @dvdksn

.github/labeler.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ area/release:
22
- changed-files:
33
- any-glob-to-any-file:
44
- .github/**
5-
- _releaser/**
5+
- hack/releaser/**
66
- netlify.toml
77

88
area/config:
@@ -14,6 +14,7 @@ area/config:
1414
- docker-bake.hcl
1515
- hugo.yaml
1616
- pagefind.yml
17+
- hack/vendor
1718

1819
area/contrib:
1920
- changed-files:
@@ -28,7 +29,7 @@ area/tests:
2829
- .markdownlint.json
2930
- .vale.ini
3031
- _vale/**
31-
- scripts/test_*
32+
- hack/test/*
3233

3334
area/build:
3435
- changed-files:
@@ -183,3 +184,4 @@ dependencies:
183184
- go.sum
184185
- package*.json
185186
- _vendor/**
187+
- hack/vendor

Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,7 @@ RUN htmltest
110110
FROM alpine:${ALPINE_VERSION} AS unused-media
111111
RUN apk add --no-cache fd ripgrep
112112
WORKDIR /test
113-
RUN --mount=type=bind,target=. <<"EOT"
114-
set -ex
115-
./scripts/test_unused_media.sh
116-
EOT
113+
RUN --mount=type=bind,target=. ./hack/test/unused_media
117114

118115
# path-warnings checks for duplicate target paths
119116
FROM build-base AS path-warnings
@@ -145,7 +142,7 @@ RUN apk add yq
145142
COPY --from=build /project/public ./public
146143
RUN --mount=type=bind,target=. <<"EOT"
147144
set -ex
148-
./scripts/test_go_redirects.sh
145+
./hack/test/go_redirects
149146
EOT
150147

151148
# release is an empty scratch image with only compiled assets

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.PHONY: vendor
22
vendor: ## vendor hugo modules
3-
./scripts/vendor.sh
3+
./hack/vendor

_vale/Docker/Acronyms.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ exceptions:
1515
- AUFS
1616
- AWS
1717
- BIOS
18+
- CI
1819
- CISA
1920
- CLI
2021
- CNCF

_vale/config/vocabularies/Docker/accept.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Amazon
33
Anchore
44
Apple
55
Artifactory
6-
Autobuild
76
Autotest
87
Azure
98
Btrfs
@@ -93,6 +92,7 @@ Windows
9392
WireMock
9493
Zscaler
9594
Zsh
95+
[Aa]utobuild
9696
[Bb]uildx
9797
[Cc]odenames?
9898
[Cc]ompose
@@ -105,6 +105,7 @@ Zsh
105105
[Kk]eyrings?
106106
[Ll]oopback
107107
[Mm]oby
108+
[Nn]amespace
108109
[Oo]nboarding
109110
[Pp]aravirtualization
110111
[Pp]roxied
@@ -139,6 +140,7 @@ macOS
139140
macvlan
140141
mfsymlinks
141142
minikube
143+
monorepos?
142144
musl
143145
nameserver
144146
namespace

content/get-started/get-docker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ section and choose the best installation path for you.
5050
{{< card
5151
title="Docker Desktop for Linux"
5252
description="A native Linux application that delivers all Docker tools to your Linux computer."
53-
link="/desktop/install/linux/"
53+
link="/desktop/setup/install/linux/"
5454
icon="/assets/images/linux_48.svg" >}}
5555

5656
> [!NOTE]

content/get-started/introduction/get-docker-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ This guide will walk you through the installation process, enabling you to exper
4242

4343
{{< card
4444
title="Docker Desktop for Linux"
45-
description="[Install instructions](/desktop/install/linux/)"
45+
description="[Install instructions](/desktop/setup/install/linux/)"
4646
icon="/assets/images/linux_48.svg" >}}
4747

4848
Once it's installed, complete the setup process and you're all set to run a Docker container.

content/get-started/workshop/09_image_best.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Look at the following Dockerfile you created for the getting started app.
6161

6262
```dockerfile
6363
# syntax=docker/dockerfile:1
64-
FROM node:18-alpine
64+
FROM node:lts-alpine
6565
WORKDIR /app
6666
COPY . .
6767
RUN yarn install --production
@@ -81,7 +81,7 @@ dependencies if there was a change to the `package.json`.
8181

8282
```dockerfile
8383
# syntax=docker/dockerfile:1
84-
FROM node:18-alpine
84+
FROM node:lts-alpine
8585
WORKDIR /app
8686
COPY package.json yarn.lock ./
8787
RUN yarn install --production
@@ -103,10 +103,10 @@ dependencies if there was a change to the `package.json`.
103103
=> => transferring dockerfile: 175B
104104
=> [internal] load .dockerignore
105105
=> => transferring context: 2B
106-
=> [internal] load metadata for docker.io/library/node:18-alpine
106+
=> [internal] load metadata for docker.io/library/node:lts-alpine
107107
=> [internal] load build context
108108
=> => transferring context: 53.37MB
109-
=> [1/5] FROM docker.io/library/node:18-alpine
109+
=> [1/5] FROM docker.io/library/node:lts-alpine
110110
=> CACHED [2/5] WORKDIR /app
111111
=> [3/5] COPY package.json yarn.lock ./
112112
=> [4/5] RUN yarn install --production
@@ -127,10 +127,10 @@ dependencies if there was a change to the `package.json`.
127127
=> => transferring dockerfile: 37B
128128
=> [internal] load .dockerignore
129129
=> => transferring context: 2B
130-
=> [internal] load metadata for docker.io/library/node:18-alpine
130+
=> [internal] load metadata for docker.io/library/node:lts-alpine
131131
=> [internal] load build context
132132
=> => transferring context: 450.43kB
133-
=> [1/5] FROM docker.io/library/node:18-alpine
133+
=> [1/5] FROM docker.io/library/node:lts-alpine
134134
=> CACHED [2/5] WORKDIR /app
135135
=> CACHED [3/5] COPY package.json yarn.lock ./
136136
=> CACHED [4/5] RUN yarn install --production
@@ -182,7 +182,7 @@ for your production build. You can ship the static resources in a static nginx c
182182

183183
```dockerfile
184184
# syntax=docker/dockerfile:1
185-
FROM node:18 AS build
185+
FROM node:lts AS build
186186
WORKDIR /app
187187
COPY package* yarn.lock ./
188188
RUN yarn install
@@ -194,7 +194,7 @@ FROM nginx:alpine
194194
COPY --from=build /app/build /usr/share/nginx/html
195195
```
196196

197-
In the previous Dockerfile example, it uses the `node:18` image to perform the build (maximizing layer caching) and then copies the output
197+
In the previous Dockerfile example, it uses the `node:lts` image to perform the build (maximizing layer caching) and then copies the output
198198
into an nginx container.
199199

200200
## Summary

content/guides/admin-set-up/finalize-plans-and-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ You can also enable [SCIM](/manuals/security/for-admins/provisioning/scim.md) fo
2828

2929
### Set up free tier Docker product entitlements included in the subscription
3030

31-
[Docker Build Cloud](/manuals/build-cloud/_index.md) significantly reduces build times, both locally and in CI, by providing a dedicated remote builder and shared cache. Powered by the cloud, developer time and local resources are freed up so your team can focus on more important things, like innovation. To get started, [set up a cloud builder](http://build.docker.com).
31+
[Docker Build Cloud](/manuals/build-cloud/_index.md) significantly reduces build times, both locally and in CI, by providing a dedicated remote builder and shared cache. Powered by the cloud, developer time and local resources are freed up so your team can focus on more important things, like innovation. To get started, [set up a cloud builder](https://app.docker.com/build/).
3232

3333
[Docker Scout](manuals/scout/_index.md) is a solution for proactively enhancing your software supply chain security. By analyzing your images, Docker Scout compiles an inventory of components, also known as a Software Bill of Materials (SBOM). The SBOM is matched against a continuously updated vulnerability database to pinpoint security weaknesses. To get started, see [Quickstart](/manuals/scout/quickstart.md).
3434

0 commit comments

Comments
 (0)