refactor: simplify devc script

.gitea/workflows/build.yaml

@@ -14,10 +14,10 @@ jobs:
   changes:
     runs-on: job-v2
     outputs:
-      fedora: ${{ steps.filter.outputs.fedora == 'true' }}
-      infra: ${{ steps.filter.outputs.infra == 'true' || steps.filter.outputs.fedora == 'true' }}
-      go: ${{ steps.filter.outputs.go == 'true' || steps.filter.outputs.fedora == 'true' }}
-      php: ${{ steps.filter.outputs.php == 'true' || steps.filter.outputs.fedora == 'true' }}
+      base: ${{ steps.filter.outputs.base == 'true' }}
+      infra: ${{ steps.filter.outputs.infra == 'true' || steps.filter.outputs.base == 'true' }}
+      go: ${{ steps.filter.outputs.go == 'true' || steps.filter.outputs.base == 'true' }}
+      php: ${{ steps.filter.outputs.php == 'true' || steps.filter.outputs.base == 'true' }}
       any_change: ${{ steps.filter.outputs.workflow == 'true' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}}
     steps:
       - uses: actions/checkout@v4
@@ -26,14 +26,14 @@ jobs:
         with:
           filters: |
             workflow: ['.gitea/workflows/build.yaml']
-            fedora: ['containers/fedora/**']
+            base: ['containers/base/**']
             infra: ['containers/infra/**']
             go: ['containers/go/**']
             php: ['containers/php/**']
 
   base-image:
     needs: [changes]
-    if: ${{ needs.changes.outputs.fedora == 'true' || needs.changes.outputs.any_change == 'true' }}
+    if: ${{ needs.changes.outputs.base == 'true' || needs.changes.outputs.any_change == 'true' }}
     runs-on: job-v2
     steps:
       - uses: actions/checkout@v4
@@ -47,10 +47,10 @@ jobs:
         id: build
         uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
         with:
-          image: job79/fedora
+          image: job79/base
           tags: ${{ github.ref_name }}
-          context: ./containers/fedora
-          containerfiles: ./containers/fedora/Containerfile
+          context: ./containers/base
+          containerfiles: ./containers/base/Containerfile
           platforms: linux/amd64
       - name: Push
         uses: redhat-actions/push-to-registry@v2
@@ -66,20 +66,13 @@ jobs:
 
   dependent-images:
     needs: [changes, base-image]
-    if: always() && needs.changes.result == 'success' && (needs.base-image.result == 'success' || needs.base-image.result == 'skipped')
+    if: always() && needs.changes.result == 'success' && (needs.base-image.result == 'success' || needs.base-image.result == 'skipped') && (needs.changes.outputs[matrix.container] == 'true' || needs.changes.outputs.any_change == 'true')
     runs-on: job-v2
     strategy:
       fail-fast: false
       matrix:
         container: [infra, go, php]
     steps:
-      - name: Check if build needed
-        id: check
-        run: |
-          if [[ "${{ matrix.container }}" == "infra" && "${{ needs.changes.outputs.infra }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-          if [[ "${{ matrix.container }}" == "go" && "${{ needs.changes.outputs.go }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-          if [[ "${{ matrix.container }}" == "php" && "${{ needs.changes.outputs.php }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
-          if [[ "${{ needs.changes.outputs.any_change }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
       - name: Clone repo
         if: steps.check.outputs.run == 'true'
         uses: actions/checkout@v4

containers/base/Containerfile

@@ -11,16 +11,21 @@ RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
     host-spawn dbus-launch \
     zoxide git npm neovim awk jq unzip fd-find lazygit lazydocker lazysql
 
+COPY config/bin /usr/local/bin
+
 # === setup user ===
-RUN useradd -ms /bin/bash user && echo 'user ALL=NOPASSWD: ALL' > /etc/sudoers && mkdir -p /run/user/1000 && chown user:user /run/user/1000
+RUN useradd -ms /bin/bash user && \
+  echo 'user ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/user && \
+  mkdir -p /run/user/1000 && \
+  chown user:user /run/user/1000
 
 USER user
 WORKDIR /home/user
 
-RUN mkdir .config .local .cache && \
+RUN mkdir -p .config .local .cache && \
   git clone https://git.plabble.org/Job79/neovim-config.git .config/nvim
+
 COPY --chown=user:user config/bashrc .bashrc
 COPY --chown=user:user config/git .config/git/config
-COPY config/bin /usr/local/bin
 
 VOLUME /home/user

containers/base/config/bashrc

@@ -1,13 +1,14 @@
-. /etc/bashrc
+source /etc/bashrc
 
 # === environment ===
-export EDITOR=nvim \
-  WAYLAND_DISPLAY=wayland-0 \
-  XDG_RUNTIME_DIR=/run/user/1000 \
-  SSH_AUTH_SOCK=/run/user/1000/ssh-auth-sock \
-  PS1="\[\e[30;46m\] \h | \w \[\e[0;36m\]\[\e[m\] " \
+export EDITOR="nvim" \
+  WAYLAND_DISPLAY="wayland-0" \
+  XDG_RUNTIME_DIR="/run/user/1000" \
+  SSH_AUTH_SOCK="/run/user/1000/ssh-auth-sock" \
   TZ="Europe/Amsterdam"
 
+PS1="\[\e[30;46m\] \h | \w \[\e[0;36m\]\[\e[m\] "
+
 # === aliases and functions ===
 alias vi=nvim
 post() { curl -sF "content=<-" "https://paste.plabble.org/$2?lang=$1" && echo; }

containers/base/config/bin/host

@@ -0,0 +1,6 @@
+#!/bin/bash
+export DBUS_SESSION_BUS_ADDRESS="unix:path=/tmp/bus"
+
+cmd="${0##*/}"
+[[ "$cmd" == "host" ]] && unset cmd
+exec host-spawn -cwd "${PWD/#$HOME/$HOST_HOME}" ${cmd:+"$cmd"} "$@"

containers/fedora/config/bin/host

@@ -1,4 +0,0 @@
-#!/bin/bash
-export DBUS_SESSION_BUS_ADDRESS=unix:path=/tmp/bus
-host-spawn -cwd "${PWD/#$HOME/$HOST_HOME}" \
-  $([ "$(basename "$0")" != "host" ] && echo "$(basename "$0")") "$@"

containers/go/Containerfile

@@ -1,5 +1,5 @@
 ARG TAG
-FROM job79/fedora:${TAG}
+FROM job79/base:${TAG}
 USER root
 
 RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \

containers/go/config.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-arg "-v $HOME/Documents/go:/home/user/Documents/go"
+run_opts+=("-v" "$HOME/Documents/go:/home/user/Documents/go")

containers/infra/Containerfile

@@ -1,5 +1,5 @@
 ARG TAG
-FROM job79/fedora:${TAG}
+FROM job79/base:${TAG}
 USER root
 
 RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \

containers/infra/config.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-arg "-v $HOME/Documents/infra:/home/user/Documents/infra"
+run_opts+=("-v" "$HOME/Documents/infra:/home/user/Documents/infra")

containers/php/Containerfile

@@ -1,5 +1,5 @@
 ARG TAG
-FROM job79/fedora:${TAG}
+FROM job79/base:${TAG}
 USER root
 
 RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \

containers/php/config.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-arg "-v $HOME/Documents/php:/home/user/Documents/php"
+run_opts+=("-v" "$HOME/Documents/php:/home/user/Documents/php")

devc.sh

@@ -1,122 +1,90 @@
 #!/bin/bash
 # =============================================== #
-# devc.sh v2.0; job79                             #
-# Dev container enter script. Handles setting up  #
-# different dev containers, resuming sessions and #
-# automatic container updates.                    #
+# devc.sh v2.1; job79, maurice                    #
+# Dev container entry script.                     #
 # =============================================== #
-set -eu
+set -euo pipefail
 log() { printf '\e[%sm%s\e[0m %s\n' "${3:-36}" "${2:-○}" "$1"; }
-arg() { echo -n " $@"; }
-
-# run_args returns the container run arguments required for
-# starting a new container.
-default_args() {
-  arg "--name $name"
-  arg "--hostname $name"
-
-  # Pull newer container image if available.
-  arg "--pull=newer"
-
-  # Use keep-id so the container user matches the host user.
-  arg "--userns=keep-id"
-
-  # Disable selinux labeling so unix sockets can be mounted
-  # without problems.
-  [ -d /sys/fs/selinux ] && arg "--security-opt label=disable"
-
-  # Mount the wayland socket. Required to get the system
-  # clipboard (wl-copy) and gui applications working.
-  [ -e "/run/user/$UID/wayland-0" ] && arg "-v /run/user/$UID/wayland-0:/run/user/1000/wayland-0"
-
-  # Mount the ssh socket to get ssh working.
-  [ -e "$SSH_AUTH_SOCK" ] && arg "-v $SSH_AUTH_SOCK:/run/user/1000/ssh-auth-sock"
-
-  # Make the user home dir a volume so it survives container
-  # restarts. Use copy to keep the files from the image.
-  arg "-v $name:/home/user:copy"
-
-  # If there is custom configuration for the container, load
-  # it here.
-  config_file="$(dirname "$(realpath "$0")")/containers/$name/config.sh"
-  [ -f "$config_file" ] && source "${config_file}"
+die() {
+  log "$1" 'x' 31
+  exit 1
 }
 
-# param_args returns the container run arguments based on the
-# arguments provided to this script.
+# default_args configures standard container options.
+default_args() {
+  run_opts+=(
+    "--name" "$name"
+    "--hostname" "$name"
+    "--pull=newer"               # Update image.
+    "--userns=keep-id"           # Map host user.
+    "--net=devc"                 # Shared network.
+    "-v" "$name:/home/user:copy" # Persistent home volume.
+  )
+
+  # Unix sockets require SELinux label disable.
+  [[ -d /sys/fs/selinux ]] && run_opts+=("--security-opt" "label=disable")
+
+  # Desktop integration (Wayland, SSH).
+  [[ -e "/run/user/$UID/wayland-0" ]] && run_opts+=("-v" "/run/user/$UID/wayland-0:/run/user/1000/wayland-0")
+  [[ -e "${SSH_AUTH_SOCK:-}" ]] && run_opts+=("-v" "$SSH_AUTH_SOCK:/run/user/1000/ssh-auth-sock")
+
+  # Load custom container config.
+  local config_file="$(dirname "$(realpath "$0")")/containers/$name/config.sh"
+  [[ -f "$config_file" ]] && source "${config_file}"
+}
+
+# param_args parses CLI arguments into podman run options.
 param_args() {
-  while test $# -gt 0; do
+  while (($# > 0)); do
     case "$1" in
-    -gpu) # Enable gpu acceleration.
-      arg "--device /dev/dri" ;;
-    -host-spawn) # Enable spawning host commands from inside the container using host-spawn.
-      arg "-v /run/user/$UID/bus:/tmp/bus"
-      arg "-e HOST_HOME=$HOME" # Used to translate paths.
+    -gpu) run_opts+=("--device" "/dev/dri") ;;
+    -host-spawn) run_opts+=("-v" "/run/user/$UID/bus:/tmp/bus" "-e" "HOST_HOME=$HOME") ;;
+    -container-sock) run_opts+=("-v" "${XDG_RUNTIME_DIR:-/run/user/$UID}/podman/podman.sock:/var/run/docker.sock") ;;
+    -x11)
+      run_opts+=("-v" "/tmp/.X11-unix:/tmp/.X11-unix" "-v" "${XAUTHORITY:-$HOME/.Xauthority}:/run/user/1000/.Xauthority:ro")
+      run_opts+=("-e" "DISPLAY=${DISPLAY:-:0}" "-e" "XAUTHORITY=/run/user/1000/.Xauthority")
       ;;
-    -container-sock) # Mount container sock into the container.
-      case "$(basename "$engine")" in
-      podman) arg "-v /run/user/$UID/podman/podman.sock:/var/run/docker.sock" ;;
-      docker) arg "-v /var/run/docker.sock:/var/run/docker.sock" ;;
-      esac
-      ;;
-    -x11) # Enable X11 support.
-      arg "-v /tmp/.X11-unix:/tmp/.X11-unix"
-      arg "-v $XAUTHORITY:/run/user/1000/.Xauthority:ro"
-      arg "-e DISPLAY=$DISPLAY"
-      arg "-e XAUTHORITY=/run/user/1000/.Xauthority"
-      ;;
-    -mnt) # Mount directory.
+    -mnt)
+      local type=''
+      [[ ! -d "$2" ]] && type='file'
+      run_opts+=("-w" "/mnt/" "-v" "$2:/mnt/$type")
       shift
-      arg "-w /mnt/"
-      arg "-v $1:/mnt/$([ ! -d "$1" ] && echo 'file')"
       ;;
-    *) # Use unknown arguments as container arguments.
-      arg "$1" ;;
+    *) run_opts+=("$1") ;;
     esac
     shift
   done
 }
 
-### MAIN ###
-engine="$(command -v podman || command -v docker)"
-[ -z "$engine" ] && echo "no container engine found" && exit 1
+main() {
+  local state_file="$HOME/.local/share/devc-previous-container"
+  local image="${1:-}"
 
-# Get the devcontainer name from the first argument. If not
-# provided, use the last used name when possible.
-if [[ $# -gt 0 ]] && [[ ${1:-} != -* ]]; then
-  image="$1"
-  [[ "$image" != *:* ]] && image="$image:main"
-  echo "$image" >"$HOME/.local/share/devc-previous-container"
-  shift
-elif [ -f "$HOME/.local/share/devc-previous-container" ]; then
-  image=$(<"$HOME/.local/share/devc-previous-container")
-else
-  log "no container name specified" 'x' 31
-  exit 1
-fi
-name="${image%:*}"
+  # Resolve container name (CLI arg > Last used > Error).
+  if [[ $image && $image != -* ]]; then
+    shift
+    [[ $image == *:* ]] || image+=":main"
+    mkdir -p "${state_file%/*}" && echo "$image" >"$state_file"
+  elif [[ -f $state_file ]]; then
+    image=$(<$state_file)
+  else
+    die "no container name specified"
+  fi
+  local name="${image%:*}"
 
-# Get container registry from the DEVC_REGISTRY env
-# variable.
-if [ -n "${DEVC_REGISTRY:-}" ]; then
-  registry="$DEVC_REGISTRY"
-else
-  log "registry unknown; set the DEVC_REGISTRY environment variable" 'x' 31
-  exit 1
-fi
+  # Start/Restart if not running or if arguments change configuration.
+  if [[ -z "$(podman ps -q -f name="^$name$" -f status=running)" ]] || (($# > 0)); then
+    log "starting $image..."
+    [[ -n "${DEVC_REGISTRY:-}" ]] || die "registry unknown; set the DEVC_REGISTRY environment variable"
 
-# Get container command from the DEVC_COMMAND env variable
-# if set, else use bash -l.
-if [ -z "${DEVC_COMMAND:-}" ]; then
-  DEVC_COMMAND="bash -l"
-fi
+    default_args
+    param_args "$@"
 
-# When container is not running or arguments are provided,
-# recreate it.
-if [ "$($engine container inspect "$name" -f {{.State.Running}} 2>&1)" != 'true' ] || [[ $# -gt 0 ]]; then
-  log "starting devcontainer..."
-  $engine container rm -f -t 0 "$name" 1>/dev/null
-  $engine run -td $(default_args) $(param_args $@) "$registry/$image"
-fi
+    podman network create --ignore "devc" &>/dev/null
+    podman run --replace --stop-timeout 0 -td "${run_opts[@]}" "$DEVC_REGISTRY/$image"
+  fi
 
-$engine exec --detach-keys "ctrl-@,ctrl-@" -it "$name" ${DEVC_COMMAND:-}
+  exec podman exec --detach-keys "ctrl-@,ctrl-@" -it "$name" ${DEVC_COMMAND:-bash -l}
+}
+
+main "$@"