fix: cache dnf installs (and remove cache from images)

.gitea/workflows/build.yaml

@@ -7,18 +7,16 @@ on:
   pull_request:
     branches: ["main"]
     paths: ["containers/**", ".gitea/workflows/build.yaml"]
-  schedule:
-    - cron: "0 16 * * FRI"
 
 jobs:
   changes:
     runs-on: job-v2
     outputs:
-      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'}}
+      fedora: ${{ steps.filter.outputs.fedora == 'true' }}
+      php: ${{ steps.filter.outputs.php == 'true' }}
+      rust: ${{ steps.filter.outputs.rust == 'true' }}
+      dotnet: ${{ steps.filter.outputs.dotnet == 'true' }}
     steps:
       - uses: actions/checkout@v4
       - uses: https://github.com/dorny/paths-filter@v3
@@ -26,14 +24,14 @@ jobs:
         with:
           filters: |
             workflow: ['.gitea/workflows/build.yaml']
-            base: ['containers/base/**']
-            infra: ['containers/infra/**']
-            go: ['containers/go/**']
+            fedora: ['containers/fedora/**']
             php: ['containers/php/**']
+            rust: ['containers/rust/**']
+            dotnet: ['containers/dotnet/**']
 
   base-image:
     needs: [changes]
-    if: ${{ needs.changes.outputs.base == 'true' || needs.changes.outputs.any_change == 'true' }}
+    if: ${{ needs.changes.outputs.fedora == 'true' || needs.changes.outputs.any_change == 'true' }}
     runs-on: job-v2
     steps:
       - uses: actions/checkout@v4
@@ -47,11 +45,10 @@ jobs:
         id: build
         uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
         with:
-          image: job79/base
+          image: maurice/fedora
           tags: ${{ github.ref_name }}
-          context: ./containers/base
-          containerfiles: ./containers/base/Containerfile
-          platforms: linux/amd64
+          context: ./containers/fedora
+          containerfiles: ./containers/fedora/Containerfile
       - name: Push
         uses: redhat-actions/push-to-registry@v2
         with:
@@ -66,13 +63,20 @@ jobs:
 
   dependent-images:
     needs: [changes, base-image]
-    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')
+    if: always() && needs.changes.result == 'success' && (needs.base-image.result == 'success' || needs.base-image.result == 'skipped')
     runs-on: job-v2
     strategy:
       fail-fast: false
       matrix:
-        container: [infra, go, php]
+        container: [php, rust, dotnet]
     steps:
+      - name: Check if build needed
+        id: check
+        run: |
+          if [[ "${{ matrix.container }}" == "php" && "${{ needs.changes.outputs.php }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
+          if [[ "${{ matrix.container }}" == "rust" && "${{ needs.changes.outputs.rust }}" == "true" ]]; then echo "run=true" >> $GITHUB_OUTPUT; fi
+          if [[ "${{ matrix.container }}" == "dotnet" && "${{ needs.changes.outputs.dotnet }}" == "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
@@ -88,12 +92,11 @@ jobs:
         if: steps.check.outputs.run == 'true'
         uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
         with:
-          image: job79/${{ matrix.container }}
+          image: maurice/${{ matrix.container }}
           tags: ${{ github.ref_name }}
           context: ./containers/${{ matrix.container }}
           containerfiles: ./containers/${{ matrix.container }}/Containerfile
           build-args: TAG=${{ github.ref_name }}
-          platforms: linux/amd64
       - name: Push
         if: steps.check.outputs.run == 'true'
         uses: redhat-actions/push-to-registry@v2

.gitea/workflows/other.yaml

@@ -0,0 +1,40 @@
+name: Build optional dev containers
+on:
+  workflow_dispatch:
+
+jobs:
+  fedora-build:
+    runs-on: job-v2
+    strategy:
+      max-parallel: 1
+      matrix:
+        container: [rider, android]
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v4
+      - name: Log in
+        uses: redhat-actions/podman-login@v1
+        with:
+          registry: git.plabble.org
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - name: Build ${{ matrix.container }} container
+        id: build_image
+        uses: job79/buildah-build@65b3793a1370c1ccd74a5c0d090d70eb9637a4ef
+        with:
+          image: maurice/${{ matrix.container }}
+          tags: ${{ github.ref_name }}
+          context: ./containers/${{ matrix.container }}
+          containerfiles: ./containers/${{ matrix.container }}/Containerfile
+          build-args: TAG=${{ github.ref_name }}
+      - name: Push ${{ matrix.container }} container
+        uses: redhat-actions/push-to-registry@v2
+        with:
+          image: ${{ steps.build_image.outputs.image }}
+          tags: ${{ steps.build_image.outputs.tags }}
+          registry: git.plabble.org
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+          extra-args: |
+            --compression-format=zstd
+            --compression-level=12

containers/android/Containerfile

@@ -0,0 +1,20 @@
+FROM git.plabble.org/maurice/dotnet:main
+ARG studio_version="2025.1.4.8"
+ARG download_uri="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${studio_version}/android-studio-${studio_version}-linux.tar.gz"
+
+USER root
+
+RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
+  dnf -y --setopt=keepcache=1 install libXext libXrender libXtst libX11 freetype freetype-devel mesa-libGLU
+USER user
+
+RUN curl -Lo /tmp/studio.tar.gz "${download_uri}" && \
+    mkdir /home/user/AndroidStudio && \
+    mkdir /home/user/Android && \
+    tar -zxf /tmp/studio.tar.gz -C /home/user/AndroidStudio && \
+    rm /tmp/studio.tar.gz && \
+    mv /home/user/AndroidStudio/android-studio*/* /home/user/AndroidStudio
+
+RUN echo 'alias studio="$HOME/AndroidStudio/bin/studio"' >> /home/user/.bashrc
+RUN echo 'export ANDROID_HOME="$HOME/Android/Sdk"' >> /home/user/.bashrc
+RUN echo 'export PATH="$ANDROID_HOME/platform-tools:$PATH"' >> /home/user/.bashrc

containers/base/Containerfile

@@ -1,31 +0,0 @@
-FROM quay.io/fedora/fedora:44
-
-# === install system packages ===
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
-  dnf update -y && \
-  dnf copr enable -y atim/lazygit && \
-  dnf copr enable -y atim/lazydocker && \
-  dnf copr enable -y gierth/tools-golang && \
-  dnf copr enable -y agriffis/neovim-nightly && \
-  dnf -y --setopt=keepcache=1 install procps ping bash-completion glibc-langpack-en \
-    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=(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 -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
-
-VOLUME /home/user

containers/base/config/bashrc

@@ -1,17 +0,0 @@
-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" \
-  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; }
-
-eval "$(zoxide init --cmd cd bash)"
-eval "$(fzf --bash)"

containers/base/config/bin/host

@@ -1,6 +0,0 @@
-#!/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/base/config/bin/podman

@@ -1 +0,0 @@
-host

containers/base/config/bin/xdg-open

@@ -1 +0,0 @@
-host

containers/base/config/git

@@ -1,12 +0,0 @@
-[user]
-	email = job@plabble.org
-	name = Job79
-  signingKey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPsqM6ABAaCTQZ+llFXD3CXrYYuIHDEnvz8IBbXddYEc job@plabble.org
-[gpg]
-	format = ssh
-[commit]
-	gpgSign = true
-[push]
-	autoSetupRemote = true
-[init]
-	defaultBranch = main

containers/dotnet/Containerfile

@@ -0,0 +1,11 @@
+FROM git.plabble.org/maurice/fedora:main
+
+USER root
+RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
+  dnf -y --setopt=keepcache=1 install dotnet-sdk-9.0 dotnet-sdk-10.0
+
+COPY install-roslyn.sh /tmp/install-roslyn.sh
+RUN chmod +x /tmp/install-roslyn.sh && /tmp/install-roslyn.sh
+
+USER user
+RUN dotnet tool install --global dotnet-ef

containers/dotnet/install-roslyn.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+version="v1.39.15-beta.60"
+arch="linux-x64"
+link="https://github.com/OmniSharp/omnisharp-roslyn/releases/download/$version/omnisharp-$arch-net6.0.tar.gz"
+
+curl -Lo /tmp/omnisharp.tar.gz $link
+mkdir /home/user/.omnisharp
+tar -zxf /tmp/omnisharp.tar.gz -C /home/user/.omnisharp/
+chown -R user:user /home/user/.omnisharp

containers/fedora/Containerfile

@@ -0,0 +1,31 @@
+FROM quay.io/fedora/fedora:43
+
+# === install system packages ===
+RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
+  dnf update -y && \
+  dnf -y --setopt=keepcache=1 install procps ping bash-completion glibc-langpack-en \
+    host-spawn dbus-launch \
+    git pnpm helix zip
+
+# === setup user ===
+RUN useradd -ms /bin/bash user && \
+  usermod -aG wheel user && sed -i '/NOPASSWD/s/^#//g' /etc/sudoers && \
+  mkdir -p /run/user/1000 && chown user:user /run/user/1000
+
+# === Add host entry for podman ===
+RUN ln -s /usr/local/bin/host /usr/local/bin/podman
+
+USER user
+WORKDIR /home/user
+RUN mkdir .config .local .cache
+
+COPY --chown=user:user config/bashrc .bashrc
+COPY --chown=user:user config/git .config/git/config
+COPY --chown=user:user config/helix/ .config/helix/
+COPY config/bin /usr/local/bin
+
+# === Setup PNPM & install language servers ===
+RUN /bin/bash -c "SHELL=/bin/bash pnpm setup && . /home/user/.bashrc && pnpm i -g deno bash-language-server vscode-langservers-extracted dockerfile-language-server-nodejs \
+    typescript typescript-language-server"
+
+VOLUME /home/user

containers/fedora/config.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+arg "-p 5173:5173 --network dev-php"

containers/fedora/config/bashrc

@@ -0,0 +1,22 @@
+. /etc/bashrc
+
+# === environment ===
+export EDITOR=hx \
+  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\] " \
+  TZ="Europe/Amsterdam" \
+  SHELL="/bin/bash"
+
+# === aliases and functions ===
+pbcopy() { curl -sF "content=<-" "https://paste.plabble.org/$2?lang=$1" && echo; }
+alias random="cat /dev/urandom | tr -dc '[:alpha:]' | fold -w ${1:-20} | head -n 1"
+
+# Git aliases
+alias gc="git commit -m"
+alias ga="git add -A"
+alias gf="git fetch"
+alias gp="git pull"
+alias gpp="git push"
+alias gs="git status"

containers/fedora/config/bin/host

@@ -0,0 +1,4 @@
+#!/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/fedora/config/git

@@ -0,0 +1,12 @@
+[user]
+	email = maurict@pm.me
+	name = Maurice
+    signingKey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGL/am4HDyfV0OWwaI3CeKGypBdzNXOYSbcnm6tK/VB+ maurict@pm.me
+[gpg]
+	format = ssh
+[commit]
+	gpgSign = true
+[push]
+	autoSetupRemote = true
+[init]
+	defaultBranch = main

containers/fedora/config/helix/config.toml

@@ -0,0 +1,7 @@
+theme = "dark_plus"
+
+[editor]
+true-color = true
+
+[editor.file-picker]
+hidden = false

containers/fedora/config/helix/languages.toml

@@ -0,0 +1,12 @@
+# C#
+[language-server.omnisharp]
+command = "/home/user/.omnisharp/OmniSharp"
+args = [ "--languageserver" ]
+
+# Rust
+[language-server.rust-analyzer.config.check]
+command = "clippy"
+
+[[language]]
+name = "rust"
+formatter = { command = "rustfmt" }

containers/flutter/Containerfile

@@ -0,0 +1,11 @@
+FROM git.plabble.org/maurice/android:main
+ARG flutter_version="3.35.7-stable"
+ARG download_uri="https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${flutter_version}.tar.xz"
+
+RUN mkdir /home/user/Flutter && \
+    curl -Lo /tmp/flutter.tar.xz "${download_uri}" && \
+    tar -xf /tmp/flutter.tar.xz -C /home/user/Flutter && \
+    rm /tmp/flutter.tar.xz
+
+RUN echo 'export PATH="$HOME/Flutter/flutter/bin:$PATH"' >> /home/user/.bashrc
+RUN echo 'export FLUTTER_ROOT="$HOME/Flutter/flutter"' >> /home/user/.bashrc

containers/go/Containerfile

@@ -1,8 +0,0 @@
-ARG TAG
-FROM job79/base:${TAG}
-USER root
-
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
-  dnf -y --setopt=keepcache=1 install go
-
-USER user

containers/go/config.sh

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

containers/infra/Containerfile

@@ -1,10 +0,0 @@
-ARG TAG
-FROM job79/base:${TAG}
-USER root
-
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
-  dnf -y --setopt=keepcache=1 install kubectl k9s openssl age "$(curl -s https://api.github.com/repos/getsops/sops/releases/latest | jq -r ".assets[] | select(.name | test(\"sops-.*.$(arch).rpm\$\")) | .browser_download_url")" && \
-  curl -sL https://talos.dev/install | sh && \
-  curl -s https://fluxcd.io/install.sh | bash
-
-USER user

containers/infra/config.sh

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

containers/php/Containerfile

@@ -1,9 +1,4 @@
-ARG TAG
-FROM job79/base:${TAG}
-USER root
+FROM git.plabble.org/maurice/fedora:main
+ARG php_version="8.5"
 
-RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
-  dnf -y --setopt=keepcache=1 install php composer && \
-  composer global require laravel/installer
-
-USER user
+RUN /bin/bash -c "export TERM=xterm && $(curl -fsSL https://php.new/install/linux/${php_version})"

containers/php/config.sh

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

containers/rider/Containerfile

@@ -0,0 +1,16 @@
+FROM git.plabble.org/maurice/dotnet:main
+ARG rider_version="2025.3.0.3"
+ARG download_uri="https://download.jetbrains.com/rider/JetBrains.Rider-${rider_version}.tar.gz"
+
+USER root
+RUN --mount=type=cache,id=dnf-cache,target=/var/cache/libdnf5 \
+  dnf -y --setopt=keepcache=1 install libXext libXrender libXtst libX11 freetype freetype-devel
+USER user
+
+RUN curl -Lo /tmp/rider.tar.gz "${download_uri}" && \
+    mkdir /home/user/Rider && \
+    tar -zxf /tmp/rider.tar.gz -C /home/user/Rider && \
+    rm /tmp/rider.tar.gz && \
+    mv /home/user/Rider/JetBrains*/* /home/user/Rider
+
+RUN echo 'alias rider="$HOME/Rider/bin/rider"' >> /home/user/.bashrc

containers/rider/config.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+arg "-p 8080:8080"
+arg "-p 8081:8081"

containers/rust/Containerfile

@@ -0,0 +1,4 @@
+FROM git.plabble.org/maurice/fedora:main
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+RUN . '/home/user/.cargo/env' && rustup component add rust-analyzer

devc.sh

@@ -1,87 +1,124 @@
 #!/bin/bash
 # =============================================== #
-# devc.sh v2.1; job79, maurice                    #
-# Dev container entry script.                     #
+# devc.sh v2.0; job79, maurice                    #
+# Dev container enter script. Handles setting up  #
+# different dev containers, resuming sessions and #
+# automatic container updates.                    #
 # =============================================== #
-set -euo pipefail
+set -eu
 log() { printf '\e[%sm%s\e[0m %s\n' "${3:-36}" "${2:-○}" "$1"; }
-die() { log "$1" 'x' 31 && exit 1; }
+arg() { echo -n " $@"; }
 
-# default_args configures standard container options.
+# run_args returns the podman run arguments required for
+# starting a new container.
 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.
-  )
+  arg "--name $name"
+  arg "--hostname $name"
 
-  # Unix sockets require SELinux label disable.
-  [[ -d /sys/fs/selinux ]] && run_opts+=("--security-opt" "label=disable")
+  # Pull newer container image if available.
+  arg "--pull=newer"
 
-  # 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")
+  # Use keep-id so the container user matches the host user.
+  arg "--userns=keep-id"
 
-  # Load custom container config.
-  local config_file="${BASH_SOURCE[0]%/*}/containers/$name/config.sh"
-  [[ -f "$config_file" ]] && source "$config_file" || true
+  # Disable selinux labeling so unix sockets can be mounted
+  # without problems.
+  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}"
 }
 
-# param_args parses CLI arguments into podman run options.
+# param_args returns the podman run arguments based on the
+# arguments provided to this script.
 param_args() {
-  while (($# > 0)); do
+  while test $# -gt 0; do
     case "$1" in
-    -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")
+    -gpu) # Enable gpu acceleration.
+      arg "--device /dev/dri" ;;
+    -kvm) # Enable KVM
+      arg "--device /dev/kvm" ;;
+    -usb) # Enable USB access
+      arg "--device /dev/bus/usb" ;;
+    -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.
       ;;
-    -mnt)
-      local type=''
-      [[ ! -d "$2" ]] && type='file'
-      run_opts+=("-w" "/mnt/" "-v" "$2:/mnt/$type")
+    -net) # Enable network dev-<container name>
+      arg "--network dev-$name"
+      ;;
+    -mnt) # Mount directory.
       shift
+      arg "-w /workdir/"
+      arg "-v $1:/workdir/$([ ! -d "$1" ] && echo $1)"
       ;;
-    *) run_opts+=("$1") ;;
+    -mdf) # Mount dev folder
+      arg "-v $HOME/dev:/home/user/dev"
+      ;;
+    -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"
+      ;;
+    *) # Use unknown arguments a podman arguments.
+      arg "$1" ;;
     esac
     shift
   done
 }
 
-main() {
-  local state_file="$HOME/.local/share/devc-previous-container"
-  local image="${1:-}"
+### MAIN ###
+# 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 [ "$(podman container inspect "$name" -f {{.State.Running}} 2>&1)" != 'true' ] || [[ $# -gt 0 ]]; then
+  log "starting devcontainer..."
+  podman network create --ignore "dev-$name"
+  podman container rm -f -t 0 "$name" 1>/dev/null
+  podman 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
-
-  exec podman exec --detach-keys "ctrl-@,ctrl-@" -it "$name" ${DEVC_COMMAND:-bash -l}
-}
-
-main "$@"
+podman exec --detach-keys "ctrl-@" -it "$name" ${DEVC_COMMAND:-}

example-bashrc

@@ -0,0 +1,28 @@
+# Tools
+pbcopy() { curl -sF "content=<-" "https://paste.plabble.org/$2?lang=$1" && echo; }
+alias code="flatpak run com.visualstudio.code"
+alias random="cat /dev/urandom | tr -dc '[:alpha:]' | fold -w ${1:-20} | head -n 1"
+
+# Dev containers
+export DEVC_REGISTRY="git.plabble.org/maurice"
+
+function devc() {
+    "$HOME/dev/devcontainer/devc.sh" "$@" -mdf
+}
+
+alias rider="DEVC_COMMAND=/home/user/Rider/bin/rider devc rider -x11 -host-spawn -net"
+alias flutter="devc flutter -x11 -host-spawn -kvm -usb -gpu"
+alias androidstudio="DEVC_COMMAND=/home/user/AndroidStudio/bin/studio devc android -x11 -host-spawn -kvm -usb -gpu"
+
+function hx() {
+    arg="${1:-.}"
+    DEVC_COMMAND="hx $arg" devc fedora -mnt $arg
+}
+
+# Git aliases
+alias gc="git commit -m"
+alias ga="git add -A"
+alias gf="git fetch"
+alias gp="git pull"
+alias gpp="git push"
+alias gs="git status"