removing ansible components

Author: jackaltx

.github/workflows/build.yml

@@ -7,8 +7,8 @@ on:
     paths:
       - 'debian12-ssh/**'
       - 'rocky93-ssh/**'
-      - 'debian24-ssh/**'
-      - 'scripts/**'
+      - 'ubuntu24-ssh/**'
+      - 'build.sh'
       - '.github/workflows/build.yml'
   pull_request:
     branches: [ "main" ]
@@ -33,67 +33,20 @@ jobs:
       fail-fast: false
 
     steps:
-      # .................................................................
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # .................................................................
-      - name: Set up environment variables
-        run: |
-          echo "CONTAINER_TOKEN=${{ secrets.CONTAINER_TOKEN }}" >> $GITHUB_ENV
-          echo "CONTAINER_TYPE=${{ matrix.container_type }}" >> $GITHUB_ENV
-
-      # .................................................................
-      - name: Install dependencies
+      - name: Install Podman
         run: |
           sudo apt-get update
-          sudo apt-get install -y podman ansible
-          # Install collection in the GitHub workspace
-          ansible-galaxy collection install -p ./ community.docker
-
-      # .................................................................
-      - name: Configure container environment
-        run: |
-          mkdir -p ~/.config/containers ~/.local/share/containers
-          chmod 700 ~/.config/containers ~/.local/share/containers
-          cat > ~/.config/containers/containers.conf << 'EOL'
-          [containers]
-          default_capabilities = ["CHOWN", "DAC_OVERRIDE", "FOWNER", "FSETID", "KILL", "NET_BIND_SERVICE", "SETFCAP", "SETGID", "SETPCAP", "SETUID", "SYS_CHROOT"]
-          [engine]
-          runtime = "crun"
-          cgroup_manager = "cgroupfs"
-          events_logger = "journald"
-          EOL
-
-        # podman system info
-
-      - name: Set up container storage permissions
-        run: |
-          mkdir -p ~/.local/share/containers
-          sudo chown -R $USER:$USER ~/.local/share/containers
-          chmod -R 700 ~/.local/share/containers
+          sudo apt-get install -y podman
 
-      # .................................................................
-      - name: Build container
+      - name: Build and push container
         env:
           REGISTRY_HOST: ghcr.io
           REGISTRY_USER: ${{ github.repository_owner }}
           REGISTRY_REPO: testing-containers
           CONTAINER_TYPE: ${{ matrix.container_type }}
           CONTAINER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SSH_KEY: ${{ secrets.SSH_KEY }}
-          ANSIBLE_COMMON_ARGS: "-e ansible_connection=community.docker.docker"
-          # ANSIBLE_COMMON_ARGS: "-e ansible_connection=community.docker.docker -e ansible_user=root -e ansible_become=false"
-        run: ./scripts/build_container.sh
-    
-      # .................................................................
-      - name: Upload logs on failure
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-logs-${{ matrix.container-type }}
-          path: |
-            .working/${{ matrix.container-type }}/
-            ~/.local/share/containers/
-          if-no-files-found: warn
-          include-hidden-files: false
+        run: ./build.sh

README.md

@@ -1,145 +1,155 @@
 # Testing Containers
 
-This repository provides tools for building container images suitable for testing Ansible roles. It includes support for both Debian and Rocky Linux-based containers with SSH and systemd support.
+Base container images for testing Ansible roles via Molecule. Provides current, minimal, Ansible-ready platforms for Debian, Rocky Linux, and Ubuntu.
 
 ## Features
 
 - Rootless podman container builds
 - SSH access with configurable keys
 - systemd support
 - Ansible-ready with Python and required dependencies
-- Support for both Debian and Rocky Linux base images
-- Registry integration (Gitea and GitHub Container Registry support)
+- Current packages (updated at build time)
+- Stock configuration with minimal modifications
+- Registry integration (Gitea and GitHub Container Registry)
 
 ## Prerequisites
 
 - Podman
-- Ansible with community.docker collection
 - SSH key pair for container access
 - Registry access token (Gitea or GitHub)
 
 ## Installation
 
-1. Install required packages:
 ```bash
 # For Debian/Ubuntu
-sudo apt-get install podman ansible
+sudo apt-get install podman
 
 # For Fedora/RHEL
-sudo dnf install podman ansible
-```
-
-2. Install required Ansible collection:
-```bash
-ansible-galaxy collection install community.docker
+sudo dnf install podman
 ```
 
 ## Configuration
 
-The script can be configured through environment variables:
+Environment variables:
 
 ```bash
-REGISTRY_HOST      # Registry hostname (default: gitea.a0a0.org:3001)
+REGISTRY_HOST      # Registry hostname (default: ghcr.io)
 REGISTRY_USER      # Registry username (default: jackaltx)
 REGISTRY_REPO      # Repository name (default: testing-containers)
-CONTAINER_TYPE     # Container type (debian12-ssh or rocky93-ssh)
-SSH_KEY           # SSH public key (default: ~/.ssh/id_ed25519.pub)
-GITEA_TOKEN       # Gitea access token
-GITHUB_TOKEN      # GitHub access token (alternative to GITEA_TOKEN)
+CONTAINER_TYPE     # debian12-ssh, rocky93-ssh, or ubuntu24-ssh
+SSH_KEY           # SSH public key (required)
+CONTAINER_TOKEN   # GitHub token (for ghcr.io)
+GITEA_TOKEN       # Gitea token (for Gitea registry)
+TAG_LATEST        # Tag as 'latest' (default: false)
 ```
 
 ## Usage Examples
 
-### Building a Debian Container
+### Build Debian 12
 
 ```bash
-# Using Gitea registry
-export GITEA_TOKEN=your_token_here
-./build_container.sh CONTAINER_TYPE=debian12-ssh
-
-# Using GitHub registry
-export GITHUB_TOKEN=your_token_here
-export GITHUB_REPOSITORY=your_username/your_repo
-./build_container.sh CONTAINER_TYPE=debian12-ssh
+export CONTAINER_TOKEN=ghp_your_token_here
+export SSH_KEY=$(cat ~/.ssh/id_ed25519.pub)
+export CONTAINER_TYPE=debian12-ssh
+./build.sh
 ```
 
-### Building a Rocky Linux Container
+### Build Rocky Linux 9.3
 
 ```bash
-export GITEA_TOKEN=your_token_here
-./build_container.sh CONTAINER_TYPE=rocky93-ssh
+export CONTAINER_TOKEN=ghp_your_token_here
+export SSH_KEY=$(cat ~/.ssh/id_ed25519.pub)
+export CONTAINER_TYPE=rocky93-ssh
+./build.sh
 ```
 
-### Custom SSH Key
+### Build Ubuntu 24.10
 
 ```bash
-export GITEA_TOKEN=your_token_here
-export SSH_KEY=$(cat ~/.ssh/custom_key.pub)
-./build_container.sh CONTAINER_TYPE=debian12-ssh
+export CONTAINER_TOKEN=ghp_your_token_here
+export SSH_KEY=$(cat ~/.ssh/id_ed25519.pub)
+export CONTAINER_TYPE=ubuntu24-ssh
+./build.sh
 ```
 
-### Custom Registry
+### Custom Registry (Gitea)
 
 ```bash
-export GITEA_TOKEN=your_token_here
-export REGISTRY_HOST=custom.registry.com
+export REGISTRY_HOST=gitea.example.com:3001
 export REGISTRY_USER=your_username
-export REGISTRY_REPO=your_repo
-./build_container.sh CONTAINER_TYPE=debian12-ssh
+export GITEA_TOKEN=your_token_here
+export SSH_KEY=$(cat ~/.ssh/id_ed25519.pub)
+export CONTAINER_TYPE=debian12-ssh
+./build.sh
 ```
 
 ## Container Details
 
-### Debian Container (debian12-ssh)
-- Base Image: debian:12
-- Included Packages:
-  - python3
-  - sudo
-  - systemd
-  - openssh-server
-  - python3-pip
+All containers include:
+- Python 3 (for Ansible)
+- OpenSSH server (key-based auth)
+- systemd (for service management)
+- sudo (passwordless for jackaltx user)
+- vim, wget, git, tmux (utilities)
+
+### Debian 12 (debian12-ssh)
+- Base: `debian:12`
+- Package manager: apt
+- SSH service: ssh
+
+### Rocky Linux 9.3 (rocky93-ssh)
+- Base: `rockylinux:9.3`
+- Package manager: dnf
+- SSH service: sshd
 
-### Rocky Linux Container (rocky93-ssh)
-- Base Image: rockylinux:9.3
-- Included Packages:
-  - python3
-  - sudo
-  - systemd
-  - openssh-server
+### Ubuntu 24.10 (ubuntu24-ssh)
+- Base: `ubuntu:24.10`
+- Package manager: apt
+- SSH service: ssh
 
-## Testing Containers
+## Using Containers
 
-The built containers can be tested using Ansible:
+### Pull from Registry
 
 ```bash
-# Pull the container
-podman pull gitea.a0a0.org:3001/jackaltx/testing-containers/debian12-ssh:latest
+# GitHub Container Registry
+podman pull ghcr.io/jackaltx/testing-containers:debian12-ssh
 
-# Run the container
+# Gitea Registry
+podman pull gitea.example.com:3001/jackaltx/testing-containers:rocky93-ssh
+```
+
+### Run Container
+
+```bash
 podman run -d \
     --name test_container \
     --privileged \
-    -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
+    -v /sys/fs/cgroup:/sys/fs/cgroup:rw \
     -p 2222:22 \
-    debian12-ssh \
+    ghcr.io/jackaltx/testing-containers:debian12-ssh \
     /sbin/init
+```
 
-# Test with Ansible
-ansible-playbook -i inventory.yml your_playbook.yml
+### SSH Access
+
+```bash
+ssh -p 2222 jackaltx@localhost
 ```
 
-Example inventory.yml:
+### Molecule Testing
+
+These containers are designed for use with Molecule:
+
 ```yaml
-all:
-  hosts:
-    debian_container:
-      ansible_connection: community.docker.docker
-      ansible_host: test_container
-      ansible_user: jackaltx
-      ansible_become: true
-      ansible_python_interpreter: python3
-      ansible_remote_tmp: /tmp/ansible-${USER}
-      ansible_pipelining: true
+# molecule.yml
+platforms:
+  - name: instance
+    image: ghcr.io/jackaltx/testing-containers:debian12-ssh
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    command: /sbin/init
 ```
 
 ## Troubleshooting

build.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+set -e
+
+# Simple build script for testing containers
+# Replaces the complex build_container.sh with pure Containerfile approach
+
+# Configuration from environment
+CONTAINER_TYPE="${CONTAINER_TYPE:-debian12-ssh}"
+REGISTRY_HOST="${REGISTRY_HOST:-ghcr.io}"
+REGISTRY_USER="${REGISTRY_USER:-jackaltx}"
+REGISTRY_REPO="${REGISTRY_REPO:-testing-containers}"
+SSH_KEY="${SSH_KEY:?SSH_KEY environment variable is required}"
+
+# Determine authentication token
+if [ "$REGISTRY_HOST" = "ghcr.io" ]; then
+    TOKEN="${CONTAINER_TOKEN:?CONTAINER_TOKEN required for GitHub registry}"
+else
+    TOKEN="${GITEA_TOKEN:?GITEA_TOKEN required for Gitea registry}"
+fi
+
+# Validate container type
+case "$CONTAINER_TYPE" in
+    debian12-ssh|rocky93-ssh|ubuntu24-ssh)
+        echo "Building $CONTAINER_TYPE..."
+        ;;
+    *)
+        echo "Error: CONTAINER_TYPE must be one of: debian12-ssh, rocky93-ssh, ubuntu24-ssh"
+        exit 1
+        ;;
+esac
+
+# Login to registry
+echo "$TOKEN" | podman login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin
+
+# Build image
+IMAGE_TAG="$REGISTRY_HOST/$REGISTRY_USER/$REGISTRY_REPO:$CONTAINER_TYPE"
+
+podman build \
+    --build-arg SSH_KEY="$SSH_KEY" \
+    -t "$IMAGE_TAG" \
+    -f "$CONTAINER_TYPE/Containerfile" \
+    "$CONTAINER_TYPE/"
+
+# Push to registry
+podman push "$IMAGE_TAG"
+
+# Tag as latest if requested
+if [ "${TAG_LATEST:-false}" = "true" ]; then
+    podman tag "$IMAGE_TAG" "$REGISTRY_HOST/$REGISTRY_USER/$REGISTRY_REPO:latest"
+    podman push "$REGISTRY_HOST/$REGISTRY_USER/$REGISTRY_REPO:latest"
+fi
+
+# Logout
+podman logout "$REGISTRY_HOST"
+
+echo "✓ Successfully built and pushed $IMAGE_TAG"

debian12-ssh/Containerfile

@@ -6,13 +6,18 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # Update and install required packages
 RUN apt-get update && \
+    apt-get upgrade -y && \
     apt-get install -y \
     python3 \
     sudo \
     systemd \
     openssh-server \
     python3-pip \
     iproute2 \
+    vim \
+    wget \
+    git \
+    tmux \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*