nchevsky/systemrescue-zfs
1
0
Fork 0
mirror of https://github.com/nchevsky/systemrescue-zfs.git synced 2026-04-21 06:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'build-fixes' into 'main'

Browse source 
Updates for the build tooling

See merge request systemrescue/systemrescue-sources!286
This commit is contained in:
Francois Dupoux 2023-05-27 20:14:11 +00:00
commit 3deaf2310f
3 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
docker/Dockerfile-build-iso-i686
View file

@ -1,7 +0,0 @@
FROM fdupoux/archlinux32
RUN mkdir -p /workspace
COPY tmpfiles/pacman.conf /etc/pacman.conf
RUN sed -i -e 's/^Architecture.*$/Architecture = i686/' /etc/pacman.conf
RUN pacman -Syyu --noconfirm archiso binutils edk2-shell grub hugo isomd5sum mtools && rm -rf /var/cache/pacman/pkg/*
CMD ["setarch","i686","/usr/bin/bash"]
WORKDIR /workspace

2
docker/Dockerfile-build-iso-x86_64
View file

@ -1,6 +1,6 @@
FROM archlinux:latest
RUN mkdir -p /workspace
COPY tmpfiles/pacman.conf /etc/pacman.conf
RUN pacman -Syyu --noconfirm archiso binutils edk2-shell grub hugo isomd5sum mtools && rm -rf /var/cache/pacman/pkg/*
RUN pacman -Syyu --noconfirm strace vim archiso binutils edk2-shell grub hugo isomd5sum mtools && rm -rf /var/cache/pacman/pkg/*
CMD ["setarch","x86_64","/usr/bin/bash"]
WORKDIR /workspace

2
pacman.conf
View file

@ -82,5 +82,3 @@ Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist
[community]
Include = /etc/pacman.d/mirrorlist