mirrors/archlinux-docker
1
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/archlinux-docker.git synced 2025-08-07 06:37:23 +02:00
Code Issues Projects Releases Wiki Activity

Use ./exclude mechanism for /etc/resolv.conf

Browse Source
This commit is contained in:
Sven-Hendrik Haase 2020-10-19 01:13:04 +02:00
parent f114a6d454
commit ecb01053cc
No known key found for this signature in database
GPG Key ID: 39E4B877E62EB915
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.template
View File

@ -4,8 +4,7 @@ SHELL ["/bin/bash", "-c"]
RUN ROOTFS="$(curl --continue-at - --remote-name --write-out "%{filename_effective}" TEMPLATE_ROOTFS_URL)" && \ RUN ROOTFS="$(curl --continue-at - --remote-name --write-out "%{filename_effective}" TEMPLATE_ROOTFS_URL)" && \
sha256sum -c <<< "TEMPLATE_ROOTFS_HASH" && \ sha256sum -c <<< "TEMPLATE_ROOTFS_HASH" && \
mkdir /rootfs && \ mkdir /rootfs && \
# Fix kaniko DNS problems as kaniko uses the current layer's resolv.conf. \ tar -C /rootfs --extract --auto-compress --file "${ROOTFS}"
tar -C /rootfs --extract --auto-compress --exclude=./etc/resolv.conf --file "${ROOTFS}"
FROM scratch AS base FROM scratch AS base
COPY --from=verify /rootfs/ / COPY --from=verify /rootfs/ /

3
exclude
View File

@ -5,6 +5,7 @@
./dev ./dev
./etc/hostname ./etc/hostname
./etc/machine-id ./etc/machine-id
./etc/resolv.conf
./etc/pacman.d/gnupg/openpgp-revocs.d/* ./etc/pacman.d/gnupg/openpgp-revocs.d/*
./etc/pacman.d/gnupg/private-keys-v1.d/* ./etc/pacman.d/gnupg/private-keys-v1.d/*
./etc/pacman.d/gnupg/pubring.gpg~ ./etc/pacman.d/gnupg/pubring.gpg~
@ -13,4 +14,4 @@
./tmp/* ./tmp/*
./var/cache/pacman/pkg/* ./var/cache/pacman/pkg/*
./var/lib/pacman/sync/* ./var/lib/pacman/sync/*
./var/tmp/* ./var/tmp/*