Merge pull request #137 from cdalvaro/upgrade/v3004.1

cdalvaro · Mar 29, 2022 · e0ae8ab · e0ae8ab
2 parents 7aea7e3 + 5e5151a
commit e0ae8ab
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 16 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -26,7 +26,7 @@ The full log with the outputted error.
 **Version report (please complete the following information):**
  - Host OS: [e.g. `uname -a`]
  - Docker: [e.g. `docker --version`]
- - Image tag: [e.g. `3004`]
+ - Image tag: [e.g. `3004.1`]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 /logs/
 /3pfs/
 .vscode/
+.idea/
 
 # tests
 /tests/**/keys/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,18 @@
 # Changelog
 
 This file only reflects the changes that are made in this image.
-Please refer to the [Salt 3004 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3004.html)
+Please refer to the [Salt 3004.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3004.1.html)
 for the list of changes in SaltStack.
 
+**3004.1**
+
+- Upgrade `salt-master` to `3004.1` *Silicon*
+- Upgrade `salt-bootstrap` to version `2022.03.15`
+- Upgrade `pygit2` to version `1.9.1`
+- Upgrade `libgit2` to version `1.4.2`
+- Fix Jinja2 version to avoid Markup import error
+- Change Docker base image to `ubuntu:hirsute-20220113`
+
 **3004_6**
 
 - Set the number of worker threads to start by setting `SALT_WORKER_THREADS` env variable.

diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,11 @@
-FROM ubuntu:hirsute-20210917
+FROM ubuntu:hirsute-20220113
 
 ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
 # NOTE: Review org.label-schema.version label if necessary
-ENV SALT_VERSION="3004" \
+ENV SALT_VERSION="3004.1" \
     PYTHON_VERSION="3.9"
 
 ENV SALT_DOCKER_DIR="/etc/docker-salt" \

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 [![Architecture ARM64][arch_arm64_badge]][arch_link]
 [![Architecture ARM/v7][arch_arm_badge]][arch_link]
 
-# Dockerized Salt Master v3004 _Silicon_
+# Dockerized Salt Master v3004.1 _Silicon_
 
 Dockerfile to build a [Salt Project](https://saltproject.io) Master image for the Docker opensource container platform.
 
@@ -46,7 +46,7 @@ For other methods to install `salt-master` please refer to the [Official Salt Pr
 Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/cdalvaro/docker-salt-master/) and is the recommended method of installation.
 
 ```sh
-docker pull cdalvaro/docker-salt-master:3004
+docker pull cdalvaro/docker-salt-master:3004.1
 ```
 
 You can also pull the latest tag which is built from the repository `HEAD`
@@ -593,9 +593,9 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC
 - https://docs.saltproject.io/en/getstarted/
 - https://docs.saltproject.io/en/latest/contents.html
 
-[saltproject_badge]: https://img.shields.io/badge/Salt-v3004-lightgrey.svg?logo=Saltstack
-[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3004.html "Salt Project Release Notes"
-[ubuntu_badge]: https://img.shields.io/badge/ubuntu-hirsute--20210917-E95420.svg?logo=Ubuntu
+[saltproject_badge]: https://img.shields.io/badge/Salt-v3004.1-lightgrey.svg?logo=Saltstack
+[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3004.1.html "Salt Project Release Notes"
+[ubuntu_badge]: https://img.shields.io/badge/ubuntu-hirsute--20220113-E95420.svg?logo=Ubuntu
 [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image"
 [github_publish_badge]: https://img.shields.io/github/workflow/status/cdalvaro/docker-salt-master/Publish%20Docker%20image?label=build&logo=GitHub&logoColor=%23181717
 [github_publish_workflow]: https://github.com/cdalvaro/docker-salt-master/actions?query=workflow%3A%22Publish+Docker+image%22

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3004
+3004.1
diff --git a/assets/build/functions.sh b/assets/build/functions.sh
@@ -186,6 +186,8 @@ function install_libssh2()
     -DENABLE_ZLIB_COMPRESSION=ON
     -DENABLE_DEBUG_LOGGING=OFF
     -DCLEAR_MEMORY=ON
+    -DBUILD_EXAMPLES=OFF
+    -DBUILD_TESTING=OFF
   )
 
   build_and_install "libssh2 v${LIBSSH2_VERSION}" ${_OPTS[@]}
@@ -200,10 +202,10 @@ function install_libssh2()
 #----------------------------------------------------------------------------------------------------------------------
 function install_libgit2()
 {
-  local LIBGIT2_VERSION=1.3.0
+  local LIBGIT2_VERSION=1.4.2
   local LIBGIT2_URL="https://github.com/libgit2/libgit2/archive/refs/tags/v${LIBGIT2_VERSION}.tar.gz"
   local FILE_NAME="libgit2-${LIBGIT2_VERSION}.tar.gz"
-  local SHA256_SUM='192eeff84596ff09efb6b01835a066f2df7cd7985e0991c79595688e6b36444e'
+  local SHA256_SUM='901c2b4492976b86477569502a41c31b274b69adc177149c02099ea88404ef19'
 
   local CURRENT_DIR="$(pwd)"
   local WORK_DIR="$(mktemp -d)" && cd "${WORK_DIR}"
@@ -212,7 +214,15 @@ function install_libgit2()
   check_sha256 "${FILE_NAME}" "${SHA256_SUM}"
   extract "${FILE_NAME}"
 
-  build_and_install "libgit2 v${LIBGIT2_VERSION}" -DBUILD_CLAR=OFF
+  _OPTS=(
+    -DBUILD_SHARED_LIBS=ON
+    -DUSE_SSH=ON
+    -DUSE_THREADS=ON
+    -DBUILD_EXAMPLES=OFF
+    -DBUILD_TESTS=OFF
+  )
+
+  build_and_install "libgit2 v${LIBGIT2_VERSION}" ${_OPTS[@]}
 
   cd "${CURRENT_DIR}"
   rm -rf "${WORK_DIR}"

diff --git a/assets/build/install.sh b/assets/build/install.sh
@@ -42,13 +42,13 @@ pip3 install timelib==0.2.5
 # Install pygit2 package
 install_libssh2
 install_libgit2
-pip3 install pygit2==1.7.0
+pip3 install cached-property cffi==1.14.6 pygit2==1.9.1
 
 # Downloading bootstrap-salt.sh script
-BOOTSTRAP_VERSION='2021.09.17'
+BOOTSTRAP_VERSION='2022.03.15'
 BOOTSTRAP_URL="https://raw.githubusercontent.com/saltstack/salt-bootstrap/v${BOOTSTRAP_VERSION}/bootstrap-salt.sh"
 BOOTSTRAP_FILE='bootstrap-salt.sh'
-BOOTSTRAP_SHA256='090d652cd6290debce0e3a4eded65086a4272e69446e711eb26f87160593b6a2'
+BOOTSTRAP_SHA256='ed66dc9e71aed7602b9ae548f8535131831026f934f19f868fdefbe6a3ab9bf9'
 
 download "${BOOTSTRAP_URL}" "${BOOTSTRAP_FILE}"
 check_sha256 "${BOOTSTRAP_FILE}" "${BOOTSTRAP_SHA256}"
@@ -72,6 +72,10 @@ log_debug "Options: ${SALT_BOOTSTRAP_OPTS[@]}"
 sh "${BOOTSTRAP_FILE}" ${SALT_BOOTSTRAP_OPTS[@]} git "v${SALT_VERSION}"
 chown -R "${SALT_USER}": "${SALT_ROOT_DIR}"
 
+# Fix Jinja2 version to avoid Markup import error
+# https://github.com/saltstack/salt/issues/61848
+pip3 install -I markupsafe==2.0.1 jinja2==3.0.3
+
 # Configure ssh
 log_info "Configuring ssh ..."
 sed -i -e "s|^[# ]*StrictHostKeyChecking.*$|    StrictHostKeyChecking no|" /etc/ssh/ssh_config
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ @@
     /logs/
     /3pfs/
     .vscode/
+    .idea/
     # tests
     /tests/**/keys/