diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a947ee..82ba05f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late **3002** +- Install `pygit2` and `m2crypto` from ubuntu repositories - Change Docker base image to `ubuntu:focal-20200925` **3001.1** diff --git a/Dockerfile b/Dockerfile index f9e453b..57cc85a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,7 @@ ARG VCS_REF # https://github.com/saltstack/salt/releases ENV SALT_VERSION="3001.1" \ - PYTHON_VERSION="3.8" \ - LIBSSH2_VERSION="1.9.0" \ - LIBGIT2_VERSION="1.0.1" \ - PYGIT2_VERSION="1.2.1" \ - M2CRYPTO_VERSION="0.36.0" + PYTHON_VERSION="3.8" ENV SALT_DOCKER_DIR="/etc/docker-salt" \ SALT_ROOT_DIR="/etc/salt" \ diff --git a/assets/build/install.sh b/assets/build/install.sh index 275d7de..d027e56 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -28,32 +28,12 @@ exec_as_salt cat >> "${SALT_HOME}/.profile" <