Compare commits

..

No commits in common. "062ec460118caf37e4edaeb373f64997fc61e99d" and "7e671cb7ca456f86a501ab2713f2d50200466205" have entirely different histories.

3 changed files with 14 additions and 14 deletions

View File

@ -10,9 +10,8 @@ RUN dnf module enable -y nodejs:20 && \
dnf install -y nodejs
# Install packages
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
RUN dnf groupinstall -y 'Development Tools' && \
dnf install -y make cmake gcc gcc-c++ rpm rpmdevtools wget
# Cleanup
RUN dnf clean all && \

View File

@ -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-runnerdnd
IMAGE_NAME := almalinux8-template
REGISTRY := git.query.consul
OWNER := unkin
@ -21,9 +21,10 @@ tag:
# Push the Docker image to a repository with all tags
push: tag
docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):$(GIT_COMMIT)
docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):$(DATE_TAG)
docker push $(REGISTRY)/$(OWNER)/$(IMAGE_NAME):latest
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
# Clean up dangling Docker images
clean:

View File

@ -1,4 +1,4 @@
# Docker Image Build: Almalinux Docker-in-Docker
# Docker Image Build: Almalinux Template
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-runnerdnd`.
This will use the `docker build` command with `--network=host` to build the image with the name `git.query.consul/unkin/almalinux8-template`.
### Tag the Docker Image
@ -27,9 +27,9 @@ make tag
```
This will add three tags to the image:
- `git.query.consul/unkin/almalinux8-runnerdnd:<GIT_COMMIT>`
- `git.query.consul/unkin/almalinux8-runnerdnd:<DATE_TAG>`
- `git.query.consul/unkin/almalinux8-runnerdnd:latest`
- `git.query.consul/unkin/almalinux8-template:<GIT_COMMIT>`
- `git.query.consul/unkin/almalinux8-template:<DATE_TAG>`
- `git.query.consul/unkin/almalinux8-template: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-almalinux-runnerdnd.git
cd docker-almalinux-runnerdnd
git clone https://git.query.consul/unkin/docker-template.git
cd docker-template
```
2. **Build the Docker image** using the `build` target: