mirror of
https://github.com/aljazceru/addons.git
synced 2025-12-17 13:14:21 +01:00
Restart nginx for ingress on error (#1867)
* Restart nginx for ingress on error * more output * Use Alpine for almond * Fix dockerfile * Add more library * link python * fix link * python * fix removes
This commit is contained in:
Pascal Vizeli
@@ -1,5 +1,10 @@
|
||||
# Changelog
|
||||
|
||||
## 1.1.0
|
||||
|
||||
- Restart nginx service on error
|
||||
- Use Alpine 3.13
|
||||
|
||||
## 1.0.1
|
||||
|
||||
- Keep unzip dependency installed
|
||||
|
||||
@@ -9,30 +9,29 @@ ENV \
|
||||
|
||||
WORKDIR /opt/almond
|
||||
ARG ALMOND_VERSION
|
||||
|
||||
RUN \
|
||||
apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
build-essential \
|
||||
git \
|
||||
gnupg \
|
||||
nginx \
|
||||
python-dev \
|
||||
software-properties-common \
|
||||
unzip \
|
||||
\
|
||||
&& curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key \
|
||||
| apt-key add - \
|
||||
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg \
|
||||
| apt-key add - \
|
||||
&& echo "deb https://deb.nodesource.com/node_12.x buster main" \
|
||||
> /etc/apt/sources.list.d/nodesource.list \
|
||||
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" \
|
||||
> /etc/apt/sources.list.d/yarn.list \
|
||||
\
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
set -x \
|
||||
&& apk add --no-cache \
|
||||
nodejs \
|
||||
npm \
|
||||
yarn \
|
||||
nginx \
|
||||
unzip \
|
||||
blas \
|
||||
sqlite \
|
||||
pkgconf \
|
||||
&& apk add --no-cache --virtual .build-dependencies \
|
||||
build-base \
|
||||
blas-dev \
|
||||
git \
|
||||
linux-headers \
|
||||
sqlite-dev \
|
||||
pkgconf-dev \
|
||||
python3 \
|
||||
\
|
||||
&& npm config set unsafe-perm \
|
||||
&& ln -s /usr/bin/python3 /usr/bin/python \
|
||||
\
|
||||
&& git clone -b "${ALMOND_VERSION}" --depth 1 \
|
||||
"https://github.com/stanford-oval/almond-server" . \
|
||||
@@ -48,23 +47,16 @@ RUN \
|
||||
&& yarn global remove modclean \
|
||||
\
|
||||
&& yarn cache clean \
|
||||
&& apt-get purge -y --auto-remove \
|
||||
build-essential \
|
||||
git \
|
||||
gnupg \
|
||||
python-dev \
|
||||
software-properties-common \
|
||||
yarn \
|
||||
&& apk del --no-cache \
|
||||
.build-dependencies \
|
||||
\
|
||||
&& rm -rf \
|
||||
/opt/almond/.[!.]* \
|
||||
/root/.cache \
|
||||
/root/.config \
|
||||
/tmp/.[!.]* \
|
||||
/tmp/* \
|
||||
/usr/lib/nginx \
|
||||
/usr/local/share/.cache \
|
||||
/usr/local/share/.config \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/www
|
||||
/usr/local/share/.config
|
||||
|
||||
COPY rootfs /
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
{
|
||||
"build_from": {
|
||||
"aarch64": "homeassistant/aarch64-base-debian:buster",
|
||||
"amd64": "homeassistant/amd64-base-debian:buster",
|
||||
"armv7": "homeassistant/armv7-base-debian:buster"
|
||||
"aarch64": "homeassistant/aarch64-base:3.13",
|
||||
"amd64": "homeassistant/amd64-base:3.13",
|
||||
"i386": "homeassistant/i386-base:3.13",
|
||||
"armv7": "homeassistant/armv7-base:3.13",
|
||||
"armhf": "homeassistant/armhf-base:3.13"
|
||||
},
|
||||
"args": {
|
||||
"ALMOND_VERSION": "v1.8.0"
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
{
|
||||
"name": "Almond",
|
||||
"version": "1.0.1",
|
||||
"version": "1.1.0",
|
||||
"slug": "almond",
|
||||
"description": "The home server version of Almond",
|
||||
"url": "https://github.com/home-assistant/hassio-addons/blob/master/almond",
|
||||
"arch": ["armv7", "aarch64", "amd64"],
|
||||
"arch": ["armv7", "armhf", "aarch64", "amd64", "i386"],
|
||||
"init": false,
|
||||
"discovery": ["almond"],
|
||||
"ingress": true,
|
||||
"panel_icon": "mdi:comment-eye-outline",
|
||||
"homeassistant": "0.102.0.dev",
|
||||
"homeassistant": "0.102.0",
|
||||
"homeassistant_api": true,
|
||||
"options": {},
|
||||
"schema": {},
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/usr/bin/execlineb -S1
|
||||
# ==============================================================================
|
||||
# Take down the S6 supervision tree based on service exit code
|
||||
# ==============================================================================
|
||||
if { s6-test ${1} -ne 0 }
|
||||
if { s6-test ${1} -ne 256 }
|
||||
|
||||
s6-svscanctl -t /var/run/s6/services
|
||||
@@ -1,5 +1,9 @@
|
||||
# Changelog
|
||||
|
||||
## 6.7.1
|
||||
|
||||
- Restart nginx service on error
|
||||
|
||||
## 6.7.0
|
||||
|
||||
- Bump deCONZ to 2.9.3
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "deCONZ",
|
||||
"version": "6.7.0",
|
||||
"version": "6.7.1",
|
||||
"slug": "deconz",
|
||||
"description": "Control a Zigbee network with ConBee or RaspBee by Dresden Elektronik",
|
||||
"arch": ["amd64", "armhf", "aarch64"],
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/usr/bin/execlineb -S1
|
||||
# ==============================================================================
|
||||
# Take down the S6 supervision tree based on service exit code
|
||||
# ==============================================================================
|
||||
if { s6-test ${1} -ne 0 }
|
||||
if { s6-test ${1} -ne 256 }
|
||||
|
||||
s6-svscanctl -t /var/run/s6/services
|
||||
@@ -1,5 +1,9 @@
|
||||
# Changelog
|
||||
|
||||
## 11.2.1
|
||||
|
||||
- Restart nginx service on error
|
||||
|
||||
## 11.2.0
|
||||
|
||||
- Update OCCU to 3.55.10
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "HomeMatic CCU",
|
||||
"version": "11.1.0",
|
||||
"version": "11.1.1",
|
||||
"slug": "homematic",
|
||||
"description": "HomeMatic central based on OCCU",
|
||||
"url": "https://github.com/home-assistant/hassio-addons/tree/master/homematic",
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/usr/bin/execlineb -S1
|
||||
# ==============================================================================
|
||||
# Take down the S6 supervision tree based on service exit code
|
||||
# ==============================================================================
|
||||
if { s6-test ${1} -ne 0 }
|
||||
if { s6-test ${1} -ne 256 }
|
||||
|
||||
s6-svscanctl -t /var/run/s6/services
|
||||
@@ -1,5 +1,9 @@
|
||||
# Changelog
|
||||
|
||||
## 0.1.1
|
||||
|
||||
- Restart nginx service on error
|
||||
|
||||
## 0.1.0
|
||||
|
||||
- Inital release
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "VLC",
|
||||
"version": "0.1.0",
|
||||
"version": "0.1.1",
|
||||
"slug": "vlc",
|
||||
"description": "Turn you device into a Media Player with VLC",
|
||||
"arch": ["amd64", "i386", "armv7", "aarch64"],
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/usr/bin/execlineb -S1
|
||||
# ==============================================================================
|
||||
# Take down the S6 supervision tree based on service exit code
|
||||
# ==============================================================================
|
||||
if { s6-test ${1} -ne 0 }
|
||||
if { s6-test ${1} -ne 256 }
|
||||
|
||||
s6-svscanctl -t /var/run/s6/services
|
||||
Reference in New Issue
Block a user