Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: [autobot] [24-11-2024 22:05:50] Automated changes #19

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions sambanas/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# Changelog

## 12.3.2-nas1 [ 🚧 Unreleased ]

### ✨ Features
###### __🚧 Work in progess__
- [ ] ACL For foleders [#208](https://github.com/dianlight/hassio-addons/issues/208)

### 🩹 BugFix
##### __🚧 Work in progess__
- [ ] MQTT Entities sometime are not deleted on close

### 🏗 Chore
- [X] Better CI and Change scripts
- [X] Remove HDDTEMP for deprecation [#265](https://github.com/dianlight/hassio-addons/issues/265)

###### __🚧 Work in progess__


## 12.3.2-nas

### ✨ Features
Expand Down
26 changes: 7 additions & 19 deletions sambanas/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG BUILD_REF
ARG BUILD_REPOSITORY
ARG BUILD_VERSION

ARG HDDTEMP_VERSION
#ARG HDDTEMP_VERSION

# hadolint ignore=DL3006
FROM $BUILD_FROM as builder
Expand All @@ -17,10 +17,10 @@ RUN apk add --no-cache make \
python3-dev musl-dev poetry

ARG BUILD_ARCH
ARG HDDTEMP_VERSION
#ARG HDDTEMP_VERSION

RUN cd / && wget -q -O - "http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-${HDDTEMP_VERSION}.tar.bz2" | tar jxvf - \
&& cd "hddtemp-${HDDTEMP_VERSION}" && ./configure --build=${BUILD_ARCH}-unknown-linux-gnu && make && find /hddtemp-${HDDTEMP_VERSION} -name "hddtemp"
#RUN cd / && wget -q -O - "http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-${HDDTEMP_VERSION}.tar.bz2" | tar jxvf - \
# && cd "hddtemp-${HDDTEMP_VERSION}" && ./configure --build=${BUILD_ARCH}-unknown-linux-gnu && make && find /hddtemp-${HDDTEMP_VERSION} -name "hddtemp"

RUN cd / && wget -q -O - "https://github.com/Netgear/wsdd2/archive/refs/heads/master.tar.gz" | tar zxvf - \
&& cd wsdd2-master && make
Expand Down Expand Up @@ -102,9 +102,9 @@ RUN apk add --no-cache \
RUN if [ "$BUILD_ARCH" != "armv7" ]; then apk add --no-cache apfs-fuse;fi

# HDDTEMP
ARG HDDTEMP_VERSION
COPY --from=builder /hddtemp-${HDDTEMP_VERSION}/src/hddtemp /usr/sbin
RUN curl http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db -Lso /usr/share/misc/hddtemp.db
#ARG HDDTEMP_VERSION
#COPY --from=builder /hddtemp-${HDDTEMP_VERSION}/src/hddtemp /usr/sbin
#RUN curl http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db -Lso /usr/share/misc/hddtemp.db

# WSDD2
COPY --from=builder /wsdd2-master/wsdd2 /usr/sbin
Expand All @@ -130,21 +130,9 @@ RUN curl -Lso /usr/bin/ha "https://github.com/home-assistant/cli/releases/downlo
# ENABLE FUSE APFS
RUN ln -s /usr/sbin/apfs-fuse /usr/sbin/mount.apfs

# PYTHON ADDONS
#RUN pip install \
# pySMART==1.3.0 \
# psutil==5.9.8 \
# humanize==4.9.0 \
# diskinfo==3.1.1 \
# pydantic==1.10.14 \
# https://github.com/dianlight/ha-mqtt-discoverable/archive/refs/heads/main.zip#0.13.1

# Copy data
COPY rootfs /

#RUN cd /usr/local/bin/ && \
# poetry install

HEALTHCHECK \
CMD smbclient -L '\\localhost' -U '%' -m SMB3

Expand Down
12 changes: 11 additions & 1 deletion sambanas/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,26 @@

Share your disks over the network using Windows file sharing.

![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield] ![Supports i386 Architecture][i386-shield]
![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armv7 Architecture][armv7-shield]

<!--
[![Stargazers repo roster for @dianlight/hassio-addons](https://raw.githubusercontent.com/dianlight/hassio-addons/master/.github/stars2.svg)](https://github.com/dianlight/hassio-addons/stargazers)
![downloads evolution](https://raw.githubusercontent.com/dianlight/hassio-addons/master/sambanas/stats.png)
-->

## Installations

![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fanalytics.home-assistant.io%2Faddons.json&query=%24.1a32f091_sambanas.total&label=SambaNas%20Installations&link=https%3A%2F%2Faddonstats.poeschl.xyz%2F%23)
![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fanalytics.home-assistant.io%2Faddons.json&query=%24.c9a35110_sambanas.total&label=SambaNas%20β%20Installations&link=https%3A%2F%2Faddonstats.poeschl.xyz%2F%23)

## Help Me!

[![](https://img.shields.io/github/sponsors/dianlight?label=Sponsor&logo=GitHub)](https://github.com/sponsors/dianlight)

<a href="https://www.buymeacoffee.com/ypKZ2I0"><img src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=ypKZ2I0&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff" /></a>


## About

This Add-on allows you to enable file sharing across different operating systems over a network.
Expand Down
2 changes: 1 addition & 1 deletion sambanas/config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Samba NAS-β
version: 12.3.2-nas.beta84
version: 12.3.2-nas1.beta91
slug: sambanas
description: Expose Home Assistant disc with SMB/CIFS
url: https://github.com/dianlight/hassio-addons/tree/master/sambanas
Expand Down
1 change: 1 addition & 0 deletions sambanas/rootfs/etc/s6-overlay/s6-rc.d/init-samba/run
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ if [[ ! -e /tmp/local_mount.json ]]; then
fi

jq ".shares = $(jq -c </tmp/local_mount.json) | .interfaces = $(jq -c -n '$ARGS.positional' --args -- "${interfaces[@]}") | .docker_interface = \"$(bashio::network 'network.info.docker.inerface' '.docker.interface')\" | .docker_net = \"$(bashio::network 'network.info.docker.network' '.docker.address')\" | .moredisks = $(jq -R -s -c 'split("\n") | map(select(length > 0)) | [ .[] | ltrimstr("/") ]' </tmp/local_mount) " /data/options.json |
tee /config/bootconfig.json |
tempio \
-template /usr/share/tempio/smb.gtpl \
-out /etc/samba/smb.conf
Expand Down
Loading