.github/workflows/docker-publish.yml

@@ -25,30 +25,9 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Login to GitHub Container Registry
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push Docker image (base)
+      - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
-          context: ./base
+          context: .
           push: ${{ github.event_name != 'pull_request' }}
-          tags: |
-            medzik/archlinux:latest
-            medzik/archlinux:base
-            ghcr.io/medzikuser/archlinux:latest
-            ghcr.io/medzikuser/archlinux:base
-
-      - name: Build and push Docker image (base-devel)
-        uses: docker/build-push-action@v2
-        with:
-          context: ./base-devel
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: |
-            medzik/archlinux:base-devel
-            ghcr.io/medzikuser/archlinux:base-devel
+          tags: medzik/archlinux:latest

Dockerfile

@@ -0,0 +1,19 @@
+FROM archlinux
+
+COPY resolv.conf /etc/resolv.conf
+
+RUN pacman-key --init \
+ && pacman-key --recv-key 7A6646A6C14690C0 \
+ && pacman-key --lsign-key 7A6646A6C14690C0 \
+ && pacman -U --noconfirm 'https://github.com/archlinux-pkg/packages/releases/download/packages/medzikuser-mirrorlist-2022.1.30-2-any.pkg.tar.xz' \
+ && yes | pacman -Scc
+
+COPY pacman.conf /etc/pacman.conf
+COPY mirrorlist /etc/pacman.d/mirrorlist
+
+RUN pacman -Syu --noconfirm \
+ && yes | pacman -Scc
+
+RUN useradd --create-home build
+
+COPY sudoers /etc/sudoers

base-devel/Dockerfile

@@ -1,9 +0,0 @@
-FROM medzik/archlinux:base
-
-RUN pacman -Sy --noconfirm \
-        git \
-        base-devel \
-        multilib-devel && \
-    yes | pacman -Scc
-
-CMD ["/usr/bin/bash"]

base/Dockerfile

@@ -1,22 +0,0 @@
-FROM archlinux AS bootstrap
-
-COPY setup.sh /tmp/setup.sh
-COPY resolv.conf /etc/resolv.conf
-COPY mirrorlist /etc/pacman.d/mirrorlist
-
-RUN bash /tmp/setup.sh && \
-    rm -rf /tmp/*
-
-COPY pacman.conf /etc/pacman.conf
-COPY sudoers /etc/sudoers
-
-# Create final image
-FROM scratch
-
-COPY --from=bootstrap / /
-
-RUN ldconfig
-
-ENV LANG=en_US.UTF-8
-
-CMD ["/usr/bin/bash"]

base/mirrorlist

@@ -1,34 +0,0 @@
-Server = https://mirror-all.magicuser.cf/archlinux/$repo/os/$arch
-Server = https://mirror-arch.magicuser.cf/$repo/os/$arch
-Server = https://mirror-arch1.magicuser.cf/archlinux/$repo/os/$arch
-
-Server = https://mirror.pkgbuild.com/$repo/os/$arch
-Server = https://europe.mirror.pkgbuild.com/$repo/os/$arch
-Server = https://asia.mirror.pkgbuild.com/$repo/os/$arch
-Server = https://america.mirror.pkgbuild.com/$repo/os/$arch
-
-Server = http://mirrors.kernel.org/archlinux/$repo/os/$arch
-Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch
-
-Server = https://archive.archlinux.org/repos/last/$repo/os/$arch
-
-Server = http://mirrors.acm.wpi.edu/archlinux/$repo/os/$arch
-Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch
-Server = http://mirrors.aggregate.org/archlinux/$repo/os/$arch
-Server = http://ca.us.mirror.archlinux-br.org/$repo/os/$arch
-Server = http://il.us.mirror.archlinux-br.org/$repo/os/$arch
-Server = http://mirror.arizona.edu/archlinux/$repo/os/$arch
-Server = https://mirror.arizona.edu/archlinux/$repo/os/$arch
-Server = http://arlm.tyzoid.com/$repo/os/$arch
-Server = https://arlm.tyzoid.com/$repo/os/$arch
-Server = https://mirror.ava.dev/archlinux/$repo/os/$arch
-Server = http://mirrors.cat.pdx.edu/archlinux/$repo/os/$arch
-Server = http://mirror.cc.columbia.edu/pub/linux/archlinux/$repo/os/$arch
-Server = http://mirror.clarkson.edu/archlinux/$repo/os/$arch
-Server = https://mirror.clarkson.edu/archlinux/$repo/os/$arch
-Server = http://arch.mirror.constant.com/$repo/os/$arch
-Server = https://arch.mirror.constant.com/$repo/os/$arch
-Server = http://mirror.cs.pitt.edu/archlinux/$repo/os/$arch
-Server = http://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/$arch
-Server = http://mirror.cybersecurity.nmt.edu/archlinux/$repo/os/$arch
-Server = https://mirror.cybersecurity.nmt.edu/archlinux/$repo/os/$arch

base/setup.sh

@@ -1,21 +0,0 @@
-#!/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

makepkg.conf

@@ -147,7 +147,7 @@ COMPRESSLZ=(lzip -c -f)
 # EXTENSION DEFAULTS
 #########################################################################
 #
-PKGEXT='.pkg.tar.zst'
+PKGEXT='.pkg.tar.xz'
 SRCEXT='.src.tar.gz'
 
 #########################################################################

mirrorlist

@@ -0,0 +1,5 @@
+Server = https://mirror-all.magicuser.cf/archlinux/$repo/os/$arch
+Server = https://mirror-arch.magicuser.cf/$repo/os/$arch
+Server = https://mirror-arch1.magicuser.cf/archlinux/$repo/os/$arch
+
+Server = http://130.225.254.116/archlinux/$repo/os/$arch

pacman.conf

@@ -30,10 +30,10 @@ Architecture = auto
 
 # Misc options
 #UseSyslog
-Color
+#Color
 #NoProgressBar
 #CheckSpace
-VerbosePkgLists
+#VerbosePkgLists
 ParallelDownloads = 5
 
 # By default, pacman accepts packages signed by keys that its local keyring
@@ -100,5 +100,4 @@ Include = /etc/pacman.d/mirrorlist
 #Server = file:///home/custompkgs
 
 [medzikuser]
-SigLevel = DatabaseOptional
-Include = /etc/pacman.d/mirrorlist-medzikuser
+Include = /etc/pacman.d/medzikuser-mirrorlist