Skip to content

Commit 568c0a0

Browse files
Merge branch 'main' of github-private.com:kristiyan-velkov/docker-docs into feat/update-node-js-guide
2 parents 061c143 + d2430dd commit 568c0a0

File tree

109 files changed

+4795
-365
lines changed

Some content is hidden

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

109 files changed

+4795
-365
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929

3030
/content/manuals/security/ @aevesdocker @sarahsanders-docker
3131

32-
/content/manuals/trusted-content/ @craig-osterhout
33-
34-
/content/manuals/docker-hub/official_images/ @craig-osterhout
35-
36-
/content/manuals/registry/ @craig-osterhout
37-
3832
/content/manuals/admin/ @sarahsanders-docker
3933

4034
/content/manuals/billing/ @sarahsanders-docker
@@ -44,3 +38,7 @@
4438
/content/manuals/ai/ @ArthurFlag
4539

4640
/_vendor @sarahsanders-docker @ArthurFlag
41+
42+
/content/manuals/cloud/ @craig-osterhout
43+
44+
/content/manuals/dhi/ @craig-osterhout

.github/labeler.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ area/build-cloud:
5050
- any-glob-to-any-file:
5151
- content/manuals/build-cloud/**
5252

53+
area/cloud:
54+
- changed-files:
55+
- any-glob-to-any-file:
56+
- content/manuals/cloud/**
57+
5358
area/compose:
5459
- changed-files:
5560
- any-glob-to-any-file:
@@ -62,6 +67,11 @@ area/desktop:
6267
- any-glob-to-any-file:
6368
- content/manuals/desktop/**
6469

70+
area/dhi:
71+
- changed-files:
72+
- any-glob-to-any-file:
73+
- content/manuals/dhi/**
74+
6575
area/engine:
6676
- changed-files:
6777
- any-glob-to-any-file:

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ jobs:
9191
- test-go-redirects
9292
- dockerfile-lint
9393
- path-warnings
94+
- validate-vendor
9495
steps:
9596
-
9697
name: Set up Docker Buildx

.markdownlint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"no-space-in-code": true,
1414
"no-space-in-links": true,
1515
"no-empty-links": true,
16-
"ol-prefix": {"style": "ordered"},
16+
"ol-prefix": {"style": "one_or_ordered"},
1717
"no-reversed-links": true,
1818
"reference-links-images": {
1919
"shortcut_syntax": false

.vscode/docker.code-snippets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@
5454
"body": ["{{< button url=\"$1\" text=\"$2\" >}}"],
5555
"description": "Insert a Hugo button",
5656
},
57-
}
57+
}

Dockerfile

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ RUN apk add --no-cache \
1414
git \
1515
nodejs \
1616
npm \
17-
gcompat
17+
gcompat \
18+
rsync
1819

1920
# npm downloads Node.js dependencies
2021
FROM base AS npm
@@ -87,6 +88,22 @@ FROM scratch AS vendor
8788
COPY --from=update-modules /project/_vendor /_vendor
8889
COPY --from=update-modules /project/go.* /
8990

91+
FROM base AS validate-vendor
92+
RUN --mount=target=/context \
93+
--mount=type=bind,from=vendor,target=/out \
94+
--mount=target=.,type=tmpfs <<EOT
95+
set -e
96+
rsync -a /context/. .
97+
git add -A
98+
rm -rf _vendor
99+
cp -rf /out/* .
100+
if [ -n "$(git status --porcelain -- go.mod go.sum _vendor)" ]; then
101+
echo >&2 'ERROR: Vendor result differs. Please vendor your package with "make vendor"'
102+
git status --porcelain -- go.mod go.sum _vendor
103+
exit 1
104+
fi
105+
EOT
106+
90107
# build-upstream builds an upstream project with a replacement module
91108
FROM build-base AS build-upstream
92109
# UPSTREAM_MODULE_NAME is the canonical upstream repository name and namespace (e.g. moby/buildkit)

_vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# github.com/moby/buildkit v0.22.0
33
# github.com/docker/buildx v0.24.0
44
# github.com/docker/cli v28.2.2+incompatible
5-
# github.com/docker/compose/v2 v2.37.0
5+
# github.com/docker/compose/v2 v2.37.1
66
# github.com/docker/model-cli v0.1.26-0.20250527144806-15d0078a3c01
77
# github.com/docker/scout-cli v1.15.0

assets/css/global.css

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,6 @@ input[type="search"]::-moz-search-cancel-button {
3939
input[type="search"]::-ms-clear {
4040
display: none;
4141
}
42-
.prose {
43-
code {
44-
@apply !bg-gray-100;
45-
}
46-
& .highlight,
47-
& :not(pre) > code {
48-
.dark & {
49-
background: var(--color-gray-900) !important;
50-
border-color: var(--color-gray-700) !important;
51-
}
52-
}
53-
}
5442

5543
.prose {
5644
li {

assets/css/syntax-dark.css

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,13 @@
1616
min-width: fit-content;
1717
background-color: var(--color-gray-800);
1818
}
19-
.lntd:first-child .hl,
20-
& > .chroma > code > .hl {
21-
margin-left: -4px;
22-
border-left: 4px solid var(--color-gray-900);
23-
}
2419
/* LineNumbersTable */
2520
.lnt {
2621
white-space: pre;
2722
user-select: none;
2823
margin-right: 0.4em;
2924
padding: 0 0.4em 0 0.4em;
30-
color: var(--color-gray-900);
25+
color: var(--color-gray-300);
3126
}
3227
/* LineNumbers */
3328
.ln {

assets/css/syntax-light.css

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@
1414
/* LineHighlight */
1515
.hl {
1616
min-width: fit-content;
17-
background-color: var(--color-blue-100);
18-
}
19-
.lntd:first-child .hl,
20-
& > .chroma > code > .hl {
21-
margin-left: -4px;
22-
border-left: 4px solid var(--color-blue-300);
17+
background-color: var(--color-gray-100);
2318
}
2419
/* LineNumbersTable */
2520
.lnt {

0 commit comments

Comments
 (0)