-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update hello-world #18282
Merged
yosifkit
merged 1 commit into
docker-library:master
from
docker-library-bot:hello-world
Jan 22, 2025
Merged
Update hello-world #18282
yosifkit
merged 1 commit into
docker-library:master
from
docker-library-bot:hello-world
Jan 22, 2025
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/hello-world@6ad8af5: Merge pull request docker-library/hello-world#121 from infosiftr/win2025 - docker-library/hello-world@2cd5514: Merge pull request docker-library/hello-world#119 from infosiftr/bump - docker-library/hello-world@0b8aa18: Merge pull request docker-library/hello-world#120 from infosiftr/git-diff--exit-code - docker-library/hello-world@a71acd2: Update to Bookworm + musl 1.2.5 - docker-library/hello-world@08987c7: Add Windows (Nano) Server 2025 variants - docker-library/hello-world@0e95907: Switch to `git diff --exit-code` - docker-library/hello-world@680f908: Update README - docker-library/hello-world@1f9e879: Update to actions/checkout@v4 🙃
Diff for 94d63aa:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 5b4438b..badc865 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,30 +1,30 @@
Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/hello-world.git
-GitCommit: c6676f682a833388a087758d8789b43fbe003397
+GitCommit: 08987c71f648c985f54be2a80bed4223cbd0723b
Tags: linux
SharedTags: latest
Architectures: amd64, arm32v5, arm32v6, arm32v7, arm64v8, i386, mips64le, ppc64le, riscv64, s390x
amd64-Directory: amd64/hello-world
-amd64-GitCommit: 3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee
+amd64-GitCommit: a71acd2dfb8c21c8e42a8f926ce37c1ffbf8eae7
arm32v5-Directory: arm32v5/hello-world
-arm32v5-GitCommit: 3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee
+arm32v5-GitCommit: a71acd2dfb8c21c8e42a8f926ce37c1ffbf8eae7
arm32v6-Directory: arm32v6/hello-world
-arm32v6-GitCommit: cbaef8901ea4e4f1bad7c29b641bb75190adfe61
+arm32v6-GitCommit: a71acd2dfb8c21c8e42a8f926ce37c1ffbf8eae7
arm32v7-Directory: arm32v7/hello-world
-arm32v7-GitCommit: 3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee
+arm32v7-GitCommit: a71acd2dfb8c21c8e42a8f926ce37c1ffbf8eae7
arm64v8-Directory: arm64v8/hello-world
-arm64v8-GitCommit: 3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee
+arm64v8-GitCommit: a71acd2dfb8c21c8e42a8f926ce37c1ffbf8eae7
i386-Directory: i386/hello-world
-i386-GitCommit: 3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee
+i386-GitCommit: a71acd2dfb8c21c8e42a8f926ce37c1ffbf8eae7
mips64le-Directory: mips64le/hello-world
-mips64le-GitCommit: 3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee
+mips64le-GitCommit: a71acd2dfb8c21c8e42a8f926ce37c1ffbf8eae7
ppc64le-Directory: ppc64le/hello-world
-ppc64le-GitCommit: 3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee
+ppc64le-GitCommit: a71acd2dfb8c21c8e42a8f926ce37c1ffbf8eae7
riscv64-Directory: riscv64/hello-world
-riscv64-GitCommit: 3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee
+riscv64-GitCommit: a71acd2dfb8c21c8e42a8f926ce37c1ffbf8eae7
s390x-Directory: s390x/hello-world
-s390x-GitCommit: 3fb6ebca4163bf5b9cc496ac3e8f11cb1e754aee
+s390x-GitCommit: a71acd2dfb8c21c8e42a8f926ce37c1ffbf8eae7
Tags: nanoserver-1809
SharedTags: nanoserver, latest
@@ -39,3 +39,10 @@ Architectures: windows-amd64
windows-amd64-Directory: amd64/hello-world/nanoserver-ltsc2022
windows-amd64-GitCommit: c816763efda4774cc0c628dca3c7dbd93c099928
Constraints: nanoserver-ltsc2022
+
+Tags: nanoserver-ltsc2025
+SharedTags: nanoserver, latest
+Architectures: windows-amd64
+windows-amd64-Directory: amd64/hello-world/nanoserver-ltsc2025
+windows-amd64-GitCommit: 08987c71f648c985f54be2a80bed4223cbd0723b
+Constraints: nanoserver-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 1a32863..c93fdca 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,3 +3,4 @@ hello-world:linux
hello-world:nanoserver
hello-world:nanoserver-1809
hello-world:nanoserver-ltsc2022
+hello-world:nanoserver-ltsc2025
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 9e9d3fe..4fb8c15 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,3 +1,4 @@
hello-world:linux
hello-world:nanoserver-1809
hello-world:nanoserver-ltsc2022
+hello-world:nanoserver-ltsc2025
diff --git a/hello-world_linux/hello b/hello-world_linux/hello
index 4e91682..3ffc66f 100755
Binary files a/hello-world_linux/hello and b/hello-world_linux/hello differ
diff --git a/hello-world_nanoserver-1809/Dockerfile b/hello-world_nanoserver-ltsc2025/Dockerfile
similarity index 53%
copy from hello-world_nanoserver-1809/Dockerfile
copy to hello-world_nanoserver-ltsc2025/Dockerfile
index 4c3525e..bb0b1d6 100644
--- a/hello-world_nanoserver-1809/Dockerfile
+++ b/hello-world_nanoserver-ltsc2025/Dockerfile
@@ -1,3 +1,3 @@
-FROM mcr.microsoft.com/windows/nanoserver:1809
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2025
COPY hello.txt C:
CMD ["cmd", "/C", "type C:\\hello.txt"]
diff --git a/hello-world_nanoserver-ltsc2022/hello.txt b/hello-world_nanoserver-ltsc2025/hello.txt
similarity index 93%
copy from hello-world_nanoserver-ltsc2022/hello.txt
copy to hello-world_nanoserver-ltsc2025/hello.txt
index 13b1f76..3dac4da 100644
--- a/hello-world_nanoserver-ltsc2022/hello.txt
+++ b/hello-world_nanoserver-ltsc2025/hello.txt
@@ -5,14 +5,14 @@ This message shows that your installation appears to be working correctly.
To generate this message, Docker took the following steps:
1. The Docker client contacted the Docker daemon.
2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
- (windows-amd64, nanoserver-ltsc2022)
+ (windows-amd64, nanoserver-ltsc2025)
3. The Docker daemon created a new container from that image which runs the
executable that produces the output you are currently reading.
4. The Docker daemon streamed that output to the Docker client, which sent it
to your terminal.
To try something more ambitious, you can run a Windows Server container with:
- PS C:\> docker run -it mcr.microsoft.com/windows/servercore:ltsc2022 powershell
+ PS C:\> docker run -it mcr.microsoft.com/windows/servercore:ltsc2025 powershell
Share images, automate workflows, and more with a free Docker ID:
https://hub.docker.com/ Relevant Maintainers: |
yosifkit
approved these changes
Jan 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes:
git diff --exit-code
hello-world#120 from infosiftr/git-diff--exit-codegit diff --exit-code