Skip to content

Commit

Permalink
Release 0.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
helto4real committed Apr 11, 2020
1 parent 0dd243d commit a4a3fdf
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 8 deletions.
5 changes: 5 additions & 0 deletions netdaemon/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@
- Better error management in initialization
- Support for Camera in Fluent API

## [0.3.2]

- Better logging and error handling
- Serilog now main logsink
- Improved Log methods in NetDaemonApps
10 changes: 8 additions & 2 deletions netdaemon/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ARG BUILD_FROM=hassioaddons/base-amd64:5.0.3
ARG BUILD_FROM=hassioaddons/base-amd64:7.1.0

FROM mcr.microsoft.com/dotnet/core/sdk:3.1-alpine as build

Expand Down Expand Up @@ -34,11 +34,18 @@ RUN \
# STAGE 2: Include binary in target add-on container
FROM ${BUILD_FROM} AS runtime

# Set shell
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# Build arguments
ARG BUILD_ARCH

# Copy binary and the config from build container
COPY --from=build /netdaemon/bin/publish /daemon
RUN chmod +x /daemon/Service

# Copy root filesystem
COPY rootfs /

COPY install_dotnet_dep.sh /install_dotnet_dep.sh

Expand All @@ -54,7 +61,6 @@ ENV ASPNETCORE_URLS=http://+:80 \

ENV HASS_DAEMONAPPFOLDER /config/netdaemon

CMD [ "/daemon/Service" ]

#
# LABEL target docker image
Expand Down
10 changes: 5 additions & 5 deletions netdaemon/build.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"build_from": {
"aarch64": "hassioaddons/debian-base-aarch64:3.0.1",
"amd64": "hassioaddons/base-amd64:7.0.2",
"armhf": "hassioaddons/debian-base-armhf:3.0.1",
"armv7": "hassioaddons/debian-base-armv7:3.0.1"
"aarch64": "hassioaddons/debian-base-aarch64:3.1.0",
"amd64": "hassioaddons/base-amd64:7.1.0",
"armhf": "hassioaddons/debian-base-armhf:3.1.0",
"armv7": "hassioaddons/debian-base-armv7:3.1.0"
},
"args": {}
}
}
2 changes: 1 addition & 1 deletion netdaemon/config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "NetDaemon",
"version": "0.3.1",
"version": "0.3.2",
"slug": "netdaemon",
"description": "Application daemon written in .NET core 3.1",
"url": "http://netdaemon.xyz",
Expand Down
9 changes: 9 additions & 0 deletions netdaemon/rootfs/etc/services.d/NetDaemon/finish
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/execlineb -S0
# ==============================================================================
# NetDaemon add-on
# Take down the S6 supervision tree when NetDaemon fails
# ==============================================================================
if -n { s6-test $# -ne 0 }
if -n { s6-test ${1} -eq 256 }

s6-svscanctl -t /var/run/s6/services
11 changes: 11 additions & 0 deletions netdaemon/rootfs/etc/services.d/NetDaemon/run
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/with-contenv bashio
# ==============================================================================
# NetDaemon Add-on
# Starts NetDaemon
# ==============================================================================

cd /daemon || bashio::exit.nok "Could not change directory to Node-RED"

bashio::log.info "Starting NetDaemon..."

exec ./Service

0 comments on commit a4a3fdf

Please sign in to comment.