github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3746 from sprat/fix-openntpd

Browse Source 
openntpd: the "-s" flag is obsolete, this generates some error messages in the ntpd logs
This commit is contained in:
Avi Deitcher 2021-12-29 21:24:02 +02:00 committed by GitHub
commit 210a308602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/cadvisor.yml
View File

@ -28,7 +28,7 @@ services:
- name: rngd
image: linuxkit/rngd:a44c6230f1620f1d6310b95a9e9f585de73a8bd7
- name: ntpd
image: linuxkit/openntpd:3d4190529a74dc2a2c74635f5cac817206be65c7
image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038
- name: docker
image: docker:20.10.6-dind

2
examples/docker-for-mac.yml
View File

@ -57,7 +57,7 @@ services:
- INSECURE=true
# Run ntpd to keep time synchronised in the VM
- name: ntpd
image: linuxkit/openntpd:3d4190529a74dc2a2c74635f5cac817206be65c7
image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038
# VSOCK to unix domain socket forwarding. Forwards guest /var/run/docker.sock
# to a socket on the host.
- name: vsudd

2
examples/docker.yml
View File

@ -26,7 +26,7 @@ services:
- name: dhcpcd
image: linuxkit/dhcpcd:52d2c4df0311b182e99241cdc382ff726755c450
- name: ntpd
image: linuxkit/openntpd:3d4190529a74dc2a2c74635f5cac817206be65c7
image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038
- name: docker
image: docker:20.10.6-dind
capabilities:

2
pkg/openntpd/Dockerfile
View File

@ -15,4 +15,4 @@ CMD []
WORKDIR /
COPY --from=mirror /out/ /
COPY etc/ /etc/
CMD ["/usr/sbin/ntpd", "-d", "-s"]
CMD ["/usr/sbin/ntpd", "-d"]

2
projects/compose/compose-dynamic.yml
View File

@ -27,7 +27,7 @@ services:
- name: rngd
image: linuxkit/rngd:a44c6230f1620f1d6310b95a9e9f585de73a8bd7
- name: ntpd
image: linuxkit/openntpd:3d4190529a74dc2a2c74635f5cac817206be65c7
image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038
- name: docker
image: docker:20.10.6-dind
capabilities:

2
projects/compose/compose-static.yml
View File

@ -27,7 +27,7 @@ services:
- name: rngd
image: linuxkit/rngd:a44c6230f1620f1d6310b95a9e9f585de73a8bd7
- name: ntpd
image: linuxkit/openntpd:3d4190529a74dc2a2c74635f5cac817206be65c7
image: linuxkit/openntpd:d6c36ac367ed26a6eeffd8db78334d9f8041b038
- name: docker
image: docker:20.10.6-dind
capabilities: