Skip to content

Commit 1993afc

Browse files
committed
chore: create /usr/etc in a different step
Do it together with other FS base directories Signed-off-by: Dmitry Sharshakov <[email protected]>
1 parent 8680351 commit 1993afc

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Diff for: Dockerfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ END
698698
COPY ./hack/cleanup.sh /toolchain/bin/cleanup.sh
699699
RUN <<END
700700
cleanup.sh /rootfs
701-
mkdir -pv /rootfs/{boot/EFI,etc/cri/conf.d/hosts,lib/firmware,usr/local/share,usr/share/zoneinfo/Etc,mnt,system,opt,.extra}
701+
mkdir -pv /rootfs/{boot/EFI,etc/cri/conf.d/hosts,lib/firmware,usr/etc,usr/local/share,usr/share/zoneinfo/Etc,mnt,system,opt,.extra}
702702
mkdir -pv /rootfs/{etc/kubernetes/manifests,etc/cni/net.d,etc/ssl/certs,usr/libexec/kubernetes,/usr/local/lib/kubelet/credentialproviders}
703703
mkdir -pv /rootfs/opt/{containerd/bin,containerd/lib}
704704
END
@@ -772,7 +772,7 @@ END
772772
COPY ./hack/cleanup.sh /toolchain/bin/cleanup.sh
773773
RUN <<END
774774
cleanup.sh /rootfs
775-
mkdir -pv /rootfs/{boot/EFI,etc/cri/conf.d/hosts,lib/firmware,usr/local/share,usr/share/zoneinfo/Etc,mnt,system,opt,.extra}
775+
mkdir -pv /rootfs/{boot/EFI,etc/cri/conf.d/hosts,lib/firmware,usr/etc,usr/local/share,usr/share/zoneinfo/Etc,mnt,system,opt,.extra}
776776
mkdir -pv /rootfs/{etc/kubernetes/manifests,etc/cni/net.d,etc/ssl/certs,usr/libexec/kubernetes,/usr/local/lib/kubelet/credentialproviders}
777777
mkdir -pv /rootfs/opt/{containerd/bin,containerd/lib}
778778
END
@@ -794,7 +794,6 @@ RUN <<END
794794
END
795795

796796
FROM rootfs-base-${TARGETARCH} AS rootfs-base
797-
RUN mkdir -p /rootfs/usr/etc
798797
RUN echo "true" > /rootfs/usr/etc/in-container
799798
RUN find /rootfs -print0 \
800799
| xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"

0 commit comments

Comments
 (0)