From 26ca4dfc8d984549417e07a7b64dad626d173b3d Mon Sep 17 00:00:00 2001
From: Sean Wilbur <sean@abutili.com>
Date: Wed, 29 Apr 2026 07:29:47 -0500
Subject: [PATCH] Adding docker to base act image.

---
 .env       |  2 +-
 Dockerfile | 12 +++++++++---
 README.md  | 12 ++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index 3260fb8..e1f87ff 100755
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
 # target
-REG=zima1.abutili.net:3002
+REG=git.abutili.net
 NS=images
 IMG=act-base
diff --git a/Dockerfile b/Dockerfile
index 088553c..8e86982 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM zima1.abutili.net:3002/images/base:latest
+FROM git.abutili.net/images/base:latest
 
 USER root
 
@@ -13,9 +13,15 @@ LABEL org.opencontainers.image.title="act-base" \
       org.opencontainers.image.created="${BUILD_DATE}" \
       org.opencontainers.image.source="https://git.abutili.net/images/act-base"
 
-# install system deps
+# install system deps and docker cli
 RUN apt-get update && apt-get install -y --no-install-recommends \
-     jq xz-utils git openssh-client \
+     jq xz-utils git openssh-client ca-certificates curl gnupg \
+   && mkdir -p /etc/apt/keyrings \
+   && . /etc/os-release \
+   && curl -fsSL "https://download.docker.com/linux/${ID}/gpg" | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
+   && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/${ID} ${VERSION_CODENAME} stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null \
+   && apt-get update && apt-get install -y --no-install-recommends \
+     docker-ce-cli docker-buildx-plugin docker-compose-plugin \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/*
 
diff --git a/README.md b/README.md
index 319d9d4..5d5f22c 100755
--- a/README.md
+++ b/README.md
@@ -1,21 +1,21 @@
-# Container Build and Publish Template
+# Action Base Image
 
-This repository provides a basic template for building and publishing container images using Gitea Actions.
+This repository provides a base Debian image pre-configured with Node.js and common tools, designed for running Gitea Actions.
 
 ## Environment Variables
 
 The following environment variables are expected to be set in the `.env` file for local development, and as Gitea repository or organization variables for CI/CD:
 
 *   `REG`: The container registry hostname (e.g., `zima1.abutili.net:3002`)
-*   `NS`: The namespace/project within the registry (e.g., `devops`)
-*   `IMG`: The image name (e.g., `container-build-publish`)
+*   `NS`: The namespace/project within the registry (e.g., `images`)
+*   `IMG`: The image name (e.g., `act-base`)
 
 Example `.env` file:
 
 ```
 REG=zima1.abutili.net:3002
-NS=devops
-IMG=container-build-publish
+NS=images
+IMG=act-base
 ```
 
 ## Gitea Secrets