Skip to content

Commit cd54639

Browse files
authored
Merge pull request #21914 from docker/published-update
publish updates from main
2 parents cdf39db + 04d0957 commit cd54639

File tree

99 files changed

+223
-174
lines changed

Some content is hidden

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

99 files changed

+223
-174
lines changed

assets/css/kapa.css

Lines changed: 0 additions & 19 deletions
This file was deleted.

assets/css/styles.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
@import "tailwindcss/components";
99
@import "/assets/css/code";
1010
@import "/assets/css/toc";
11-
@import "/assets/css/kapa";
1211

1312
@import "tailwindcss/utilities";
1413
@import "/assets/css/syntax-light";

content/get-started/docker-concepts/building-images/multi-stage-builds.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,7 @@ Now that you have the project, you’re ready to create the `Dockerfile`.
325325
Your final image is just 428 MB, compared to the original build size of 880 MB.
326326
327327
328-
By optimizing each stage and only including what's necessary, you were able to significantly reduce the
329-
overall image size while still achieving the same functionality. This not only improves performance but
330-
also makes your Docker images more lightweight, more secure, and easier to manage.
328+
By optimizing each stage and only including what's necessary, you were able to significantly reduce the overall image size while still achieving the same functionality. This not only improves performance but also makes your Docker images more lightweight, more secure, and easier to manage.
331329
332330
## Additional resources
333331

content/guides/swarm-deploy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ params:
1313
time: 10 minutes
1414
---
1515

16-
{{< include "swarm-mode.md" >}}
16+
{{% include "swarm-mode.md" %}}
1717

1818
## Prerequisites
1919

@@ -35,7 +35,7 @@ Swarm never creates individual containers like you did in the previous step of t
3535

3636
Now you can write a simple stack file to run and manage your Todo app, the container `getting-started` image created in [Part 2](02_our_app.md) of the tutorial. Place the following in a file called `bb-stack.yaml`:
3737

38-
{{< include "swarm-compose-compat.md" >}}
38+
{{% include "swarm-compose-compat.md" %}}
3939

4040
```yaml
4141
version: "3.7"

content/guides/zscaler/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ like this:
8484

8585
```dockerfile
8686
FROM debian:bookworm
87-
COPY zscaler-cert.pem /usr/local/share/ca-certificates/zscaler-cert.pem
87+
COPY zscaler-root-ca.crt /usr/local/share/ca-certificates/zscaler-root-ca.crt
8888
RUN apt-get update && \
8989
apt-get install -y ca-certificates && \
9090
update-ca-certificates
9191
```
9292

93-
Here, `zscaler-cert.pem` is the root certificate, located at the root of the
93+
Here, `zscaler-root-ca.crt` is the root certificate, located at the root of the
9494
build context (often within the application's Git repository).
9595

9696
If you use an artifact repository, you can fetch the certificate directly using
@@ -100,7 +100,7 @@ the content digest of the certificate is correct.
100100
```dockerfile
101101
FROM debian:bookworm
102102
ADD --checksum=sha256:24454f830cdb571e2c4ad15481119c43b3cafd48dd869a9b2945d1036d1dc68d \
103-
https://artifacts.example/certs/zscaler-cert.pem /usr/local/share/ca-certificates/zscaler-cert.pem
103+
https://artifacts.example/certs/zscaler-root-ca.crt /usr/local/share/ca-certificates/zscaler-root-ca.crt
104104
RUN apt-get update && \
105105
apt-get install -y ca-certificates && \
106106
update-ca-certificates
@@ -123,7 +123,7 @@ RUN --mount=target=. cmake -B output/
123123

124124
FROM debian:bookworm-slim AS final
125125
ADD --checksum=sha256:24454f830cdb571e2c4ad15481119c43b3cafd48dd869a9b2945d1036d1dc68d \
126-
https://artifacts.example/certs/zscaler-cert.pem /usr/local/share/ca-certificates/zscaler-cert.pem
126+
https://artifacts.example/certs/zscaler-root-ca.crt /usr/local/share/ca-certificates/zscaler-root-ca.crt
127127
RUN apt-get update && \
128128
apt-get install -y ca-certificates && \
129129
update-ca-certificates

content/manuals/admin/company/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ aliases:
4444

4545
{{< summary-bar feature_name="Company" >}}
4646

47-
{{< include "admin-company-overview.md" >}}
47+
{{% include "admin-company-overview.md" %}}
4848

4949
Learn how to administer a company in the following sections.
5050

content/manuals/admin/company/new-company.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You can create a new company in the Docker Admin Console. Before you begin, you
1212
- Be the owner of the organization you want to add to your company
1313
- Have a Docker Business subscription
1414

15-
{{< include "admin-early-access.md" >}}
15+
{{% include "admin-early-access.md" %}}
1616

1717
## Create a company
1818

content/manuals/admin/company/organizations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Manage company organizations
88

99
You can manage the organizations in a company in the Docker Admin Console.
1010

11-
{{< include "admin-early-access.md" >}}
11+
{{% include "admin-early-access.md" %}}
1212

1313
## View all organizations
1414

content/manuals/admin/company/owners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ owners for all associated organizations. Unlike organization owners, company
1515
owners don't need to be member of an organization. When company owners aren't a
1616
member in an organization, they don't occupy a seat.
1717

18-
{{< include "admin-early-access.md" >}}
18+
{{% include "admin-early-access.md" %}}
1919

2020
## Add a company owner
2121

content/manuals/admin/company/users.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ You can manage users at the company-level in the Docker Admin Console.
1010

1111
{{% admin-users product="admin" layer="company" %}}
1212

13-
{{< include "admin-early-access.md" >}}
13+
{{% include "admin-early-access.md" %}}
1414

1515
## Manage members on a team
1616

0 commit comments

Comments
 (0)