diff --git a/CHANGELOG.md b/CHANGELOG.md index 8176013..1a4d487 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ for the list of changes in SaltStack. - Upgrade `salt-master` to `3005` *Phosphorus* - Change Docker base image to `ubuntu:jammy-20220531` -- Upgrade Python to version `3.10` +- Use `python3` default distro version - Install `python3-pygit2` version `1.6.1` from Ubuntu repositories **3004.2** diff --git a/Dockerfile b/Dockerfile index 3e0db21..98ac825 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,7 @@ ARG VCS_REF # https://github.com/saltstack/salt/releases # NOTE: Review org.label-schema.version label if necessary -ENV SALT_VERSION="3005rc1" \ - PYTHON_VERSION="3.10" +ENV SALT_VERSION="3005rc1" ENV SALT_DOCKER_DIR="/etc/docker-salt" \ SALT_ROOT_DIR="/etc/salt" \ @@ -32,7 +31,7 @@ WORKDIR ${SALT_BUILD_DIR} RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --yes --quiet --no-install-recommends \ sudo ca-certificates openssl apt-transport-https wget locales openssh-client \ - python${PYTHON_VERSION} python3-dev libpython3-dev \ + python3 python3-dev libpython3-dev \ python3-pip python3-setuptools python3-wheel \ supervisor logrotate git gettext-base tzdata inotify-tools psmisc \ && DEBIAN_FRONTEND=noninteractive update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ diff --git a/assets/build/install.sh b/assets/build/install.sh index f3f2e15..1b5a740 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -54,8 +54,7 @@ check_sha256 "${BOOTSTRAP_FILE}" "${BOOTSTRAP_SHA256}" ## -d: Disables checking if Salt services are enabled to start on system boot ## -P: Allow pip based installations ## -p: Extra-package to install -## -x: Changes the python version used to install a git version of salt -SALT_BOOTSTRAP_OPTS=( -M -N -X -d -P -p salt-api -p salt-call -x "python${PYTHON_VERSION}" ) +SALT_BOOTSTRAP_OPTS=( -M -N -X -d -P -p salt-api -p salt-call ) ## -I: allow insecure connections while downloading any files is_arm32 && SALT_BOOTSTRAP_OPTS+=( -I )