diff --git a/Dockerfile b/Dockerfile index 6e6b4c7..072061a 100644 --- a/Dockerfile +++ b/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" \ diff --git a/assets/build/functions.sh b/assets/build/functions.sh index 681283f..5ae74cd 100755 --- a/assets/build/functions.sh +++ b/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 } diff --git a/assets/build/install.sh b/assets/build/install.sh index 208b897..ceb0e79 100755 --- a/assets/build/install.sh +++ b/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" <