6 files changed, 19 insertions(+), 6 deletions(-)

M config/bootstrap.sh
M config/bootstrap_config
M config/download_assets
A config/requirements.txt
M docker/docker-compose.yml
M in_docker.sh

@@ 64,6 64,12 @@ function setup_gcc_alternatives() {
 		MSGEND
 }
 
+function install_pip_packages() {
+    echo -e "\e[32m${FUNCNAME[0]}\e[0m"
+    pip3 install -r ${SCRIPT_DIR}/requirements.txt
+    pip3 install -r ${SCRIPT_DIR}/../tests/requirements.txt
+}
+
 function install_ubuntu_packages() {
     echo -e "\e[32m${FUNCNAME[0]}\e[0m"
     cat <<-MSGEND


@@ 75,6 81,7 @@ function install_ubuntu_packages() {
     sudo apt-get update
     sudo apt-get install ${INSTALL_PACKAGES}
     setup_gcc_alternatives
+    install_pip_packages
 }
 
 function setup_arm_toolchain() {

@@ 48,6 48,7 @@ INSTALL_PACKAGES="
         vim \
         wget \
         python3-magic \
-        python3-pip
+        python3-pip \
+        libfdisk-dev
 "
 

@@ 6,6 6,8 @@ SCRIPT_DIR="$(dirname ${SCRIPT})"
 SRC_ROOT=$(readlink -f ${SCRIPT_DIR}/..)
 
 DEST_DIR="${SRC_ROOT}/docker/assets"
+DEST_PYREQ_TMP="${DEST_DIR}/requirements.txt.tmp"
+DEST_PYREQ="${DEST_DIR}/requirements.txt"
 
 . ${SRC_ROOT}/config/common_scripsts_lib
 . ${SRC_ROOT}/config/bootstrap_config


@@ 39,7 41,9 @@ function get_gh_runner() {
 
 function getPythonReq() {
     echo -e "\e[32m${FUNCNAME[0]}\e[0m"
-    cp ${SRC_ROOT}/test/requirements.txt $DEST_DIR
+    cat ${SRC_ROOT}/test/requirements.txt > ${DEST_PYREQ_TMP}
+    cat ${SRC_ROOT}/config/requirements.txt >> ${DEST_PYREQ_TMP}
+    cat ${DEST_PYREQ_TMP} | sort | uniq > ${DEST_PYREQ}
 }
 
 get_arm_toolchain

@@ 0,0 1,1 @@
+gitpython==3.1.11

@@ 1,21 1,21 @@
 version: '3'
 services:
  gh-runner0:
-   image: wearemudita/mudita_os_builder:1.3
+   image: wearemudita/mudita_os_builder:1.4
    environment:
      WORKER_NAME: PureBuilder0
    env_file:
      - runner_settings
    entrypoint: /cmd.sh
  gh-runner1:
-   image: wearemudita/mudita_os_builder:1.3
+   image: wearemudita/mudita_os_builder:1.4
    environment:
      WORKER_NAME: PureBuilder1
    env_file:
      - runner_settings
    entrypoint: /cmd.sh
  gh-runner2:
-   image: wearemudita/mudita_os_builder:1.3
+   image: wearemudita/mudita_os_builder:1.4
    environment:
      WORKER_NAME: PureBuilder2
    env_file:

@@ 3,7 3,7 @@
 # For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
 CONTAINER_NAME="wearemudita/mudita_os_builder"
-CONTAINER_TAG="1.3"
+CONTAINER_TAG="1.4"
 CONTAINER=${CONTAINER_NAME}:${CONTAINER_TAG}
 PURE_HOME=`pwd`
 STANDARD_OPTIONS="-v `pwd`:${PURE_HOME} --user \"$(id -u):$(id -g)\" --env HOME=${PURE_HOME} -t"