diff --git a/homeway/Dockerfile b/homeway/Dockerfile index b68a10e..210c843 100644 --- a/homeway/Dockerfile +++ b/homeway/Dockerfile @@ -40,7 +40,13 @@ RUN whoami # { "VersionFileDir":"/app", "AddonDataRootDir":"/data", "StorageDir":"/data", "LogsDir":"/data", "IsRunningInHaAddonEnv":true } # # Note if we every move past "python3", we need to update apparmor. -CMD [ "python3", "-m", "homeway_linuxhost", "eyAiVmVyc2lvbkZpbGVEaXIiOiIvYXBwIiwgIkFkZG9uRGF0YVJvb3REaXIiOiIvZGF0YSIsICJTdG9yYWdlRGlyIjoiL2RhdGEiLCAiTG9nc0RpciI6Ii9kYXRhIiwgIklzUnVubmluZ0luSGFBZGRvbkVudiI6dHJ1ZSB9" ] +#CMD [ "python3", "-m", "homeway_linuxhost", "eyAiVmVyc2lvbkZpbGVEaXIiOiIvYXBwIiwgIkFkZG9uRGF0YVJvb3REaXIiOiIvZGF0YSIsICJTdG9yYWdlRGlyIjoiL2RhdGEiLCAiTG9nc0RpciI6Ii9kYXRhIiwgIklzUnVubmluZ0luSGFBZGRvbkVudiI6dHJ1ZSB9" ] + +# Set the run script exectuable. +RUN chmod a+x /app/run.sh + +# Create a command to launch the run script. +CMD [ "/app/run.sh" ] # Build arguments ARG BUILD_ARCH diff --git a/homeway/config.yaml b/homeway/config.yaml index af82f2c..e45c416 100644 --- a/homeway/config.yaml +++ b/homeway/config.yaml @@ -38,4 +38,4 @@ image: ghcr.io/homewayio/homeway/{arch} # Note when this version number changes, we must make a release to start a docker container build immediately, since HA will start looking for the new version. # Basically: Make the final commit -> test and check lint actions (if a docker change, push to docker-test to ensure it builds) -> bump the version number -> create GitHub release. # UPDATE THE CHANGE LOG! -version: 1.5.3 +version: 1.5.4 diff --git a/homeway/run.sh b/homeway/run.sh new file mode 100644 index 0000000..3bf6595 --- /dev/null +++ b/homeway/run.sh @@ -0,0 +1,11 @@ +#!/usr/bin/with-contenv bashio + +# Since we are running in a docker container, there's no need for dynamic configs. +# The repo root is /app, as we define in our Dockerfile +# The storage root it the Home Assistant docker mapped dir, /data/ +# Note that all of the data is stored in this flat dir, the config, storage data, and logs. + +# This is the json config, that's base64 encoded and sent as an argument. +# { "VersionFileDir":"/app", "AddonDataRootDir":"/data", "StorageDir":"/data", "LogsDir":"/data", "IsRunningInHaAddonEnv":true } + +python3 -m homeway_linuxhost eyAiVmVyc2lvbkZpbGVEaXIiOiIvYXBwIiwgIkFkZG9uRGF0YVJvb3REaXIiOiIvZGF0YSIsICJTdG9yYWdlRGlyIjoiL2RhdGEiLCAiTG9nc0RpciI6Ii9kYXRhIiwgIklzUnVubmluZ0luSGFBZGRvbkVudiI6dHJ1ZSB9 \ No newline at end of file