docker
/
docker-archlinux-daily
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure pacman.conf is copied to the new root

This commit is contained in:
Davide Depau 2021-03-20 15:09:06 +01:00
parent a9d3b503e9
commit 43bc5b40ce
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile.aarch64
View File

@ -5,6 +5,7 @@ WORKDIR /archlinux
RUN mkdir -p /archlinux/rootfs
COPY rootfs/alarm/etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist
COPY rootfs/archlinux/etc/pacman.conf /etc/pacman.conf
COPY pacstrap-docker /archlinux/
RUN ./pacstrap-docker /archlinux/rootfs \

1
Dockerfile.x86_64
View File

@ -5,6 +5,7 @@ WORKDIR /archlinux
RUN mkdir -p /archlinux/rootfs
COPY rootfs/archlinux/etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist
COPY rootfs/archlinux/etc/pacman.conf /etc/pacman.conf
COPY pacstrap-docker /archlinux/
RUN ./pacstrap-docker /archlinux/rootfs \

4
pacstrap-docker
View File

@ -15,9 +15,11 @@ fi
[[ -d $newroot ]] || die "%s is not a directory" "$newroot"
echo 'Creating install root at %s' "$newroot"
mkdir -m 0755 -p "$newroot"/var/{cache/pacman/pkg,lib/pacman,log} "$newroot"/{dev,run,etc}
mkdir -m 0755 -p "$newroot"/var/{cache/pacman/pkg,lib/pacman,log} "$newroot"/{dev,run,etc} "$newroot"/etc/pacman.d
mkdir -m 1777 -p "$newroot"/tmp
mkdir -m 0555 -p "$newroot"/{sys,proc}
cp -a /etc/pacman.conf "$newroot/etc/pacman.conf"
cp -a /etc/pacman.d/mirrorlist "$newroot/etc/pacman.d/mirrorlist"
echo 'Creating /dev/null in new root'
mknod "$newroot/dev/null" c 1 3