From 6436014f85a5281010223fec9a380568a743dcaa Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 1 Dec 2024 12:55:53 +1100
Subject: [PATCH] feat: add runnerdnd image

---
 Dockerfile |  5 +++--
 Makefile   |  9 ++++-----
 README.md  | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9b6b199..65b2890 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,9 @@ RUN dnf module enable -y nodejs:20 && \
     dnf install -y nodejs
 
 # Install packages
-RUN dnf groupinstall -y 'Development Tools' && \
-    dnf install -y make cmake gcc gcc-c++ rpm rpmdevtools wget
+RUN dnf install -y yum-utils && \
+    yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo && \
+    dnf install -y docker-ce-cli make bash git
 
 # Cleanup
 RUN dnf clean all && \
diff --git a/Makefile b/Makefile
index 291abb6..18ed55a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ GIT_COMMIT := $(shell git rev-parse --short HEAD)
 DATE_TAG := $(shell date +%Y%m%d)
 
 # Set the Docker image name and repository information
-IMAGE_NAME := almalinux8-template
+IMAGE_NAME := almalinux8-runnerdnd
 REGISTRY := git.query.consul
 OWNER := unkin
 
@@ -21,10 +21,9 @@ tag:
 
 # Push the Docker image to a repository with all tags
 push: tag
-	echo "template repo, not pushing"
-	#docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):$(GIT_COMMIT)
-	#docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):$(DATE_TAG)
-	#docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):latest
+	docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):$(GIT_COMMIT)
+	docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):$(DATE_TAG)
+	docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):latest
 
 # Clean up dangling Docker images
 clean:
diff --git a/README.md b/README.md
index de7908e..00127e1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Docker Image Build: Almalinux Template
+# Docker Image Build: Almalinux Docker-in-Docker
 
 This project provides a reproducible Docker image build process for `almalinux:8.10`, with custom YUM repository configurations and package installations. The build is automated using a `Makefile` and managed via CI tasks to ensure consistent and reliable Docker image builds.
 
@@ -16,7 +16,7 @@ To build the Docker image without tags:
 make build
 ```
 
-This will use the `docker build` command with `--network=host` to build the image with the name `git.query.consul/unkin/almalinux8-template`.
+This will use the `docker build` command with `--network=host` to build the image with the name `git.query.consul/unkin/almalinux8-runnerdnd`.
 
 ### Tag the Docker Image
 
@@ -27,9 +27,9 @@ make tag
 ```
 
 This will add three tags to the image:
-- `git.query.consul/unkin/almalinux8-template:<GIT_COMMIT>`
-- `git.query.consul/unkin/almalinux8-template:<DATE_TAG>`
-- `git.query.consul/unkin/almalinux8-template:latest`
+- `git.query.consul/unkin/almalinux8-runnerdnd:<GIT_COMMIT>`
+- `git.query.consul/unkin/almalinux8-runnerdnd:<DATE_TAG>`
+- `git.query.consul/unkin/almalinux8-runnerdnd:latest`
 
 ### Push the Docker Image
 
@@ -67,8 +67,8 @@ To test or develop with this `Makefile`, follow these steps:
 
 1. **Clone the repository** and navigate to the project directory:
    ```bash
-   git clone https://git.query.consul/unkin/docker-template.git
-   cd docker-template
+   git clone https://git.query.consul/unkin/docker-almalinux-runnerdnd.git
+   cd docker-almalinux-runnerdnd
    ```
 
 2. **Build the Docker image** using the `build` target: