From a88a43d58032b84ef54214c020e8947534bf2245 Mon Sep 17 00:00:00 2001 From: Shariq Ahmed Khan Date: Fri, 13 Dec 2024 10:47:12 +0100 Subject: [PATCH 1/4] Update multi-stage-builds.md added command to view logs of running container Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- .../docker-concepts/building-images/multi-stage-builds.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7e45aa8f81c3..0de903ee2067 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 @@ -231,7 +231,7 @@ Now that you have the project, you’re ready to create the `Dockerfile`. 1. Now that you have an image built, it's time to run the container. ```console - $ docker run -d -p 8080:8080 spring-helloworld + $ docker run -p 8080:8080 spring-helloworld ``` You'll then see output similar to the following in the container log: From ace01c349ed0c6dde65d08f09f5dfa11d4bb914b Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:34:10 +0100 Subject: [PATCH 2/4] fix: invalid docker push command with multiple tags Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/manuals/docker-hub/repos/manage/hub-images/push.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/manuals/docker-hub/repos/manage/hub-images/push.md b/content/manuals/docker-hub/repos/manage/hub-images/push.md index 0c3b468ed44e..a9a1f0284529 100644 --- a/content/manuals/docker-hub/repos/manage/hub-images/push.md +++ b/content/manuals/docker-hub/repos/manage/hub-images/push.md @@ -36,9 +36,9 @@ images with others or use them in different environments. Example: ```console - $ docker push my-app my-namespace/my-repo:v1.0 + $ docker push my-namespace/my-repo:v1.0 ``` This command pushes the image tagged `v1.0` to the `my-namespace/my-repo` repository. -3. Verify the image on Docker Hub. \ No newline at end of file +3. Verify the image on Docker Hub. From 7e4fd0f39497617465d86ce931aece94668e13ff Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:31:59 +0100 Subject: [PATCH 3/4] engine: call out 0.0.0.0 as an option for metrics-addr Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/manuals/engine/daemon/prometheus.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/content/manuals/engine/daemon/prometheus.md b/content/manuals/engine/daemon/prometheus.md index a4dbdeb62108..5e194d627da4 100644 --- a/content/manuals/engine/daemon/prometheus.md +++ b/content/manuals/engine/daemon/prometheus.md @@ -48,8 +48,10 @@ Add the following configuration: Save the file, or in the case of Docker Desktop for Mac or Docker Desktop for Windows, save the configuration. Restart Docker. -Docker now exposes Prometheus-compatible metrics on port 9323 on the loopback -interface. +Docker now exposes Prometheus-compatible metrics on port 9323 via the loopback +interface. You can configure it to use the wildcard address `0.0.0.0` instead, +but this will expose the Prometheus port to the wider network. Consider your +threat model carefully when deciding which option best suits your environment. ### Create a Prometheus configuration From 1c75da7964421977c56a3d57c8742dc728304f48 Mon Sep 17 00:00:00 2001 From: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> Date: Tue, 17 Dec 2024 10:16:00 -0800 Subject: [PATCH 4/4] hub: add catalog callout on homepage (#21613) ## Description Increase visibility of Gen AI catalog. - Moved get started card on homepage up by the nav cards to align with nav - Added gen ai in place of the old get started card ## Related issues or tickets ## Reviews - [ ] Editorial review - [ ] Product review ![image](https://github.com/user-attachments/assets/bc758326-3ce0-4e0a-aa38-257051d35b21) --------- Signed-off-by: Craig Co-authored-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- layouts/index.html | 43 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/layouts/index.html b/layouts/index.html index c7d3963d8552..cc4cb02097f6 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -41,7 +41,29 @@

Get Docker

-
+
+ + +
- Get started and learn how Docker can optimize your development workflows. + Learn how Docker can optimize your development workflows.
@@ -112,16 +134,21 @@

Get Docker

-

Getting started

+

Gen AI catalog {{ partial + "components/badge.html" (dict "color" "blue" "content" "New") + }}

- Learn Docker basics and the benefits of containerizing your - applications + Integrate AI solutions into your apps with minimal effort

-