Skip to content

Commit 5910bb2

Browse files
authored
Merge pull request #21198 from docker/published-update
publish updates from main
2 parents 7efe03b + 39f962b commit 5910bb2

Some content is hidden

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

50 files changed

+323
-322
lines changed

compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ services:
1010
watch:
1111
- action: sync
1212
path: .
13-
target: /src
13+
target: /project

content/contribute/components/call-outs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ is displayed in the callout.
4646
> `docker compose down`. If you want to remove the volumes, you will need to add
4747
> the `--volumes` flag.
4848
>
49-
> The Docker Dashboard does not remove volumes when you delete the app stack.
49+
> The Docker Desktop Dashboard does not remove volumes when you delete the app stack.
5050
5151
> [!CAUTION]
5252
>
@@ -96,7 +96,7 @@ Docker Scout is an [early access](/release-lifecycle/#early-access-ea) product.
9696
> `docker compose down`. If you want to remove the volumes, you will need to add
9797
> the `--volumes` flag.
9898
>
99-
> The Docker Dashboard does _not_ remove volumes when you delete the app stack.
99+
> The Docker Desktop Dashboard does not remove volumes when you delete the app stack.
100100

101101
> [!CAUTION]
102102
>
38.2 KB
Loading
Binary file not shown.

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,12 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create
5757

5858
1. [Download and install](https://www.docker.com/products/docker-desktop/) Docker Desktop.
5959

60-
2. Open this [pre-initialized project](https://start.spring.io/#!type=maven-project&language=java&platformVersion=3.3.0-M3&packaging=jar&jvmVersion=21&groupId=com.example&artifactId=spring-boot-docker&name=spring-boot-docker&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.spring-boot-docker&dependencies=web) to generate a ZIP file. Here’s how that looks:
60+
2. [Download and install](https://www.oracle.com/java/technologies/downloads/) Java.
6161

62+
3. Open this [pre-initialized project](https://start.spring.io/#!type=maven-project&language=java&platformVersion=3.4.0-M3&packaging=jar&jvmVersion=21&groupId=com.example&artifactId=spring-boot-docker&name=spring-boot-docker&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.spring-boot-docker&dependencies=web) to generate a ZIP file. Here’s how that looks:
6263

63-
![A screenshot of Spring Initializr tool selected with Java 21, Spring Web and Spring Boot 3.3.0](images/spring-initializr.webp?border=true)
64+
65+
![A screenshot of Spring Initializr tool selected with Java 21, Spring Web and Spring Boot 3.4.0](images/multi-stage-builds-spring-initializer.webp?border=true)
6466

6567

6668
[Spring Initializr](https://start.spring.io/) is a quickstart generator for Spring projects. It provides an extensible API to generate JVM-based projects with implementations for several common concepts — like basic language generation for Java, Kotlin, and Groovy.
@@ -70,7 +72,7 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create
7072
For this demonstration, you’ve paired Maven build automation with Java, a Spring Web dependency, and Java 21 for your metadata.
7173

7274

73-
3. Navigate the project directory. Once you unzip the file, you'll see the following project directory structure:
75+
4. Navigate the project directory. Once you unzip the file, you'll see the following project directory structure:
7476

7577

7678
```plaintext
@@ -107,7 +109,7 @@ In this hands-on guide, you'll unlock the power of multi-stage builds to create
107109
contains most of the information needed to build a customized project. The POM is huge and can seem
108110
daunting. Thankfully, you don't yet need to understand every intricacy to use it effectively.
109111
110-
4. Create a RESTful web service that displays "Hello World!".
112+
5. Create a RESTful web service that displays "Hello World!".
111113
112114
113115
Under the `src/main/java/com/example/spring_boot_docker/` directory, you can modify your

content/get-started/docker-concepts/running-containers/multi-container-applications.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ In this hands-on guide, you'll first see how to build and run a counter web appl
157157
008e0ecf4f36 redis "docker-entrypoint.s…" About a minute ago Up About a minute 6379/tcp redis
158158
```
159159

160-
7. If you look at the Docker Dashboard, you can see the containers and dive deeper into their configuration.
160+
7. If you look at the Docker Desktop Dashboard, you can see the containers and dive deeper into their configuration.
161161

162-
![A screenshot of Docker Dashboard showing multi-container applications](images/multi-container-apps.webp?w=5000&border=true)
162+
![A screenshot of the Docker Desktop Dashboard showing multi-container applications](images/multi-container-apps.webp?w=5000&border=true)
163163

164164
8. With everything up and running, you can open [http://localhost](http://localhost) in your browser to see the site. Refresh the page several times to see the host that’s handling the request and the total number of requests:
165165

@@ -174,9 +174,9 @@ In this hands-on guide, you'll first see how to build and run a counter web appl
174174
>
175175
> You might have noticed that Nginx, acting as a reverse proxy, likely distributes incoming requests in a round-robin fashion between the two backend containers. This means each request might be directed to a different container (web1 and web2) on a rotating basis. The output shows consecutive increments for both the web1 and web2 containers and the actual counter value stored in Redis is updated only after the response is sent back to the client.
176176

177-
9. You can use the Docker Dashboard to remove the containers by selecting the containers and selecting the **Delete** button.
177+
9. You can use the Docker Desktop Dashboard to remove the containers by selecting the containers and selecting the **Delete** button.
178178

179-
![A screenshot of Docker Dashboard showing how to delete the multi-container applications](images/delete-multi-container-apps.webp?border=true)
179+
![A screenshot of Docker Desktop Dashboard showing how to delete the multi-container applications](images/delete-multi-container-apps.webp?border=true)
180180
181181
## Simplify the deployment using Docker Compose
182182

@@ -204,14 +204,14 @@ Navigate to the root of the project directory. Inside this directory, you'll fin
204204
✔ Container nginx-nodejs-redis-nginx-1 Started
205205
```
206206

207-
2. If you look at the Docker Dashboard, you can see the containers and dive deeper into their configuration.
207+
2. If you look at the Docker Desktop Dashboard, you can see the containers and dive deeper into their configuration.
208208

209209

210-
![A screenshot of Docker Dashboard showing the containers of the application stack deployed using Docker Compose](images/list-containers.webp?border=true)
210+
![A screenshot of the Docker Desktop Dashboard showing the containers of the application stack deployed using Docker Compose](images/list-containers.webp?border=true)
211211

212-
3. Alternatively, you can use the Docker Dashboard to remove the containers by selecting the application stack and selecting the **Delete** button.
212+
3. Alternatively, you can use the Docker Desktop Dashboard to remove the containers by selecting the application stack and selecting the **Delete** button.
213213

214-
![A screenshot of Docker Dashboard that shows how to remove the containers that you deployed using Docker Compose](images/delete-containers.webp?border=true)
214+
![A screenshot of Docker Desktop Dashboard that shows how to remove the containers that you deployed using Docker Compose](images/delete-containers.webp?border=true)
215215

216216

217217
In this guide, you learned how easy it is to use Docker Compose to start and stop a multi-container application compared to `docker run` which is error-prone and difficult to manage.

content/get-started/docker-concepts/running-containers/overriding-container-defaults.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ In this hands-on guide, you'll see how to use the `docker run` command to overri
8989

9090
This will start another Postgres container in the background, listening on the standard postgres port `5432` in the container, but mapped to port `5433` on the host machine. You override the host port just to ensure that this new container doesn't conflict with the existing running container.
9191

92-
3. Verify that both containers are running by going to the **Containers** view in the Docker Dashboard.
92+
3. Verify that both containers are running by going to the **Containers** view in the Docker Desktop Dashboard.
9393

94-
![A screenshot of Docker Dashboard showing the running instances of Postgres containers](images/running-postgres-containers.webp?border=true)
94+
![A screenshot of the Docker Desktop Dashboard showing the running instances of Postgres containers](images/running-postgres-containers.webp?border=true)
9595

9696
### Run Postgres container in a controlled network
9797

@@ -170,15 +170,15 @@ Sometimes, you might need to override the default commands (`CMD`) or entry poin
170170

171171
This command starts the Postgres service defined in the Docker Compose file.
172172

173-
3. Verify the authentication with Docker Dashboard.
173+
3. Verify the authentication with Docker Desktop Dashboard.
174174

175-
Open the Docker Dashboard, select the **Postgres** container and select **Exec** to enter into the container shell. You can type the following command to connect to the Postgres database:
175+
Open the Docker Desktop Dashboard, select the **Postgres** container and select **Exec** to enter into the container shell. You can type the following command to connect to the Postgres database:
176176

177177
```console
178178
# psql -U postgres
179179
```
180180

181-
![A screenshot of the Docker Dashboard selecting the Postgres container and entering into its shell using EXEC button](images/exec-into-postgres-container.webp?border=true)
181+
![A screenshot of the Docker Desktop Dashboard selecting the Postgres container and entering into its shell using EXEC button](images/exec-into-postgres-container.webp?border=true)
182182

183183

184184
> [!NOTE]

content/get-started/docker-concepts/running-containers/persisting-container-data.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ In this guide, you’ll practice creating and using volumes to persist data crea
128128

129129
### View volume contents
130130

131-
The Docker Dashboard provides the ability to view the contents of any volume, as well as the ability to export, import, and clone volumes.
131+
The Docker Desktop Dashboard provides the ability to view the contents of any volume, as well as the ability to export, import, and clone volumes.
132132

133-
1. Open the Docker Dashboard and navigate to the **Volumes** view. In this view, you should see the **postgres_data** volume.
133+
1. Open the Docker Desktop Dashboard and navigate to the **Volumes** view. In this view, you should see the **postgres_data** volume.
134134

135135
2. Select the **postgres_data** volume’s name.
136136

@@ -149,7 +149,7 @@ $ docker rm -f new-db
149149

150150
There are a few methods to remove volumes, including the following:
151151

152-
- Select the **Delete Volume** option on a volume in the Docker Dashboard.
152+
- Select the **Delete Volume** option on a volume in the Docker Desktop Dashboard.
153153
- Use the `docker volume rm` command:
154154

155155
```console

content/get-started/docker-concepts/running-containers/publishing-ports.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ In this step, you will run a container and publish its port using the Docker CLI
8888

8989
The first `8080` refers to the host port. This is the port on your local machine that will be used to access the application running inside the container. The second `80` refers to the container port. This is the port that the application inside the container listens on for incoming connections. Hence, the command binds to port `8080` of the host to port `80` on the container system.
9090

91-
3. Verify the published port by going to the **Containers** view of the Docker Dashboard.
91+
3. Verify the published port by going to the **Containers** view of the Docker Desktop Dashboard.
9292

93-
![A screenshot of Docker dashboard showing the published port](images/published-ports.webp?w=5000&border=true)
93+
![A screenshot of Docker Desktop Dashboard showing the published port](images/published-ports.webp?w=5000&border=true)
9494

9595
4. Open the website by either selecting the link in the **Port(s)** column of your container or visiting [http://localhost:8080](http://localhost:8080) in your browser.
9696

content/get-started/docker-concepts/running-containers/sharing-local-files.md

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ In this hands-on guide, you’ll practice how to create and use a bind mount to
9090

9191
Using a bind mount, you can map the configuration file on your host computer to a specific location within the container. In this example, you’ll see how to change the look and feel of the webpage by using bind mount:
9292

93-
1. Delete the existing container by using the Docker Dashboard:
93+
1. Delete the existing container by using the Docker Desktop Dashboard:
9494

95-
![A screenshot of Docker dashboard showing how to delete the httpd container](images/delete-httpd-container.webp?border=true)
95+
![A screenshot of Docker Desktop Dashboard showing how to delete the httpd container](images/delete-httpd-container.webp?border=true)
9696

9797

9898
2. Create a new directory called `public_html` on your host system.
@@ -157,44 +157,40 @@ Using a bind mount, you can map the configuration file on your host computer to
157157
With everything now up and running, you should be able to access the site via [http://localhost:8080](http://localhost:8080) and find a new webpage that welcomes you with a friendly whale.
158158

159159

160-
### Access the file on the Docker Dashboard
160+
### Access the file on the Docker Desktop Dashboard
161161

162162
1. You can view the mounted files inside a container by selecting the container's **Files** tab and then selecting a file inside the `/usr/local/apache2/htdocs/` directory. Then, select **Open file editor**.
163163

164164

165-
![A screenshot of Docker dashboard showing the mounted files inside the a container](images/mounted-files.webp?border=true)
165+
![A screenshot of Docker Desktop Dashboard showing the mounted files inside the a container](images/mounted-files.webp?border=true)
166166

167-
2. Delete the file on the host and verify the file is also deleted in the container. You will find that the files no longer exist under **Files** in the Docker Dashboard.
167+
2. Delete the file on the host and verify the file is also deleted in the container. You will find that the files no longer exist under **Files** in the Docker Desktop Dashboard.
168168

169169

170-
![A screenshot of Docker dashboard showing the deleted files inside the a container](images/deleted-files.webp?border=true)
170+
![A screenshot of Docker Desktop Dashboard showing the deleted files inside the a container](images/deleted-files.webp?border=true)
171171

172172

173-
3. Recreate the HTML file on the host system and see that file re-appears under the **Files** tab under **Containers** on the Docker Dashboard. By now, you will be able to access the site too.
173+
3. Recreate the HTML file on the host system and see that file re-appears under the **Files** tab under **Containers** on the Docker Desktop Dashboard. By now, you will be able to access the site too.
174174

175175

176176

177177
### Stop your container
178178

179179
The container continues to run until you stop it.
180180

181-
1. Go to the **Containers** view in the Docker Dashboard.
181+
1. Go to the **Containers** view in the Docker Desktop Dashboard.
182182

183183
2. Locate the container you'd like to stop.
184184

185185
3. Select the **Delete** action in the Actions column.
186186

187-
188-
189-
190-
![A screenshot of Docker dashboard showing how to delete the container](images/delete-the-container.webp?border=true)
187+
![A screenshot of Docker Desktop Dashboard showing how to delete the container](images/delete-the-container.webp?border=true)
191188

192189

193190
## Additional resources
194191

195192
The following resources will help you learn more about bind mounts:
196193

197-
198194
* [Manage data in Docker](/storage/)
199195
* [Volumes](/storage/volumes/)
200196
* [Bind mounts](/storage/bind-mounts/)

0 commit comments

Comments
 (0)