Skip to content

Commit

Permalink
Added .net 8 to default base images
Browse files Browse the repository at this point in the history
  • Loading branch information
helto4real committed Oct 21, 2023
1 parent 9a70fbf commit c69b94a
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.addonbase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
--platform linux/arm,linux/arm64,linux/amd64 \
--output "type=image,push=true" \
--no-cache \
--file ./addon_base/Dockerfile . \
--file ./addon_base/Dockerfile8 . \
--compress \
--tag "netdaemon/netdaemon_addonbase" \
--tag "ghcr.io/net-daemon/netdaemon_addonbase"
--tag "netdaemon/netdaemon_addonbase:8" \
--tag "ghcr.io/net-daemon/netdaemon_addonbase:8"
8 changes: 4 additions & 4 deletions .github/workflows/build.addonbase7.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#### Publish tags to docker hub
name: 📦 Deploy to netdaemon_addonbase_7
name: 📦 Deploy to netdaemon_addonbase:7
on:
workflow_dispatch:

jobs:
deploy:
name: 📦 Deploy to netdaemon_base_7
name: 📦 Deploy to netdaemon_base:7
runs-on: ubuntu-latest
environment: CI - release environment
steps:
Expand Down Expand Up @@ -38,5 +38,5 @@ jobs:
--no-cache \
--file ./addon_base/Dockerfile7 . \
--compress \
--tag "netdaemon/netdaemon_addonbase7" \
--tag "ghcr.io/net-daemon/netdaemon_addonbase7"
--tag "netdaemon/netdaemon_addonbase:7" \
--tag "ghcr.io/net-daemon/netdaemon_addonbase:7"
6 changes: 3 additions & 3 deletions .github/workflows/build.base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
--platform linux/arm,linux/arm64,linux/amd64 \
--output "type=image,push=true" \
--no-cache \
--file ./base/Dockerfile . \
--file ./base/Dockerfile8 . \
--compress \
--tag "netdaemon/netdaemon_base" \
--tag "ghcr.io/net-daemon/netdaemon_base"
--tag "netdaemon/netdaemon_base:8" \
--tag "ghcr.io/net-daemon/netdaemon_base:8"
4 changes: 2 additions & 2 deletions .github/workflows/build.base7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ jobs:
--no-cache \
--file ./base/Dockerfile7 . \
--compress \
--tag "netdaemon/netdaemon_base7" \
--tag "ghcr.io/net-daemon/netdaemon_base7"
--tag "netdaemon/netdaemon_base:7" \
--tag "ghcr.io/net-daemon/netdaemon_base:7"
13 changes: 13 additions & 0 deletions addon_base/Dockerfile8
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

FROM ghcr.io/net-daemon/netdaemon_base:8

RUN mkdir -p /usr/src/bashio \
&& curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v0.14.3.tar.gz" \
| tar -xzf - --strip 1 -C /usr/src/bashio \
&& mv /usr/src/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio

LABEL \
io.hass.version="VERSION" \
io.hass.type="addon" \
io.hass.arch="armhf|aarch64|amd64"
25 changes: 25 additions & 0 deletions base/Dockerfile8
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

FROM mcr.microsoft.com/dotnet/sdk:8.0

ENV \
S6_KEEP_ENV=1 \
DOTNET_NOLOGO=true \
DOTNET_CLI_TELEMETRY_OPTOUT=true \
ASPNETCORE_URLS=http://+:5000

# This one is used by the container to start custom assembly
#NETDAEMON__APPLICATION_ASSEMBLY=""

# Install S6 and the Admin site
RUN apt update && apt install -y \
nodejs \
yarn \
jq \
make

COPY ./base/s6.sh /s6.sh

RUN chmod 700 /s6.sh
RUN /s6.sh

ENTRYPOINT ["/init"]

0 comments on commit c69b94a

Please sign in to comment.