Merge pull request #137 from essentialkaos/develop

Version 3.3.3
essentialkaos · Aug 23, 2024 · 0a026f9 · 0a026f9
2 parents 5d4ef7a + 0085c1b
commit 0a026f9
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 415 deletions.
diff --git a/.docker/centos7.docker b/.docker/centos7.docker
diff --git a/.docker/node-centos7.docker b/.docker/node-centos7.docker
diff --git a/.docker/node-ol7.docker b/.docker/node-ol7.docker
diff --git a/.docker/ol7.docker b/.docker/ol7.docker
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Check dockerfiles with Hadolint
         uses: essentialkaos/hadolint-action@v1
         with:
-          files: .docker/centos7.docker .docker/ol7.docker .docker/ol8.docker .docker/ol9.docker .docker/node-centos7.docker .docker/node-ol7.docker .docker/node-ol8.docker .docker/node-ol9.docker
+          files: .docker/ol8.docker .docker/ol9.docker .docker/node-ol8.docker .docker/node-ol9.docker
 
   Typos:
     name: Typos
@@ -84,7 +84,7 @@ jobs:
 
     strategy:
       matrix:
-        image: [ 'centos7', 'ol7', 'ol8', 'ol9', 'node-centos7', 'node-ol7', 'node-ol8', 'node-ol9' ]
+        image: [ 'ol8', 'ol9', 'node-ol8', 'node-ol9' ]
 
     steps:
       - name: Check event type

diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
@@ -28,7 +28,7 @@ jobs:
 
     strategy:
       matrix:
-        image: [ 'centos7', 'ol7', 'ol8', 'ol9', 'node-centos7', 'node-ol7', 'node-ol8', 'node-ol9' ]
+        image: [ 'ol8', 'ol9', 'node-ol8', 'node-ol9' ]
 
     steps:
       - name: Checkout
@@ -159,7 +159,7 @@ jobs:
 
       - name: Build and push image
         if: ${{ steps.build_check.outputs.build == 'true' }}
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .

diff --git a/Makefile b/Makefile
@@ -71,38 +71,29 @@ endif
 build-images: build-images-base build-images-node ## Build all docker images
 
 build-images-base: ## Build base docker images
-	docker build -f .docker/centos7.docker -t $(IMAGE_REPO):centos7 .
-	docker build -f .docker/ol7.docker -t $(IMAGE_REPO):ol7 .
 	docker build -f .docker/ol8.docker -t $(IMAGE_REPO):ol8 .
 	docker build -f .docker/ol9.docker -t $(IMAGE_REPO):ol9 .
 
 build-images-node: ## Build node docker images
-	docker build -f .docker/node-centos7.docker -t $(IMAGE_REPO):node-centos7 .
-	docker build -f .docker/node-ol7.docker -t $(IMAGE_REPO):node-ol7 .
 	docker build -f .docker/node-ol8.docker -t $(IMAGE_REPO):node-ol8 .
 	docker build -f .docker/node-ol9.docker -t $(IMAGE_REPO):node-ol9 .
 
 push-images: push-images-base push-images-node ## Push all images to registry
 
 push-images-base: ## Push base images to registry
 ifneq (,$(wildcard ~/.docker/config.json))
-	docker push $(IMAGE_REPO):centos7
-	docker push $(IMAGE_REPO):ol7
 	docker push $(IMAGE_REPO):ol8
 	docker push $(IMAGE_REPO):ol9
 endif
 
 push-images-node: ## Push node images to registry
 ifneq (,$(wildcard ~/.docker/config.json))
-	docker push $(IMAGE_REPO):node-centos7
-	docker push $(IMAGE_REPO):node-ol7
 	docker push $(IMAGE_REPO):node-ol8
 	docker push $(IMAGE_REPO):node-ol9
 endif
 
 run-nodes: ## Run nodes containers
 ifneq (,$(wildcard $(PUB_KEY_FILE)))
-	docker run -e PUB_KEY="$(shell cat $(PUB_KEY_FILE))" -p 2037:2037 -d $(IMAGE_REPO):node-ol7
 	docker run -e PUB_KEY="$(shell cat $(PUB_KEY_FILE))" -p 2038:2038 -d $(IMAGE_REPO):node-ol8
 	docker run -e PUB_KEY="$(shell cat $(PUB_KEY_FILE))" -p 2039:2039 -d $(IMAGE_REPO):node-ol9
 endif

diff --git a/README.md b/README.md
@@ -20,15 +20,15 @@ https://github.com/essentialkaos/rpmbuilder/assets/182020/d0ae6d9c-663e-46cf-a3f
 #### From [ESSENTIAL KAOS Public Repository](https://kaos.sh/kaos-repo)
 
 ```bash
-sudo yum install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
-sudo yum install rpmbuilder
+sudo dnf install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
+sudo dnf install rpmbuilder
 ```
 
 Build node:
 
 ```bash
-sudo yum install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
-sudo yum install rpmbuilder-node
+sudo dnf install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
+sudo dnf install rpmbuilder-node
 ```
 
 #### Using Makefile and Git
@@ -47,23 +47,15 @@ We provide a big variety of Docker images available on [GitHub Container Registr
 
 Basic images:
 
-- `ghcr.io/essentialkaos/rpmbuilder:centos7` (_CentOS 7_)
-- `ghcr.io/essentialkaos/rpmbuilder:ol7` (_OracleLinux 7_)
 - `ghcr.io/essentialkaos/rpmbuilder:ol8` (_OracleLinux 8_)
 - `ghcr.io/essentialkaos/rpmbuilder:ol9` (_OracleLinux 9_)
-- `essentialkaos/rpmbuilder:centos7` (_CentOS 7_)
-- `essentialkaos/rpmbuilder:ol7` (_OracleLinux 7_)
 - `essentialkaos/rpmbuilder:ol8` (_OracleLinux 8_)
 - `essentialkaos/rpmbuilder:ol9` (_OracleLinux 9_)
 
 Build node images:
 
-- `ghcr.io/essentialkaos/rpmbuilder:node-centos7` (_CentOS 7_ | Port: `2027`)
-- `ghcr.io/essentialkaos/rpmbuilder:node-ol7` (_OracleLinux 7_ | Port: `2037`)
 - `ghcr.io/essentialkaos/rpmbuilder:node-ol8` (_OracleLinux 8_ | Port: `2038`)
 - `ghcr.io/essentialkaos/rpmbuilder:node-ol9` (_OracleLinux 9_ | Port: `2039`)
-- `essentialkaos/rpmbuilder:node-centos7` (_CentOS 7_ | Port: `2027`)
-- `essentialkaos/rpmbuilder:node-ol7` (_OracleLinux 7_ | Port: `2037`)
 - `essentialkaos/rpmbuilder:node-ol8` (_OracleLinux 8_ | Port: `2038`)
 - `essentialkaos/rpmbuilder:node-ol9` (_OracleLinux 9_ | Port: `2039`)