Merge pull request #48 from kachick/push-systemd

Push systemd image into ghcr.io
kachick · Mar 8, 2024 · 1fc1e34 · 1fc1e34
2 parents 8e4df08 + e7b2f9b
commit 1fc1e34
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
@@ -34,8 +34,7 @@ jobs:
           tags: latest ${{ github.sha }} ${{ steps.get-meta.outputs.started_at }}
           containerfiles: |
             ./images/ubuntu-nix-sudoer/Containerfile
-          build-args: |
-            username=user
+            ./images/ubuntu-nix-systemd/Containerfile
           oci: true
       - name: Push To ghcr.io
         id: push-to-ghcr

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Usage is written in README.md in each images directory.
 
 ## Container Images
 
-| Name                                            | Build in loccal                               | Pull from container registry                           |
-| ----------------------------------------------- | --------------------------------------------- | ------------------------------------------------------ |
-| [ubuntu-nix-sudoer](images/ubuntu-nix-sudoer)   | `task try IMAGE=ubuntu-nix-sudoer USER=user`  | `podman pull ghcr.io/kachick/ubuntu-nix-sudoer:latest` |
-| [ubuntu-nix-systemd](images/ubuntu-nix-systemd) | `task try IMAGE=ubuntu-nix-systemd USER=user` |                                                        |
+| Name                                            | Build in loccal                               | Pull from container registry and login the shell                                                                                |
+| ----------------------------------------------- | --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| [ubuntu-nix-sudoer](images/ubuntu-nix-sudoer)   | `task try IMAGE=ubuntu-nix-sudoer USER=user`  | `podman run -it ghcr.io/kachick/ubuntu-nix-sudoer:latest`                                                                       |
+| [ubuntu-nix-systemd](images/ubuntu-nix-systemd) | `task try IMAGE=ubuntu-nix-systemd USER=user` | `podman run ghcr.io/kachick/ubuntu-nix-systemd:latest && podman exec -it --user=user ghcr.io/kachick/ubuntu-nix-systemd:latest` |
diff --git a/images/ubuntu-nix-sudoer/Containerfile b/images/ubuntu-nix-sudoer/Containerfile
@@ -13,7 +13,7 @@ RUN apt-get update \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
-ARG username
+ARG username="user"
 
 RUN useradd --no-log-init --create-home --groups sudo $username
 

diff --git a/images/ubuntu-nix-systemd/Containerfile b/images/ubuntu-nix-systemd/Containerfile
@@ -15,7 +15,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/
   --no-start-daemon \
   --no-confirm
 
-ARG username
+ARG username="user"
 RUN useradd --no-log-init --create-home $username
 
 CMD [ "/bin/systemd", "--system" ]