add system users

please work

.gitea/workflows/build-docker-images.yml

@@ -2,9 +2,11 @@ name: Docker Image CI
 
 on:
   workflow_dispatch:
-    branches: [ main ]
+    branches: [ master ]
   push:
     branches: [ master ]
+  pull_request:
+    branches: [ master ]
   schedule:
     - cron: '0 5 * * 3'
   
@@ -18,11 +20,12 @@ jobs:
       matrix:
         images:
           [
-            devel,
-            openrc,
-            runit,
-            s6,
-            dinit
+            base-devel,
+            base-openrc,
+            base-runit,
+            base-s6,
+            base-dinit,
+            base
           ]
     env:
       REGISTRY: gitea.artixlinux.org
@@ -40,25 +43,27 @@ jobs:
       uses: https://github.com/actions/checkout@v4
     - name: Set up docker
       run: curl -fsSL https://get.docker.com | sh
+    # - name: Set up Docker Buildx
+    #   id: buildx
+    #   uses: docker/setup-buildx-action@v2
+    #   with:
+    #     install: true
+    - name: Define metadata variables
+      run: |
+        sed -i "s/ARG version=.*/ARG version=$(date +'%Y%m%d').0.${{ gitea.sha }}/" Dockerfile
+        sed -i "s/ARG githash=.*/ARG githash=${{ gitea.sha }}/" Dockerfile
+        sed -i "s/ARG created=.*/ARG created=$(date -u +'%Y-%m-%dT%H:%M:%S%:z')/" Dockerfile
+        cat Dockerfile
     - name: Build Docker image
       uses: https://github.com/docker/build-push-action@v5
       with:
         push: false
         pull: true
+        no-cache: true
         context: .
         build-args:  |
           img=${{ matrix.images }}
-        tags: "${{ env.ABSOLUTE_IMAGE }}:base-${{ matrix.images }},${{ env.ABSOLUTE_DH_IMAGE }}:${{ matrix.images }}"
-    - name: Create latest tag
-      if: matrix.images == 'devel'
-      uses: https://github.com/docker/build-push-action@v5
-      with:
-        push: false
-        pull: true
-        context: .
-        build-args:  |
-          img=${{ matrix.images }}
-        tags: "${{ env.ABSOLUTE_IMAGE }}:latest,${{ env.ABSOLUTE_DH_IMAGE }}:latest"
+        tags: "${{ env.ABSOLUTE_IMAGE }}:${{ matrix.images }},${{ env.ABSOLUTE_DH_IMAGE }}:${{ matrix.images }},${{ env.ABSOLUTE_IMAGE }}:latest,${{ env.ABSOLUTE_DH_IMAGE }}:latest"
     - name: Log in to the Container registry
       uses: https://github.com/docker/login-action@v2
       with:
@@ -66,10 +71,10 @@ jobs:
         username: ${{ gitea.actor }}
         password: ${{ secrets.PAT }}
     - name: Push to Gitea
-      if: gitea.event_name == 'push' || gitea.event_name == 'schedule'
-      run: docker push "${{ env.ABSOLUTE_IMAGE }}:base-${{ matrix.images }}"
+      if: github.ref == 'refs/heads/master' && ( gitea.event_name == 'push' || gitea.event_name == 'schedule' )
+      run: docker push "${{ env.ABSOLUTE_IMAGE }}:${{ matrix.images }}"
     - name: Push latest tag
-      if: ( gitea.event_name == 'push' || gitea.event_name == 'schedule' ) && matrix.images == 'devel'
+      if: ( github.ref == 'refs/heads/master' && ( gitea.event_name == 'push' || gitea.event_name == 'schedule' ) ) && matrix.images == 'base'
       run: docker push "${{ env.ABSOLUTE_IMAGE }}:latest"
     - name: Log in to the Docker Hub
       uses: https://github.com/docker/login-action@v2
@@ -78,8 +83,8 @@ jobs:
         username: ${{ secrets.DOCKERHUB_USER }}
         password: ${{ secrets.DOCKERHUB }}
     - name: Push to Docker Hub
-      if: gitea.event_name == 'push' || gitea.event_name == 'schedule'
+      if: github.ref == 'refs/heads/master' && ( gitea.event_name == 'push' || gitea.event_name == 'schedule' )
       run: docker push "${{ env.ABSOLUTE_DH_IMAGE }}:${{ matrix.images }}"
     - name: Push latest tag
-      if: ( gitea.event_name == 'push' || gitea.event_name == 'schedule' ) && matrix.images == 'devel'
+      if: ( github.ref == 'refs/heads/master' && ( gitea.event_name == 'push' || gitea.event_name == 'schedule' ) ) && matrix.images == 'base'
       run: docker push "${{ env.ABSOLUTE_DH_IMAGE }}:latest"

Dockerfile

@@ -1,25 +1,39 @@
-FROM gitea.artixlinux.org/artixdocker/artixlinux:latest as base
+FROM artixlinux/artixlinux:latest AS build
 
+WORKDIR /usr/artixlinux-docker
 RUN pacman -Syu --noconfirm && \
   pacman -Sy --noconfirm artools curl make fakechroot fakeroot
-WORKDIR /usr/artixlinux-docker
+ARG img=base-devel
 COPY . .
-
-FROM base as build
-WORKDIR /usr/artixlinux-docker
-ARG img=devel
-RUN make "dockerfile-base-${img}"
+RUN make "dockerfile-${img}"
 WORKDIR /usr/artixlinux-docker/output
-RUN ROOTFS=base-${img}.tar.zst && \
-    sha256sum -c base-${img}.tar.zst.SHA256 && \
+COPY . .
+RUN ROOTFS=${img}.tar.zst && \
+    sha256sum -c ${img}.tar.zst.SHA256 && \
     mkdir /rootfs && \
     tar -C /rootfs --extract --file "${ROOTFS}"
 
 FROM scratch AS root
+ARG img=base-devel
+ARG version=VERSION
+ARG githash=REVISION
+ARG created=CREATED
+LABEL org.opencontainers.image.title="Artix Linux ${img} Image"
+LABEL org.opencontainers.image.description="Official containerd image of Artix Linux, a fork of Arch Linux that respects init freedom."
+LABEL org.opencontainers.image.vendor="Artix Linux"
+LABEL org.opencontainers.image.authors="Cory Sanin <corysanin@artixlinux.org>, artoo <artoo@artixlinux.org>, Chris Cromer <cromer@artixlinux.org>"
+LABEL org.opencontainers.image.url="https://gitea.artixlinux.org/artixdocker"
+LABEL org.opencontainers.image.documentation="https://wiki.artixlinux.org/"
+LABEL org.opencontainers.image.source="https://gitea.artixlinux.org/artixdocker/artixlinux-docker"
+LABEL org.opencontainers.image.licenses="GPL-3.0-or-later"
+LABEL org.opencontainers.image.version="${version}"
+LABEL org.opencontainers.image.revision="${githash}"
+LABEL org.opencontainers.image.created="${created}"
+
 COPY --from=build /rootfs/ /
 
 RUN ldconfig && \
-    sed -i '/BUILD_ID/a VERSION_ID=TEMPLATE_VERSION_ID' /etc/os-release
+    sed -i "/BUILD_ID/a VERSION_ID=${version}" /etc/os-release
 
 ENV LANG=C.UTF-8
 CMD ["/usr/bin/bash"]

Makefile

@@ -25,6 +25,8 @@ define rootfs
 
 	fakechroot fakeroot chroot $(BUILDDIR) sh -c 'pacman-key --init && pacman-key --populate && rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}*'
 
+	fakechroot fakeroot chroot $(BUILDDIR) /usr/bin/esysusers --root "/"
+
 	ln -fs /usr/lib/os-release $(BUILDDIR)/etc/os-release
 
 	# add system users
@@ -53,6 +55,9 @@ endef
 clean:
 	rm -rf $(BUILDDIR) $(OUTPUTDIR)
 
+$(OUTPUTDIR)/base.tar.zst:
+	$(call rootfs,base,base)
+
 $(OUTPUTDIR)/base-openrc.tar.zst:
 	$(call rootfs,base-openrc,base,elogind-openrc)
 
@@ -65,6 +70,9 @@ $(OUTPUTDIR)/base-s6.tar.zst:
 $(OUTPUTDIR)/base-dinit.tar.zst:
 	$(call rootfs,base-dinit,base,elogind-dinit)
 
+$(OUTPUTDIR)/Dockerfile.base: $(OUTPUTDIR)/base.tar.zst
+	$(call dockerfile,base)
+
 $(OUTPUTDIR)/Dockerfile.base-openrc: $(OUTPUTDIR)/base-openrc.tar.zst
 	$(call dockerfile,base-openrc)
 
@@ -95,6 +103,9 @@ dockerfile-base-s6: $(OUTPUTDIR)/Dockerfile.base-s6
 .PHONY: docker-file-base-dinit
 dockerfile-base-dinit: $(OUTPUTDIR)/Dockerfile.base-dinit
 
+.PHONY: docker-file-base
+dockerfile-base: $(OUTPUTDIR)/Dockerfile.base
+
 .PHONY: docker-file-base-devel
 dockerfile-base-devel: $(OUTPUTDIR)/Dockerfile.base-devel
 
@@ -114,6 +125,10 @@ image-base-s6: $(OUTPUTDIR)/Dockerfile.base-s6
 image-base-dinit: $(OUTPUTDIR)/Dockerfile.base-dinit
 	${DOCKER} build -f $(OUTPUTDIR)/Dockerfile.base-dinit -t $(REGISTRY)/$(OWNER)/artixlinux:base-dinit $(OUTPUTDIR)
 
+.PHONY: docker-image-base
+image-base: $(OUTPUTDIR)/Dockerfile.base
+	${DOCKER} build -f $(OUTPUTDIR)/Dockerfile.base -t $(REGISTRY)/$(OWNER)/artixlinux:base $(OUTPUTDIR)
+
 .PHONY: docker-image-base-devel
 image-base-devel: $(OUTPUTDIR)/Dockerfile.base-devel
 	${DOCKER} build -f $(OUTPUTDIR)/Dockerfile.base-devel -t $(REGISTRY)/$(OWNER)/artixlinux:base-devel $(OUTPUTDIR)

dockerhub-readme.md

@@ -10,11 +10,12 @@
 
 # Supported tags
 
-* latest, devel
-* dinit
-* openrc
-* runit
-* s6
+* latest, base
+* base-devel
+* base-dinit
+* base-openrc
+* base-runit
+* base-s6
 
 ## Dockerfile repo
 
@@ -31,8 +32,8 @@
 # How to run
 
 ```
-docker pull artixlinux/artixlinux:devel
-docker run -it --rm artixlinux/artixlinux:devel /bin/bash
+docker pull artixlinux/artixlinux:base
+docker run -it --rm artixlinux/artixlinux:base /bin/bash
 ```
 
 Note that `--rm` removes the container on exit.