Skip to content

Commit ce616d9

Browse files
committed
fix: path for ca-certificates
Before: ``` ls -l /etc/ssl/certs/ NODE MODE UID GID SIZE(B) LASTMOD LABEL NAME 172.20.0.2 drwxr-xr-x 0 0 65 Feb 12 14:20:52 system_u:object_r:etc_t:s0 . 172.20.0.2 -rw-r--r-- 0 0 0 Feb 12 14:20:52 system_u:object_r:etc_t:s0 ca-certificates 172.20.0.2 -rw-r--r-- 0 0 231212 Feb 12 16:47:29 system_u:object_r:etc_t:s0 ca-certificates.crt ``` After: ``` 172.20.0.5 Lrwxrwxrwx 0 0 19 Feb 12 14:20:52 system_u:object_r:etc_t:s0 ca-certificates -> ca-certificates.crt 172.20.0.5 -rw-r--r-- 0 0 231212 Feb 12 17:20:12 system_u:object_r:etc_t:s0 ca-certificates.crt ``` Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent f35b587 commit ce616d9

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -755,8 +755,8 @@ COPY --chmod=0644 hack/lvm.conf /rootfs/etc/lvm/lvm.conf
755755
COPY --chmod=0644 --from=base /src/pkg/machinery/version/os-release /rootfs/etc/os-release
756756
RUN <<END
757757
ln -s /usr/share/zoneinfo/Etc/UTC /rootfs/etc/localtime
758-
touch /rootfs/etc/{extensions.yaml,resolv.conf,hosts,machine-id,cri/conf.d/cri.toml,cri/conf.d/01-registries.part,cri/conf.d/20-customization.part,cri/conf.d/base-spec.json,ssl/certs/ca-certificates,selinux/targeted/contexts/files/file_contexts,iscsi/initiatorname.iscsi,nvme/{hostid,hostnqn}}
759-
ln -s ca-certificates /rootfs/etc/ssl/certs/ca-certificates.crt
758+
touch /rootfs/etc/{extensions.yaml,resolv.conf,hosts,machine-id,cri/conf.d/cri.toml,cri/conf.d/01-registries.part,cri/conf.d/20-customization.part,cri/conf.d/base-spec.json,ssl/certs/ca-certificates.crt,selinux/targeted/contexts/files/file_contexts,iscsi/initiatorname.iscsi,nvme/{hostid,hostnqn}}
759+
ln -s ca-certificates.crt /rootfs/etc/ssl/certs/ca-certificates
760760
ln -s /etc/ssl /rootfs/etc/pki
761761
ln -s /etc/ssl /rootfs/usr/share/ca-certificates
762762
ln -s /etc/ssl /rootfs/usr/local/share/ca-certificates
@@ -841,9 +841,9 @@ COPY --chmod=0644 hack/lvm.conf /rootfs/etc/lvm/lvm.conf
841841
COPY --chmod=0644 --from=base /src/pkg/machinery/version/os-release /rootfs/etc/os-release
842842
RUN <<END
843843
ln -s /usr/share/zoneinfo/Etc/UTC /rootfs/etc/localtime
844-
touch /rootfs/etc/{extensions.yaml,resolv.conf,hosts,machine-id,cri/conf.d/cri.toml,cri/conf.d/01-registries.part,cri/conf.d/20-customization.part,cri/conf.d/base-spec.json,ssl/certs/ca-certificates,selinux/targeted/contexts/files/file_contexts,iscsi/initiatorname.iscsi,nvme/{hostid,hostnqn}}
844+
touch /rootfs/etc/{extensions.yaml,resolv.conf,hosts,machine-id,cri/conf.d/cri.toml,cri/conf.d/01-registries.part,cri/conf.d/20-customization.part,cri/conf.d/base-spec.json,ssl/certs/ca-certificates.crt,selinux/targeted/contexts/files/file_contexts,iscsi/initiatorname.iscsi,nvme/{hostid,hostnqn}}
845+
ln -s ca-certificates.crt /rootfs/etc/ssl/certs/ca-certificates
845846
ln -s /etc/ssl /rootfs/etc/pki
846-
ln -s ca-certificates /rootfs/etc/ssl/certs/ca-certificates.crt
847847
ln -s /etc/ssl /rootfs/usr/share/ca-certificates
848848
ln -s /etc/ssl /rootfs/usr/local/share/ca-certificates
849849
ln -s /etc/ssl /rootfs/etc/ca-certificates

0 commit comments

Comments
 (0)