Skip to content

Commit

Permalink
samba: Collection of small improvements (home-assistant#913)
Browse files Browse the repository at this point in the history
* samba: Move data files into data folder

* samba: Prettier YAML & JSON files

* samba: Update add-on URL

* samba: Remove curl from Dockerfile, already in the base image
  • Loading branch information
frenck authored and pvizeli committed Dec 19, 2019
1 parent e1ad9ae commit 6ce3006
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 44 deletions.
5 changes: 2 additions & 3 deletions samba/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ ENV LANG C.UTF-8

# Setup base
RUN apk add --no-cache \
curl \
samba-common-tools \
samba-server

# Copy data
COPY run.sh /
COPY smb.conf /etc/
COPY data/run.sh /
COPY data/smb.conf /etc/

CMD [ "/run.sh" ]
15 changes: 7 additions & 8 deletions samba/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@
trigger:
branches:
include:
- master
- master
paths:
include:
- samba/*
- samba/*
pr: none

variables:
- name: versionBuilder
value: '2.0'
value: "2.0"
- group: docker


jobs:
- template: /.azure/azp-template-addon.yml
parameters:
addon: 'samba'
arch: '--all'
- template: /.azure/azp-template-addon.yml
parameters:
addon: "samba"
arch: "--all"
40 changes: 7 additions & 33 deletions samba/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,27 @@
"version": "9.0",
"slug": "samba",
"description": "Expose Hass.io folders with SMB/CIFS",
"url": "https://home-assistant.io/addons/samba/",
"arch": [
"armhf",
"armv7",
"aarch64",
"amd64",
"i386"
],
"url": "https://github.com/home-assistant/hassio-addons/tree/master/samba",
"arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
"startup": "services",
"boot": "auto",
"host_network": true,
"map": [
"config:rw",
"ssl:rw",
"addons:rw",
"share:rw",
"backup:rw"
],
"map": ["config:rw", "ssl:rw", "addons:rw", "share:rw", "backup:rw"],
"options": {
"workgroup": "WORKGROUP",
"username": "hassio",
"password": null,
"interface": "",
"allow_hosts": [
"10.0.0.0/8",
"172.16.0.0/12",
"192.168.0.0/16"
],
"veto_files": [
"._*",
".DS_Store",
"Thumbs.db",
"icon?",
".Trashes"
]
"allow_hosts": ["10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"],
"veto_files": ["._*", ".DS_Store", "Thumbs.db", "icon?", ".Trashes"]
},
"schema": {
"workgroup": "str",
"username": "str",
"password": "str",
"interface": "str",
"allow_hosts": [
"str"
],
"veto_files": [
"str"
]
"allow_hosts": ["str"],
"veto_files": ["str"]
},
"image": "homeassistant/{arch}-addon-samba"
}
File renamed without changes.
File renamed without changes.

0 comments on commit 6ce3006

Please sign in to comment.