Skip to content

Commit

Permalink
Merge pull request #21647 from docker/published-update
Browse files Browse the repository at this point in the history
publish updates from main
  • Loading branch information
craig-osterhout authored Dec 17, 2024
2 parents a4c02f5 + 1c75da7 commit 7f293b9
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions content/manuals/docker-hub/repos/manage/hub-images/push.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
3. Verify the image on Docker Hub.
6 changes: 4 additions & 2 deletions content/manuals/engine/daemon/prometheus.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
43 changes: 35 additions & 8 deletions layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,29 @@ <h1 class="text-2xl">Get Docker</h1>
</div>

<div>
<div class="grid grid-cols-1 gap-4 lg:grid-cols-3">
<div class="grid grid-cols-1 gap-4 lg:grid-cols-4">

<div>
<a class="h-full" href="/get-started/">
<div
class="flex h-full flex-col gap-2 rounded border border-gray-light-100 bg-white p-4 drop-shadow-sm hover:border-gray-light-200 hover:drop-shadow-lg dark:border-gray-dark-400 dark:bg-gray-dark-200 hover:dark:border-gray-dark">
<div class="flex items-center gap-4">
<span class="icon-svg text-violet-light dark:text-violet-dark">
{{ partial "icon" "rocket" }}
</span>
<div>
<div class="text-xl leading-snug text-gray-light-800 dark:text-white">
Get started
</div>
</div>
</div>
<div class="leading-snug text-gray-light-500 dark:text-gray-dark-700">
Learn Docker basics and the benefits of containerization.
</div>
</div>
</a>
</div>

<div>
<a class="h-full" href="/guides/">
<div
Expand All @@ -57,7 +79,7 @@ <h1 class="text-2xl">Get Docker</h1>
</div>
</div>
<div class="leading-snug text-gray-light-500 dark:text-gray-dark-700">
Get started and learn how Docker can optimize your development workflows.
Learn how Docker can optimize your development workflows.
</div>
</div>
</a>
Expand Down Expand Up @@ -112,16 +134,21 @@ <h1 class="text-2xl">Get Docker</h1>
<div class="bg-pattern-verde relative rounded p-6 drop-shadow">
<div class="flex h-full flex-col items-start justify-between gap-12">
<div class="flex flex-col gap-4">
<h2 class="font-medium">Getting started</h2>
<h2 class="font-medium">Gen AI catalog {{ partial
"components/badge.html" (dict "color" "blue" "content" "New")
}}</h2>
<p class="text-xl">
Learn Docker basics and the benefits of containerizing your
applications
Integrate AI solutions into your apps with minimal effort
</p>
</div>
<div>
<a href="/get-started/"
<div class="flex flex-col xl:flex-row gap-4 items-start">
<a href="https://hub.docker.com/catalogs/gen-ai"
class="flex cursor-pointer items-center gap-2 rounded bg-blue-light p-2 px-4 text-white transition duration-300 hover:bg-blue-light-400 dark:bg-blue-dark-400 dark:hover:bg-blue-dark">
Get started
Explore on Docker Hub
</a>
<a href="/docker-hub/image-library/catalogs/"
class="flex-grow-0 flex cursor-pointer items-center gap-2 rounded bg-blue-light p-2 px-4 text-white transition duration-300 hover:bg-blue-light-400 dark:bg-blue-dark-400 dark:hover:bg-blue-dark">
Read the docs
</a>
</div>
</div>
Expand Down

0 comments on commit 7f293b9

Please sign in to comment.