1.1: core: Update to use a newer python version and base image

core/Dockerfile

@@ -14,12 +14,12 @@ RUN --mount=type=cache,target=/home/pi/frontend/node_modules yarn --cwd /home/pi
 COPY frontend/src/assets/vehicles /home/pi/frontend/dist/vehicles
 
 # Download binaries
-FROM bluerobotics/blueos-base:v0.0.10 as downloadBinaries
+FROM bluerobotics/blueos-base:v0.1.0 as downloadBinaries
 COPY tools /home/pi/tools
 RUN /home/pi/tools/install-static-binaries.sh
 
 # BlueOS-docker base image
-FROM bluerobotics/blueos-base:v0.0.10
+FROM bluerobotics/blueos-base:v0.1.0
 
 # Install necessary tools
 COPY tools /home/pi/tools

core/libs/install-libs.sh

@@ -10,11 +10,13 @@ BUILD_PACKAGES=(
 apt update
 apt install -y --no-install-recommends ${BUILD_PACKAGES[*]}
 
-# Pre-Build dependencies:
-# For convenience, we build ourselves the .wheel packages for dependencies
-# which have no armv7 wheel in pypi. This saves a lot of build time in docker
-if [[ "$(uname -m)" == "armv7l"* ]]; then
-    pip install https://s3.amazonaws.com/downloads.bluerobotics.com/companion-docker/wheels/aiohttp-3.7.4-cp39-cp39-linux_armv7l.whl
+# Piwheels is a Python package repository providing Arm platform wheels (pre-compiled binary Python packages)
+# specifically for the Raspberry Pi, making pip installations much faster.
+# Packages are natively compiled on Raspberry Pi 3 and 4 hardware
+if [[ "$(uname -m)" == "arm"* ]]; then
+    echo "Configuring pip to use piwheels"
+    echo "[global]" >> /etc/pip.conf
+    echo "extra-index-url=https://www.piwheels.org/simple" >> /etc/pip.conf
 fi
 
 CURRENT_PATH=$(dirname "$0")

core/services/beacon/setup.py

@@ -7,6 +7,7 @@
     version="0.1.0",
     description="Mdns service",
     license="MIT",
+    py_modules=[],
     install_requires=[
         "commonwealth == 0.1.0",
         "loguru == 0.5.3",

core/services/bridget/setup.py

@@ -7,6 +7,7 @@
     version="0.1.0",
     description="Manager for 'bridges' links.",
     license="MIT",
+    py_modules=[],
     install_requires=[
         "bridges == 0.1.0",
         "commonwealth == 0.1.0",

core/services/commander/setup.py

@@ -7,6 +7,7 @@
     version="0.1.0",
     description="Allow the usage of simple commands from the frontend.",
     license="MIT",
+    py_modules=[],
     install_requires=[
         "appdirs == 1.4.4",
         "commonwealth == 0.1.0",

core/services/helper/setup.py

@@ -62,6 +62,7 @@ def populate_static_files() -> None:
     version="0.1.0",
     description="Helper information for development",
     license="MIT",
+    py_modules=[],
     install_requires=[
         "aiofiles == 0.6.0",
         "beautifulsoup4 == 4.9.3",

core/services/install-services.sh

@@ -10,13 +10,6 @@ BUILD_PACKAGES=(
 apt update
 apt install -y --no-install-recommends ${BUILD_PACKAGES[*]}
 
-# Pre-Build dependencies:
-# For convenience, we build ourselves the .wheel packages for dependencies
-# which have no armv7 wheel in pypi. This saves a lot of build time in docker
-if [[ "$(uname -m)" == "armv7l"* ]]; then
-    pip install https://s3.amazonaws.com/downloads.bluerobotics.com/companion-docker/wheels/aiohttp-3.7.4-cp39-cp39-linux_armv7l.whl
-fi
-
 # Wifi service:
 ## Bind path for wpa
 mkdir -p /var/run/wpa_supplicant/

core/services/kraken/setup.py

@@ -7,6 +7,7 @@
     version="0.1.0",
     description="Manages BlueOS extensions",
     license="MIT",
+    py_modules=[],
     install_requires=[
         "aiodocker == 0.21.0",
         "appdirs == 1.4.4",

core/services/ping/setup.py

@@ -14,6 +14,7 @@
     version="0.2.0",
     description="Ping service for BlueRobotics' Ping1D and Pìng360",
     license="MIT",
+    py_modules=[],
     install_requires=[
         "bluerobotics-ping == 0.1.5",
         "bridges == 0.1.0",

core/services/versionchooser/setup.py

@@ -42,6 +42,7 @@
     version="0.1.0",
     description="Blue Robotics Ardusub BlueOS Version Chooser",
     license="MIT",
+    py_modules=[],
     install_requires=[
         "aiodocker == 0.21.0",
         "aiohttp == 3.7.4",

core/services/wifi/setup.py

@@ -41,6 +41,7 @@
     version="0.1.0",
     description="Wifi manager for wpa_supplicant",
     license="MIT",
+    py_modules=[],
     install_requires=[
         "aiofiles == 0.6.0",
         "commonwealth == 0.1.0",

pyproject.toml

@@ -5,6 +5,9 @@ description = "Blue Robotics BlueOS computer project"
 authors = ["Software Department <software@bluerobotics.com>"]
 license = "MIT"
 
+[tool.setuptools]
+py-modules = []
+
 [tool.poetry.dependencies]
 python = "^3.9"