mirror of
https://github.com/MedzikUser/docker-arch
synced 2024-08-15 03:25:56 +00:00
update
This commit is contained in:
parent
3b88c0616c
commit
8a6febf82b
4 changed files with 29 additions and 16 deletions
|
@ -1,22 +1,13 @@
|
||||||
FROM archlinux AS bootstrap
|
FROM archlinux AS bootstrap
|
||||||
|
|
||||||
|
COPY setup.sh /tmp/setup.sh
|
||||||
COPY resolv.conf /etc/resolv.conf
|
COPY resolv.conf /etc/resolv.conf
|
||||||
|
|
||||||
RUN pacman -Sy --noconfirm wget \
|
|
||||||
&& pacman-key --init \
|
|
||||||
&& pacman-key --recv-key 7A6646A6C14690C0 \
|
|
||||||
&& pacman-key --lsign-key 7A6646A6C14690C0 \
|
|
||||||
&& pacman -U --noconfirm 'https://arch-repo.magicuser.cf/medzikuser-mirrorlist.pkg.tar.xz' \
|
|
||||||
&& yes | pacman -Scc
|
|
||||||
|
|
||||||
COPY pacman.conf /etc/pacman.conf
|
|
||||||
COPY mirrorlist /etc/pacman.d/mirrorlist
|
COPY mirrorlist /etc/pacman.d/mirrorlist
|
||||||
|
|
||||||
RUN pacman -Syu --noconfirm \
|
RUN bash /tmp/setup.sh && \
|
||||||
&& yes | pacman -Scc
|
rm -rf /tmp/*
|
||||||
|
|
||||||
RUN useradd --create-home build
|
|
||||||
|
|
||||||
|
COPY pacman.conf /etc/pacman.conf
|
||||||
COPY sudoers /etc/sudoers
|
COPY sudoers /etc/sudoers
|
||||||
|
|
||||||
# Create final image
|
# Create final image
|
||||||
|
@ -27,4 +18,5 @@ COPY --from=bootstrap / /
|
||||||
RUN ldconfig
|
RUN ldconfig
|
||||||
|
|
||||||
ENV LANG=en_US.UTF-8
|
ENV LANG=en_US.UTF-8
|
||||||
|
|
||||||
CMD ["/usr/bin/bash"]
|
CMD ["/usr/bin/bash"]
|
||||||
|
|
|
@ -147,7 +147,7 @@ COMPRESSLZ=(lzip -c -f)
|
||||||
# EXTENSION DEFAULTS
|
# EXTENSION DEFAULTS
|
||||||
#########################################################################
|
#########################################################################
|
||||||
#
|
#
|
||||||
PKGEXT='.pkg.tar.xz'
|
PKGEXT='.pkg.tar.zst'
|
||||||
SRCEXT='.src.tar.gz'
|
SRCEXT='.src.tar.gz'
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
|
@ -30,10 +30,10 @@ Architecture = auto
|
||||||
|
|
||||||
# Misc options
|
# Misc options
|
||||||
#UseSyslog
|
#UseSyslog
|
||||||
#Color
|
Color
|
||||||
#NoProgressBar
|
#NoProgressBar
|
||||||
#CheckSpace
|
#CheckSpace
|
||||||
#VerbosePkgLists
|
VerbosePkgLists
|
||||||
ParallelDownloads = 5
|
ParallelDownloads = 5
|
||||||
|
|
||||||
# By default, pacman accepts packages signed by keys that its local keyring
|
# By default, pacman accepts packages signed by keys that its local keyring
|
||||||
|
|
21
base/setup.sh
Executable file
21
base/setup.sh
Executable file
|
@ -0,0 +1,21 @@
|
||||||
|
#!/bin/bash
|
||||||
|
set -e -u
|
||||||
|
|
||||||
|
# Add Medzik AUR repo
|
||||||
|
pacman-key --init
|
||||||
|
pacman-key --recv-key 7A6646A6C14690C0
|
||||||
|
pacman-key --lsign-key 7A6646A6C14690C0
|
||||||
|
pacman -U --noconfirm 'https://arch-repo.magicuser.cf/medzikuser-mirrorlist.pkg.tar.xz'
|
||||||
|
|
||||||
|
# Install packages
|
||||||
|
PACKAGES=('base')
|
||||||
|
PACKAGES+=('wget')
|
||||||
|
PACKAGES+=('curl')
|
||||||
|
|
||||||
|
pacman -Syu --noconfirm ${PACKAGES}
|
||||||
|
|
||||||
|
# Clean pacman cache
|
||||||
|
yes | pacman -Scc
|
||||||
|
|
||||||
|
# Create `build` user
|
||||||
|
useradd --create-home build
|
Loading…
Reference in a new issue