Merge pull request #131 from essentialkaos/develop

Version 3.3.1

.docker/node-entrypoint

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC2269
+# shellcheck disable=SC2154
 
 set -e
 
@@ -23,7 +23,7 @@ echo "$PUB_KEY" > /home/builder/.ssh/authorized_keys
 
 # Export proxy configuration
 if [[ -n "$http_proxy" || -n "$HTTP_PROXY" ]] ; then
-  cat < EOF >> /etc/environment
+  cat << EOF >> /etc/environment
 HTTP_PROXY=${HTTP_PROXY:-$http_proxy}
 http_proxy=${http_proxy:-$HTTP_PROXY}
 HTTPS_PROXY=${HTTPS_PROXY:-$https_proxy}

Makefile

@@ -5,7 +5,7 @@ export PATH := shellcheck-latest:$(PATH)
 
 ########################################################################################
 
-IMAGE_REPO ?= essentialkaos/rpmbuilder
+IMAGE_REPO ?= ghcr.io/essentialkaos/rpmbuilder
 PUB_KEY_FILE ?= ~/.ssh/buildnode.pub
 
 ########################################################################################

SOURCES/rpmbuilder

@@ -13,7 +13,7 @@ fi
 APP="RPMBuilder"
 
 # Utility version (String)
-VER="3.3.0"
+VER="3.3.1"
 
 # Utility description (String)
 DESC="RPM package build helper"
@@ -33,29 +33,29 @@ CYAN=36
 GREY=37
 DARK=90
 
-CL_NORM="\e[0m"
-CL_BOLD="\e[0;${BOLD};49m"
-CL_ITLC="\e[0;${ITLC};49m"
-CL_UNLN="\e[0;${UNLN};49m"
-CL_RED="\e[0;${RED};49m"
-CL_GREEN="\e[0;${GREEN};49m"
-CL_YELLOW="\e[0;${YELLOW};49m"
-CL_BLUE="\e[0;${BLUE};49m"
-CL_MAG="\e[0;${MAG};49m"
-CL_CYAN="\e[0;${CYAN};49m"
-CL_GREY="\e[0;${GREY};49m"
-CL_DARK="\e[0;${DARK};49m"
-CL_BL_RED="\e[1;${RED};49m"
-CL_BL_GREEN="\e[1;${GREEN};49m"
-CL_BL_YELLOW="\e[1;${YELLOW};49m"
-CL_BL_BLUE="\e[1;${BLUE};49m"
-CL_BL_MAG="\e[1;${MAG};49m"
-CL_BL_CYAN="\e[1;${CYAN};49m"
-CL_BL_GREY="\e[1;${GREY};49m"
+CL_NORM="\e[${NORM}m"
+CL_BOLD="\e[${BOLD}m"
+CL_ITLC="\e[${ITLC}m"
+CL_UNLN="\e[${UNLN}m"
+CL_RED="\e[${RED}m"
+CL_GREEN="\e[${GREEN}m"
+CL_YELLOW="\e[${YELLOW}m"
+CL_BLUE="\e[${BLUE}m"
+CL_MAG="\e[${MAG}m"
+CL_CYAN="\e[${CYAN}m"
+CL_GREY="\e[${GREY}m"
+CL_DARK="\e[${DARK}m"
+CL_BL_RED="\e[1;${RED}m"
+CL_BL_GREEN="\e[1;${GREEN}m"
+CL_BL_YELLOW="\e[1;${YELLOW}m"
+CL_BL_BLUE="\e[1;${BLUE}m"
+CL_BL_MAG="\e[1;${MAG}m"
+CL_BL_CYAN="\e[1;${CYAN}m"
+CL_BL_GREY="\e[1;${GREY}m"
 CL_BG_MAG="\e[1m\e[7m\e[${MAG}m"
-CL_BLNK_YELLOW="\e[5;${YELLOW};49m"
-CL_PODMAN="\033[38;5;91m"
-CL_DOCKER="\033[38;5;32m"
+CL_BLNK_YELLOW="\e[5;${YELLOW}m"
+CL_PODMAN="\e[38;5;91m"
+CL_DOCKER="\e[38;5;32m"
 
 ERROR_UNKNOWN=1
 ERROR_ARGS=2

rpmbuilder-farm

@@ -13,7 +13,7 @@ fi
 APP="rpmbuilder-farm"
 
 # App version
-VER="1.0.0"
+VER="1.1.0"
 
 # App description
 DESC="Helper for bootstrapping rpmbuilder build farm"
@@ -336,6 +336,17 @@ cmdUpdateImages() {
     return 1
   fi
 
+  show "{*}Restarting containers…{!}"
+
+  if ! cmdRestartAll ; then
+    return
+  fi
+
+  show "{*}Cleaning old images…{!}"
+
+  docker image prune -f &> /dev/null
+
+  show ""
   show "{g}Images successfully updated{!}"
 
   return 0
@@ -866,7 +877,7 @@ cmdRestartMany() {
     show "{g}All contenders successfully restarted{!}"
   fi
 
-  return 1
+  return 0
 }
 
 # "stop" command handler

rpmbuilder.spec

@@ -6,7 +6,7 @@
 
 Summary:    RPM package build helper
 Name:       rpmbuilder
-Version:    3.3.0
+Version:    3.3.1
 Release:    0%{?dist}
 License:    Apache License, Version 2.0
 Group:      Development/Tools
@@ -63,6 +63,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Wed Nov 29 2023 Anton Novojilov <[email protected]> - 3.3.1-0
+- Code refactoring
+
 * Tue Nov 28 2023 Anton Novojilov <[email protected]> - 3.3.0-0
 - Option '-k'/'--key' now accepts base64 encoded data with private key
 - Option '-r'/'--remote' can now be passed multiple times