getting rid of custom stuff

Dockerfile

@@ -1,10 +1,10 @@
-FROM ubuntu:jammy-20230816
+FROM debian:bullseye-slim 
 
 ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="3006.3"
+ENV SALT_VERSION="3002.6+dfsg1-4+deb11u1"
 ENV IMAGE_VERSION="${SALT_VERSION}_1"
 
 ENV SALT_DOCKER_DIR="/etc/docker-salt" \

assets/build/functions.sh

@@ -139,10 +139,10 @@ function add_salt_repository()
   local arch=amd64
   is_arm64 && arch=arm64
   source /etc/os-release
-
+  mkdir -p /etc/apt/keyrings 
   local keyring_file="/etc/apt/keyrings/salt-archive-keyring.gpg"
-  local root_url="https://repo.saltproject.io/salt/py3/ubuntu/${VERSION_ID:?}/${arch}"
-
+   #https://repo.saltproject.io/salt/py3/debian/11/arm64/SALT-PROJECT-GPG-PUBKEY-2023.gpg
+  local root_url="https://repo.saltproject.io/salt/py3/debian/${VERSION_ID:?}/${arch}"
   download "${root_url}/SALT-PROJECT-GPG-PUBKEY-2023.gpg" "${keyring_file}"
   echo "deb [signed-by=${keyring_file} arch=${arch}] ${root_url}/minor/${SALT_VERSION} ${VERSION_CODENAME:?} main" > /etc/apt/sources.list.d/salt.list
 }

assets/build/install.sh

@@ -11,13 +11,13 @@ source "${FUNCTIONS_FILE}"
 
 log_info "Installing required packages and build dependencies ..."
 REQUIRED_PACKAGES=(
-  binutils patchelf
+  binutils patchelf python3-pip
 )
 
 BUILD_DEPENDENCIES=()
 
-log_info "Adding salt repository..."
-add_salt_repository
+#log_info "Adding salt repository..."
+#add_salt_repository
 
 apt-get update
 install_pkgs "${REQUIRED_PACKAGES[@]}" "${BUILD_DEPENDENCIES[@]}"
@@ -28,6 +28,7 @@ log_info "Creating ${SALT_USER} user ..."
 useradd --home-dir "${SALT_HOME}" --create-home \
   --shell /bin/bash --user-group "${SALT_USER}" \
   --groups shadow
+id ${SALT_USER} 
 
 # Set PATH
 exec_as_salt cat >> "${SALT_HOME}/.profile" <<EOF
@@ -40,7 +41,7 @@ install_pkgs salt-master="${SALT_VERSION}" salt-api="${SALT_VERSION}"
 
 # Install python packages
 log_info "Installing python packages ..."
-salt-pip install pygit2==1.12.2
+pip3 install pygit2==1.12.2
 
 # Configure ssh
 log_info "Configuring ssh ..."

assets/runtime/functions.sh

@@ -645,10 +645,10 @@ function initialize_system()
   initialize_datadir
   configure_logrotate
   configure_timezone
-  configure_salt_master
-  configure_salt_api
-  configure_salt_formulas
+  #configure_salt_master
+  #configure_salt_api
+  #configure_salt_formulas
   configure_config_reloader
-  setup_salt_keys
+  #setup_salt_keys
   rm -rf /var/run/supervisor.sock
 }

entrypoint.sh

@@ -23,7 +23,7 @@ case "${1}" in
         ;;
       app:gen-signed-keys)
         shift 1
-        gen_signed_keys "${1}"
+        #gen_signed_keys "${1}"
         ;;
     esac
     ;;
@@ -41,7 +41,7 @@ case "${1}" in
     esac
     ;;
   app:reload-3rd-formulas)
-    configure_salt_formulas
+    #configure_salt_formulas
     exec "$0" app:restart salt-master
     ;;
   app:help)