aljaz/addons
1
0
Fork 0
mirror of https://github.com/aljazceru/addons.git synced 2025-12-20 14:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to custom deps (#422)

Browse Source 
* Fix spelling

* Cleanup up custom_deps/run.sh

* Disable sheelcheck warning

* Update run.sh

* Update CHANGELOG.md

* Update config.json

* Create build.json

* Update Dockerfile
This commit is contained in:
George Marshall
2018-10-10 01:07:35 -07:00
committed by Pascal Vizeli
parent c7cbeb6972
commit 446dd8d65c
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
custom_deps/CHANGELOG.md
View File

@@ -1,10 +1,13 @@
# Changelog # Changelog
## 1
- Bug fix multiple pip packages v2
## 0.3 ## 0.3
- Bugfix multible pip packages - Bug fix multiple pip packages
## 0.2 ## 0.2
- Bugfix pip prefix settings - Bug fix pip prefix settings
## 0.1 ## 0.1
- Initial release - Initial release

2
custom_deps/Dockerfile
View File

@@ -6,7 +6,7 @@ ENV LANG C.UTF-8
# Setup base # Setup base
RUN apk add --no-cache \ RUN apk add --no-cache \
jq python3 gcc g++ make cmake git python3-dev gcc g++ make cmake git
# Copy data # Copy data
COPY run.sh / COPY run.sh /

2
custom_deps/config.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "Custom deps deployment", "name": "Custom deps deployment",
"version": "0.3", "version": "1",
"slug": "custom_deps", "slug": "custom_deps",
"description": "Manage custom python modules in Home Assistant deps", "description": "Manage custom python modules in Home Assistant deps",
"url": "https://home-assistant.io/addons/custom_deps/", "url": "https://home-assistant.io/addons/custom_deps/",

17
custom_deps/run.sh
View File

@@ -3,19 +3,20 @@ set -e
CONFIG_PATH=/data/options.json CONFIG_PATH=/data/options.json
PYPI="$(jq --raw-output '.pypi | join(" ")' $CONFIG_PATH)" PYPI="$(jq --raw-output '.pypi | join(" ")' ${CONFIG_PATH})"
APK="$(jq --raw-output '.apk | join(" ") // empty' $CONFIG_PATH)" APK="$(jq --raw-output '.apk | join(" ") // empty' ${CONFIG_PATH})"
# Cleanup old deps # Cleanup old deps
echo "[Info] Remove old deps" echo "[Info] Remove old deps"
rm -rf /config/deps/* rm -rf /config/deps/*
# Need custom apk for build? # Need custom apk for build?
if [ -n "$APK" ]; then if [ -n "${APK}" ]; then
echo "[Info] Install apks for build" echo "[Info] Install apks for build"
if ! ERROR="$(apk add --no-cache "${APK[@]}")"; then # shellcheck disable=SC2086
if ! ERROR="$(apk add --no-cache ${APK})"; then
echo "[Error] Can't install packages!" echo "[Error] Can't install packages!"
echo "$ERROR" && exit 1 echo "${ERROR}" && exit 1
fi fi
fi fi
@@ -24,9 +25,9 @@ echo "[Info] Install pypi modules into deps"
export PYTHONUSERBASE=/config/deps export PYTHONUSERBASE=/config/deps
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if ! ERROR="$(pip3 install --user --no-cache-dir --prefix= --no-dependencies $PYPI)"; then if ! ERROR="$(pip3 install --user --no-cache-dir --prefix= --no-dependencies ${PYPI})"; then
echo "[Error] Can't install pypi packages!" echo "[Error] Can't install PyPI packages!"
echo "$ERROR" && exit 1 echo "${ERROR}" && exit 1
fi fi
echo "[Info] done" echo "[Info] done"