diff --git a/.github/paths-filter.yml b/.github/paths-filter.yml index 9280c6bc5..71b789d1c 100644 --- a/.github/paths-filter.yml +++ b/.github/paths-filter.yml @@ -3,8 +3,10 @@ # name: slug/filename ; could be slug/config.* for all files addons_updater: addons_updater/config.* # Image : yes arpspoof: arpspoof/config.* # Image : yes +autobrr: autobrr/config.* # Image : yes baikal: baikal/config.* # Image : yes bazarr: bazarr/config.* # Image : yes +binance-trading-bot: binance-trading-bot/config.* # Image : yes bitwarden: bitwarden/config.* # Image : yes booksonic_air: booksonic_air/config.* # Image : yes browserless_chrome: browserless_chrome/config.* # Image : yes @@ -67,6 +69,7 @@ scrutiny: scrutiny/config.* # Image : yes scrutiny_fa: scrutiny_fa/config.* # Image : yes seafile: seafile/config.* # Image : yes sonarr: sonarr/config.* # Image : yes +sponsorblockcast: sponsorblockcast/config.* # Image : yes spotweb: spotweb/config.* # Image : yes tandoor_recipes: tandoor_recipes/config.* # Image : yes tdarr: tdarr/config.* # Image : yes diff --git a/.github/stars.svg b/.github/stars.svg new file mode 100644 index 000000000..8f2c72a80 --- /dev/null +++ b/.github/stars.svg @@ -0,0 +1,311 @@ + + + +\nalexbelgium + + + + + + + +\npetersendev + + + + + + + +\nbruvv + + + + + + + +\nbaldarn + + + + + + + +\nelmerenges + + + + + + + +\nelahd + + + + + + + +\nwoutercoppens + + + + + + + +\nDeckoz2302 + + + + + + + +\nNODeeJay + + + + + + + +\ndanbruno + + + + + + + +\nmarciogranzotto + + + + + + + +\nfkhofmann + + + + + + + +\ntyjtyj + + + + + + + +\nAlecRust + + + + + + + +\nBerghsJelmer + + + + + + + +\nEalenn + + + + + + + +\nSilvioMessi + + + + + + + +\nproffalken + + + + + + + +\nleokeba + + + + + + + +\nankushg + + + + + + + +\nChronoRadion + + + + + + + +\nDDanii + + + + + + + +\nEpicLPer + + + + + + + +\ngieljnssns + + + + + + + +\nImgBotApp + + + + + + + +\njeffothy + + + + + + + +\nMaxWinterstein + + + + + + + +\nnathang21 + + + + + + + +\nSpand0x + + + + + + + +\ntmcarr + + + + + + + +\nacervicius + + + + + + + +\ndavoloko + + + + + + + +\nmonkey-debugger + + + + + + + +\nmxwi + + + + + + + +\nnovisys + + + + + + + +\npullaf + + + + + + + +\ntdn131 + + + + + + + +\nwesleygas + + + + + + + + diff --git a/.github/stars2.svg b/.github/stars2.svg new file mode 100644 index 000000000..2284a9356 --- /dev/null +++ b/.github/stars2.svg @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + … and more + + + \ No newline at end of file diff --git a/.github/starsevol.svg b/.github/starsevol.svg new file mode 100644 index 000000000..5d2d174ea --- /dev/null +++ b/.github/starsevol.svg @@ -0,0 +1,4 @@ +AprilJulyOctober2022AprilJulyOctober2023April 200400600alexbelgium/hassio-addonsStar HistoryDateGitHub Stars \ No newline at end of file diff --git a/.github/stats.png b/.github/stats.png new file mode 100644 index 000000000..ae85b40b5 Binary files /dev/null and b/.github/stats.png differ diff --git a/.github/stats_addons.png b/.github/stats_addons.png new file mode 100644 index 000000000..fb18ec1ce Binary files /dev/null and b/.github/stats_addons.png differ diff --git a/.github/workflows/archived_lint-checks.yaml b/.github/workflows/archived_lint-checks.yaml index 5e520c442..8cfb0ca86 100644 --- a/.github/workflows/archived_lint-checks.yaml +++ b/.github/workflows/archived_lint-checks.yaml @@ -60,6 +60,6 @@ jobs: fetch-depth: 0 - name: 🔎 Run markdownlint - uses: nosborn/github-action-markdown-cli@v3.2.0 + uses: nosborn/github-action-markdown-cli@v3.3.0 with: config_file: .markdownlint.yaml diff --git a/.github/workflows/daily_README.yaml b/.github/workflows/daily_README.yaml index 3d39c483a..de6862e9d 100644 --- a/.github/workflows/daily_README.yaml +++ b/.github/workflows/daily_README.yaml @@ -134,6 +134,7 @@ jobs: STATS_ONE="$(awk 'NR==3{print $(NF)}' Stats)" && \ STATS_TWO="$(awk 'NR==4{print $(NF)}' Stats)" && \ STATS_THREE="$(awk 'NR==5{print $(NF)}' Stats)" + echo "Best addon is $STATS_ONE" sed -i "s|%%STATS_ONE%%|${STATS_ONE^}|g" README2.md sed -i "s|%%STATS_TWO%%|${STATS_TWO^}|g" README2.md sed -i "s|%%STATS_THREE%%|${STATS_THREE^}|g" README2.md @@ -165,19 +166,15 @@ jobs: if [ "$i" -eq "$i" ] && [ "$i" -gt "$j" ]; then j="$i"; fi done sed -i "s|${var^}|${var^} (${j}x)|g" README2.md + echo "$STATS_ONE has $j downloads" done echo "... done" # Replace template if change echo "Replace template..." - if [[ "$(stat -c%s "README2.md")" == "$(stat -c%s "README.md")" ]]; then - echo "no changes" - rm README2.md - else - rm README.md - mv README2.md README.md - fi + mv README2.md README.md + echo "... done" shell: bash diff --git a/.github/workflows/daily_stale.yml b/.github/workflows/daily_stale.yml index ff7ff13de..118e4c0fe 100644 --- a/.github/workflows/daily_stale.yml +++ b/.github/workflows/daily_stale.yml @@ -20,7 +20,7 @@ jobs: pull-requests: write steps: - - uses: actions/stale@v7 + - uses: actions/stale@v8 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.' @@ -30,3 +30,4 @@ jobs: days-before-stale: '5' days-before-close: '2' exempt-issue-labels: 'prevent stale' + remove-stale-when-updated: true diff --git a/.github/workflows/helper_stats_graphs.yaml b/.github/workflows/helper_stats_graphs.yaml new file mode 100644 index 000000000..3f909b4d3 --- /dev/null +++ b/.github/workflows/helper_stats_graphs.yaml @@ -0,0 +1,246 @@ +# yamllint disable rule:line-length +--- +name: Generate weekly graphs +on: + schedule: + - cron: 0 18 * * * + workflow_call: + workflow_dispatch: + +jobs: + stats_graphs: + runs-on: ubuntu-latest + steps: + - name: Checkout Repo + uses: actions/checkout@v3 + - name: Install apps + run: | + git pull --rebase origin master + sudo apt-get install gawk -y + sudo apt-get install gnuplot-nox -y + - name: Create addons stats + run: | + # Prepare data + cp Stats Stats3 + # Remove Totals + sed -i "2d" Stats3 + # Inverse file + gawk -i inplace '{for(i=NF;i>1;i--)printf "%s ",$i;printf "%s",$1;print ""}' Stats3 + # Only top 10 + head -n 11 Stats3 > tmp_file && mv tmp_file Stats3 + # Transpose data + awk ' + { + for (i=1; i<=NF; i++) { + a[NR,i] = $i + } + } + NF>p { p = NF } + END { + for(j=1; j<=p; j++) { + str=a[1,j] + for(i=2; i<=NR; i++){ + str=str" "a[i,j]; + } + print str + } + }' Stats3 > StatsTmp && mv StatsTmp .github/Stats3 + cd .github || true + # Add download count to names + #build_list="$(head -n 1 Stats3)" + # shellcheck disable=SC2206 + #build_list=($build_list) + # shellcheck disable=SC2013 + #for var in "${build_list[@]:1}"; do + #i=0 + #j=0 + #k=0 + # shellcheck disable=SC2013 + # for i in $(sed -n "/${var}/p" Stats); do + # k="$((k+1))" + # if [ "$k" -eq 3 ]; then break; fi + # if [ "$i" -eq "$i" ] && [ "$i" -gt "$j" ]; then j="$i"; fi + # done + #sed -i "s|${var}|${var}_(${j}x)|g" Stats3 + #done + echo "... done" + # Remove series with less than 4 points + sed -i "/^[0-9|-]* [0-9*|-]* [0-9*|-]* -/d" Stats3 + # Plot graph + ( gnuplot-nox -persist <<-EOFMarker + set title 'Top 10 addons' + set ylabel 'Number of installations' + set xdata time + set datafile missing "-" + set timefmt "%Y-%m-%d" + set format x "%y-%m-%d" + set datafile sep ' ' + set autoscale + set terminal png size 500,300 + set output 'stats_addons.png' + set term png tiny + plot for [i=2:*] 'Stats3' using 1:i w l title columnhead(i) smooth bezier + EOFMarker + ) || ( gnuplot-nox -persist <<-EOFMarker + set title 'Top 10 addons' + set ylabel 'Number of installations' + set xdata time + set datafile missing "-" + set timefmt "%Y-%m-%d" + set format x "%y-%m-%d" + set datafile sep ' ' + set autoscale + set terminal png size 500,300 + set output 'stats_addons.png' + set term png tiny + plot for [i=2:*] 'Stats3' using 1:i w l title columnhead(i) + EOFMarker + ) + #plot for [i=1:*] 'Stats3' using 0:i + rm Stats3 + cd .. || true + + - name: Create individual stats + run: | + # Prepare data + cp Stats Stats3 + # Remove Totals + sed -i "2d" Stats3 + # Inverse file + gawk -i inplace '{for(i=NF;i>1;i--)printf "%s ",$i;printf "%s",$1;print ""}' Stats3 + # For each addon + # shellcheck disable=SC2013 + for line in $(awk '{ print $1 }' Stats3); do + TITLE="${line%% *}" + FOLDER="$(grep -irl "ghcr.io/alexbelgium/$TITLE-{arch}" --include="config.*" . | xargs -r dirname)" + FOLDER="${FOLDER:2}" + echo "$TITLE found in $FOLDER" + # If non null + if [[ "${#FOLDER}" -gt 2 ]]; then + sed -n "/Date /p" Stats3 > "$FOLDER"/StatsTmp + sed -n "/$TITLE /p" Stats3 >> "$FOLDER"/StatsTmp + # Go in folder + cd "$FOLDER" || true + cat StatsTmp + # Transpose data + awk ' + { + for (i=1; i<=NF; i++) { + a[NR,i] = $i + } + } + NF>p { p = NF } + END { + for(j=1; j<=p; j++) { + str=a[1,j] + for(i=2; i<=NR; i++){ + str=str" "a[i,j]; + } + print str + } + }' StatsTmp > StatsTmp2 && mv StatsTmp2 StatsTmp + #Normalize data + #awk 'FNR==NR{max=($2+0>max)?$2:max;next} {print $1,$2/max}' StatsTmp StatsTmp + # Plot graph + ( gnuplot-nox -persist <<-EOFMarker + set title "$TITLE" + set ylabel 'Number of installations' + set xdata time + set datafile missing "-" + set timefmt "%Y-%m-%d" + set format x "%y-%m-%d" + set datafile sep ' ' + set autoscale + set terminal png size 500,150 + set output "stats.png" + set term png tiny + plot for [i=2:*] 'StatsTmp' using 1:i w l title columnhead(i) smooth bezier + EOFMarker + ) || ( gnuplot-nox -persist <<-EOFMarker + set title "$TITLE" + set ylabel 'Number of installations' + set xdata time + set datafile missing "-" + set timefmt "%Y-%m-%d" + set format x "%y-%m-%d" + set datafile sep ' ' + set autoscale + set terminal png size 500,150 + set output "stats.png" + set term png tiny + plot for [i=2:*] 'StatsTmp' using 1:i w l title columnhead(i) + EOFMarker + ) || true + rm StatsTmp || true + cd .. || true + fi || true + done + # Clean files + rm StatsTmp2 + rm Stats3 + - name: Create global stats + run: | + # Prepare data + cp Stats Stats3 + # Inverse file + gawk -i inplace '{for(i=NF;i>1;i--)printf "%s ",$i;printf "%s",$1;print ""}' Stats3 + # Only totals + head -n 2 Stats3 > tmp_file && mv tmp_file Stats3 + # Transpose data + awk ' + { + for (i=1; i<=NF; i++) { + a[NR,i] = $i + } + } + NF>p { p = NF } + END { + for(j=1; j<=p; j++) { + str=a[1,j] + for(i=2; i<=NR; i++){ + str=str" "a[i,j]; + } + print str + } + }' Stats3 > StatsTmp && mv StatsTmp .github/Stats3 + cd .github || true + sed -i "1d" Stats3 + # Plot graph + gnuplot-nox -persist <<-EOFMarker + set title 'Total addons' + set ylabel 'Number of installations' + set xdata time + set datafile missing "-" + set timefmt "%Y-%m-%d" + set format x "%y-%m-%d" + set datafile sep ' ' + set key top left autotitle columnheader + set autoscale + set terminal png size 500,300 + set output 'stats.png' + set term png tiny + plot 'Stats3' using 1:2 lt rgb 'red' w l title 'Total addons' smooth bezier + EOFMarker + rm Stats3 + cd .. || true + - name: Clean + run: | + echo "Starting run" + if [ -f stats.png ]; then rm stats.png; fi + if [ -f Stats3 ]; then rm Stats3; fi + - name: Update stars + run: | + echo "Starting run" + # Get stars + wget -S -O .github/stars.svg https://contrib.rocks/image?repo=alexbelgium/hassio-addons || true + # Get stars2 + wget -S -O .github/stars2.svg https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30 || \ + wget -S -O .github/stars2.svg https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons || \ + wget -S -O .github/stars2.svg https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=31 || true + # Get stars evolution + wget -S -O .github/starsevol.svg "https://api.star-history.com/svg?repos=alexbelgium/hassio-addons&type=Date" + - name: Commit if needed + uses: EndBug/add-and-commit@v9 + with: + message: "GitHub bot : graphs updated" + default_author: github_actions diff --git a/.github/workflows/on_issues.yml b/.github/workflows/on_issues.yml index 8847f0542..d3f83331b 100644 --- a/.github/workflows/on_issues.yml +++ b/.github/workflows/on_issues.yml @@ -36,12 +36,11 @@ jobs: #Get variables TITLE="$(jq -r --arg COUNTER $COUNTER ".[$COUNTER].title" issueslist)" - #Check if relevant to addon - TITLE2="${TITLE,,}" - f2="${f,,}" - if [[ "$TITLE2" == *"$f2"* ]]; then - echo "Title has an issue" + SLUG="$(jq -r --arg f "$f" ".slug" "$f"/config.json)" + NAME="$(jq -r --arg f "$f" ".name" "$f"/config.json)" + if [[ "${TITLE,,}" == *"${f,,}"* ]] || [[ "${TITLE,,}" == *"${SLUG,,}"* ]] || [[ "${TITLE,,}" == *"${NAME,,}"* ]]; then + echo "Project $TITLE, $SLUG, $NAME has an issue" REQ="$(jq -r --arg COUNTER $COUNTER ".[$COUNTER].user.login" issueslist)" URL="$(jq -r --arg COUNTER $COUNTER ".[$COUNTER].html_url" issueslist)" LABEL="$(jq -r --arg COUNTER $COUNTER ".[$COUNTER].labels[].name" issueslist)" diff --git a/.github/workflows/onpush_builder.yaml b/.github/workflows/onpush_builder.yaml index fa2dac660..fdcf5b70a 100644 --- a/.github/workflows/onpush_builder.yaml +++ b/.github/workflows/onpush_builder.yaml @@ -14,30 +14,8 @@ on: - "**/config.*" jobs: - make-executable: - runs-on: ubuntu-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - - name: Make scripts executable - run: | - echo "Starting" - git config core.filemode true - # shellcheck disable=SC2086,SC2046 - #git update-index --chmod=+x $(find . -type f -iname "*.sh") - chmod u+x $(find . -type f -iname "*.sh") - #git commit -am "fixing the script permissions..." - - name: Commit if needed - uses: EndBug/add-and-commit@v9 - with: - commit: -u - message: "GitHub bot : scripts executable" - default_author: github_actions - check-addon-changes: runs-on: ubuntu-latest - needs: make-executable outputs: changedAddons: ${{ steps.filter.outputs.changes }} steps: @@ -50,6 +28,34 @@ jobs: with: filters: .github/paths-filter.yml + make-executable: + if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} + needs: check-addon-changes + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} + steps: + - name: Checkout Repo + uses: actions/checkout@v3 + - name: Make scripts executable + run: | + echo "Starting" + git config core.filemode true + # shellcheck disable=SC2086,SC2046 + #git update-index --chmod=+x $(find "$path" -type f -iname "*.sh") + chmod u+x $(find "$path" -type f -iname "*.sh") + #git commit -am "fixing the script permissions..." + env: + path: "./${{ matrix.addon }}" + - name: Commit if needed + uses: EndBug/add-and-commit@v9 + with: + commit: -u + message: "GitHub bot : scripts executable" + default_author: github_actions + lint_config: if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} needs: check-addon-changes @@ -68,7 +74,7 @@ jobs: build: if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} - needs: check-addon-changes + needs: [check-addon-changes, make-executable, lint_config] runs-on: ubuntu-latest environment: CR_PAT name: Build ${{ matrix.arch }} ${{ matrix.addon }} add-on @@ -128,3 +134,50 @@ jobs: --image "${{ steps.check.outputs.image }}" \ --docker-hub "ghcr.io/${{ github.repository_owner }}" \ --addon + + make-changelog: + if: ${{ needs.check-addon-changes.outputs.changedAddons != '[]' }} + needs: [check-addon-changes, build] + runs-on: ubuntu-latest + strategy: + matrix: + addon: ${{ fromJSON(needs.check-addon-changes.outputs.changedAddons) }} + steps: + - name: Checkout Repo + uses: actions/checkout@v3 + - name: Update changelog for minor versions + run: | + echo "Starting" + cd "$path" + # Get version + if [ -f config.yaml ]; then + version="$(sed -e '/version/!d' -e 's/.*version: //' config.yaml)" + elif [ -f config.json ]; then + version="$(sed -e '/version/!d' -e 's/.*[^"]*"\([^"]*\)"/\1/' config.json)" + version="${version//,}" + else + exit 1 + fi + # Exit if test + if [[ "$version" == *"test"* ]]; then exit 0; fi + # Create changelog + touch CHANGELOG.md + # If the version does not exist + if ! grep -q "$version" CHANGELOG.md; then + # And if latest wasn't a minor version + #if [ "$(sed -n '/^###/p;q' CHANGELOG.md)" ]; then + # sed -i "1d" CHANGELOG.md + # sed -i "1i\### $version ($(date '+%d-%m-%Y'))" CHANGELOG.md + #else + sed -i "1i\- Minor bugs fixed" CHANGELOG.md + sed -i "1i\### $version ($(date '+%d-%m-%Y'))" CHANGELOG.md + #fi + fi + env: + path: "./${{ matrix.addon }}" + - name: Commit if needed + uses: EndBug/add-and-commit@v9 + with: + commit: -u + message: "GitHub bot : changelog" + default_author: github_actions diff --git a/.github/workflows/weekly_bashbeautify.yaml b/.github/workflows/weekly_bashbeautify.yaml index bb16855de..014c08998 100644 --- a/.github/workflows/weekly_bashbeautify.yaml +++ b/.github/workflows/weekly_bashbeautify.yaml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: ${{ github.head_ref }} - uses: actions/setup-python@v3 diff --git a/.github/workflows/weekly_crlftolf.yaml b/.github/workflows/weekly_crlftolf.yaml index 4e765486c..c47acec79 100644 --- a/.github/workflows/weekly_crlftolf.yaml +++ b/.github/workflows/weekly_crlftolf.yaml @@ -20,7 +20,7 @@ jobs: grep -rl '^M$' . | xargs sed 's/^M$//' shell: bash - name: Create New Pull Request If Needed - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v5 with: title: "Github bot : crlf removed" branch-suffix: timestamp diff --git a/.github/workflows/weekly_reduceimagesize.yml b/.github/workflows/weekly_reduceimagesize.yml index 821092abc..16c80d1a5 100644 --- a/.github/workflows/weekly_reduceimagesize.yml +++ b/.github/workflows/weekly_reduceimagesize.yml @@ -22,7 +22,7 @@ jobs: compressOnly: true - name: Create New Pull Request If Needed if: steps.calibre.outputs.markdown != '' - uses: peter-evans/create-pull-request@v4 + uses: peter-evans/create-pull-request@v5 with: title: "Github bot : image compressed" branch-suffix: timestamp diff --git a/.github/workflows/weekly_stats.yaml b/.github/workflows/weekly_stats.yaml index a41097e7c..a15f7dad7 100644 --- a/.github/workflows/weekly_stats.yaml +++ b/.github/workflows/weekly_stats.yaml @@ -35,7 +35,7 @@ jobs: # shellcheck disable=SC2086 for f in $( find -- * -maxdepth 0 -type d | sort -r ); do DOWNLOADS=0 - if [ -f "$f"/config.json ]; then + if [ -f "$f"/config.json ] && jq -e '.image' "$f/config.json"; then SLUG="$(jq -r '.image' "$f/config.json" | awk -F 'alexbelgium/|-{arch' '{print $2}')" if [[ "$(jq '.arch[]' "$f/config.json")" == *"armv7"* ]]; then ARCH=armv7 && COUNT="$(curl -f -s -L https://github.com/alexbelgium/hassio-addons/pkgs/container/$SLUG-$ARCH/latest | awk '/Total downloads/{getline; print}' | awk -F '<|>' '{print $3}')" @@ -99,142 +99,7 @@ jobs: - name: Commit if needed uses: EndBug/add-and-commit@v9 with: - message: "GitHub bot : README updated" - default_author: github_actions - - stats_graphs: - runs-on: ubuntu-20.04 - needs: stats_updater - steps: - - name: Checkout Repo - uses: actions/checkout@v3 - - name: Install apps - run: | - git pull --rebase origin master - sudo apt-get install gawk -y - sudo apt-get install gnuplot-nox -y - - name: Create global stats - run: | - # Prepare data - cp Stats Stats3 - # Inverse file - gawk -i inplace '{for(i=NF;i>1;i--)printf "%s ",$i;printf "%s",$1;print ""}' Stats3 - # Only totals - head -n 2 Stats3 > tmp_file && mv tmp_file Stats3 - # Transpose data - awk ' - { - for (i=1; i<=NF; i++) { - a[NR,i] = $i - } - } - NF>p { p = NF } - END { - for(j=1; j<=p; j++) { - str=a[1,j] - for(i=2; i<=NR; i++){ - str=str" "a[i,j]; - } - print str - } - }' Stats3 > StatsTmp && mv StatsTmp Stats3 - sed -i "1d" Stats3 - # Plot graph - gnuplot-nox -persist <<-EOFMarker - set title 'Total addons' - set ylabel 'Number of installations' - set xdata time - set datafile missing "-" - set timefmt "%Y-%m-%d" - set format x "%y-%m-%d" - set datafile sep ' ' - set key top left autotitle columnheader - set autoscale - set terminal png size 500,300 - set output 'stats.png' - set term png tiny - plot 'Stats3' using 1:2 lt rgb 'red' w l title 'Total addons' smooth csplines - EOFMarker - rm Stats3 - - name: Create addons stats - run: | - # Prepare data - cp Stats Stats3 - # Remove Totals - sed -i "2d" Stats3 - # Inverse file - gawk -i inplace '{for(i=NF;i>1;i--)printf "%s ",$i;printf "%s",$1;print ""}' Stats3 - # Only top 10 - head -n 11 Stats3 > tmp_file && mv tmp_file Stats3 - # Transpose data - awk ' - { - for (i=1; i<=NF; i++) { - a[NR,i] = $i - } - } - NF>p { p = NF } - END { - for(j=1; j<=p; j++) { - str=a[1,j] - for(i=2; i<=NR; i++){ - str=str" "a[i,j]; - } - print str - } - }' Stats3 > StatsTmp && mv StatsTmp Stats3 - # Add download count to names - build_list="$(head -n 1 Stats3)" - # shellcheck disable=SC2206 - build_list=($build_list) - # shellcheck disable=SC2013 - for var in "${build_list[@]:1}"; do - i=0 - j=0 - k=0 - # shellcheck disable=SC2013 - for i in $(sed -n "/${var}/p" Stats); do - k="$((k+1))" - if [ "$k" -eq 3 ]; then break; fi - if [ "$i" -eq "$i" ] && [ "$i" -gt "$j" ]; then j="$i"; fi - done - sed -i "s|${var}|${var}_(${j}x)|g" Stats3 - done - echo "... done" - # Plot graph - ( gnuplot-nox -persist <<-EOFMarker - set title 'Top 10 addons' - set ylabel 'Number of installations' - set xdata time - set datafile missing "-" - set timefmt "%Y-%m-%d" - set format x "%y-%m-%d" - set datafile sep ' ' - set autoscale - set terminal png size 500,300 - set output 'stats_addons.png' - set term png tiny - plot for [i=2:*] 'Stats3' using 1:i w l title columnhead(i) smooth csplines - EOFMarker - ) || ( gnuplot-nox -persist <<-EOFMarker - set title 'Top 10 addons' - set ylabel 'Number of installations' - set xdata time - set datafile missing "-" - set timefmt "%Y-%m-%d" - set format x "%y-%m-%d" - set datafile sep ' ' - set autoscale - set terminal png size 500,300 - set output 'stats_addons.png' - set term png tiny - plot for [i=2:*] 'Stats3' using 1:i w l title columnhead(i) - EOFMarker - ) - #plot for [i=1:*] 'Stats3' using 0:i - rm Stats3 - - name: Commit if needed - uses: EndBug/add-and-commit@v9 - with: - message: "GitHub bot : README updated" default_author: github_actions + message : "Github bot : stats updated" + Generate_graphs: + uses: ./.github/workflows/helper_stats_graphs.yaml diff --git a/.templates/.README.md b/.templates/.README.md index 492073d44..c6c90077f 100644 --- a/.templates/.README.md +++ b/.templates/.README.md @@ -16,12 +16,11 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ - -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) _Thanks to all contributors !_ -[![contributors](https://contrib.rocks/image?repo=alexbelgium/hassio-addons)](https://contrib.rocks/image?repo=alexbelgium/hassio-addons) +[![contributors](https://contrib.rocks/image?repo=alexbelgium/hassio-addons)](https://github.com/alexbelgium/hassio-addons/graphs/contributors) ## About @@ -41,24 +40,36 @@ If you want to do add the repository manually, please follow the procedure highl ## Statistics -Number of addons in the repository : %%STATS_ADDONS%% +### Number of addons -Total number of addons installed : %%STATS_DOWNLOADS%% +- In the repository : %%STATS_ADDONS%% +- Installed : %%STATS_DOWNLOADS%% + +### Top 3 -Top 3 most installed addons : 1. %%STATS_ONE%% 2. %%STATS_TWO%% 3. %%STATS_THREE%% -Most used architectures : +### Architectures used + - %%STATS_AMD64%% - %%STATS_AARCH64%% - %%STATS_ARMV7%% -Downloads evolution : +### Total downloads evolution -![Downloads graph](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/stats.png) -![Addons graph](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/stats_addons.png) + + +### Specific downloads evolution + + + +### Stars evolution + + + + ## Add-ons provided by this repository diff --git a/.templates/00-banner.sh b/.templates/00-banner.sh index aec146ed0..5c46af255 100755 --- a/.templates/00-banner.sh +++ b/.templates/00-banner.sh @@ -32,8 +32,10 @@ if bashio::supervisor.ping; then ' Please, share the above information when looking for help' bashio::log.blue \ ' or support in, e.g., GitHub, forums' + bashio::log.blue \ + '-----------------------------------------------------------' bashio::log.green \ - ' https://github.com/alexbelgium/hassio-addons' + ' Provided by: https://github.com/alexbelgium/hassio-addons ' bashio::log.blue \ '-----------------------------------------------------------' fi @@ -41,3 +43,15 @@ fi # ============================================================================== # Global actions for all addons # ============================================================================== +if bashio::config.has_value "PUID" && bashio::config.has_value "PGID"; then + bashio::log.green \ + ' Defining permissions for main user : ' + PUID="$(bashio::config "PUID")" + PGID="$(bashio::config "PGID")" + bashio::log.blue "User UID: $PUID" + bashio::log.blue "User GID : $PGID" + id -u abc &>/dev/null || usermod -o -u "$PUID" abc &>/dev/null || true + id -g abc &>/dev/null || groupmod -o -g "$PGID" abc &>/dev/null || true + bashio::log.blue \ + '-----------------------------------------------------------' +fi diff --git a/.templates/00-global_var.sh b/.templates/00-global_var.sh index 6a910dd9e..fc71d25aa 100755 --- a/.templates/00-global_var.sh +++ b/.templates/00-global_var.sh @@ -41,7 +41,11 @@ for KEYS in "${arr[@]}"; do # Export the variable to run scripts # ###################################### export "${KEYS}='${VALUE}'" - + # set .env + echo "$KEYS=$VALUE" >> /.env || true + # set /etc/environmemt + mkdir -p /etc + echo "$KEYS=$VALUE" >> /etc/environmemt # For non s6 if cat /etc/services.d/*/*run* &>/dev/null; then sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null; fi if cat /etc/cont-init.d/*run* &>/dev/null; then sed -i "1a export $line" /etc/cont-init.d/*run* 2>/dev/null; fi diff --git a/.templates/92-local_mounts.sh b/.templates/00-local_mounts.sh similarity index 67% rename from .templates/92-local_mounts.sh rename to .templates/00-local_mounts.sh index 9a4d2dd67..08c521ef4 100755 --- a/.templates/92-local_mounts.sh +++ b/.templates/00-local_mounts.sh @@ -1,6 +1,28 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash +#################### +# LIST LOCAL DISKS # +#################### + +function list_drives () { + bashio::log.info "List of available labels (@dianlight)" + bashio::log.blue "---------------------------------------------------" + #autodisks=($(lsblk -E label -n -o label | sed -r '/^\s*$/d' | grep -v hassos | grep pp)) + readarray -t autodisks < <(lsblk -E label -n -o label -i | sed -r '/^\s*$/d' | grep -v hassos) + if [ ${#autodisks[@]} -eq 0 ]; then + bashio::log.info "No Disk with labels." + else + bashio::log.info "Available Disk Labels:" + # shellcheck disable=SC2068 + for disk in ${autodisks[@]}; do + # shellcheck disable=SC2046 + bashio::log.info "\t${disk}[$(lsblk $(blkid -L "$disk") -no fstype)]" + done + fi + bashio::log.blue "---------------------------------------------------" +} + ###################### # MOUNT LOCAL SHARES # ###################### @@ -29,9 +51,9 @@ if bashio::config.has_value 'localdisks'; then # Creates dir mkdir -p /mnt/"$disk" if bashio::config.has_value 'PUID' && bashio::config.has_value 'PGID'; then - PUID="$(bashio::config 'PUID')" - PGID="$(bashio::config 'PGID')" - chown "$PUID:$PGID" /mnt/"$disk" + PUID="$(bashio::config 'PUID')" + PGID="$(bashio::config 'PGID')" + chown "$PUID:$PGID" /mnt/"$disk" fi # Install lsblk @@ -56,12 +78,6 @@ if bashio::config.has_value 'localdisks'; then options="${options},umask=000" type="ntfs" ;; - *) - if bashio::config.has_value 'PUID' && bashio::config.has_value 'PGID'; then - echo "Using PUID $(bashio::config 'PUID') and PGID $(bashio::config 'PGID')" - options="$options,uid=$(bashio::config 'PUID'),gid=$(bashio::config 'PGID')" - fi - ;; esac # Legacy mounting : mount to share if still exists (avoid breaking changes) @@ -70,7 +86,10 @@ if bashio::config.has_value 'localdisks'; then # shellcheck disable=SC2015 mount -t $type "$devpath"/"$disk" "$dirpath"/"$disk" -o $options && bashio::log.info "Success! $disk mounted to /mnt/$disk" || \ - (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk) + (bashio::log.fatal "Unable to mount local drives! Please check the name." + rmdir /mnt/$disk + list_drives + bashio::addon.stop) done fi diff --git a/.templates/92-smb_mounts.sh b/.templates/00-smb_mounts.sh similarity index 63% rename from .templates/92-smb_mounts.sh rename to .templates/00-smb_mounts.sh index 58712e18e..4862b9eb3 100755 --- a/.templates/92-smb_mounts.sh +++ b/.templates/00-smb_mounts.sh @@ -11,7 +11,7 @@ if bashio::config.has_value 'networkdisks'; then MOREDISKS=$(bashio::config 'networkdisks') CIFS_USERNAME=$(bashio::config 'cifsusername') CIFS_PASSWORD=$(bashio::config 'cifspassword') - MOUNTED=false + SMBVERS="" SECVERS="" @@ -50,34 +50,61 @@ if bashio::config.has_value 'networkdisks'; then disk="${disk//"\040"/ }" #replace \040 with diskname="${disk//\\//}" #replace \ with / diskname="${diskname##*/}" # Get only last part of the name + MOUNTED=false # Data validation if [[ ! $disk =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then bashio::log.fatal "The structure of your \"networkdisks\" option : \"$disk\" doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2. If you don't use it, you can simply remove the text, this will avoid this error message in the future." - exit 0 + break + fi + + # Does server exists + server="$(echo "$disk" | grep -E -o "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")" + if [ -f /usr/bin/ping ]; then + ping "$server" >/dev/null || \ + bashio::log.fatal "Your server $server from $disk doesn't ping, is it correct?" + break fi # Prepare mount point mkdir -p /mnt/"$diskname" chown -R root:root /mnt/"$diskname" - # Tries to mount with default options - # shellcheck disable=SC2140 - mount -t cifs -o rw,username="$CIFS_USERNAME",password="$CIFS_PASSWORD$DOMAIN$PUID$PGID" "$disk" /mnt/"$diskname" 2>ERRORCODE && MOUNTED=true || MOUNTED=false - # if Fail test different smb and sec versions if [ "$MOUNTED" = false ]; then - for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",domain=${DOMAIN:-WORKGROUP}" ",noserverino"; do - mount -t cifs -o "rw,file_mode=0775,dir_mode=0775,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$PUID$PGID" "$disk" /mnt/"$diskname" 2>/dev/null && MOUNTED=true && break || MOUNTED=false - for SECVERS in ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8" ",noserverino"; do - mount -t cifs -o "rw,file_mode=0775,dir_mode=0775,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS$PUID$PGID" "$disk" /mnt/"$diskname" 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false - done - done - fi - # if Fail test without PUID and PGID - if [ "$MOUNTED" = false ]; then - mount -t cifs -o rw,username="$CIFS_USERNAME",password="${CIFS_PASSWORD}" "$disk" /mnt/"$diskname" && MOUNTED=true || MOUNTED=false + # Test with domain, remove otherwise + #################################### + for DOMAINVAR in "$DOMAIN" ",domain=WORKGROUP" ""; do + + # Test with PUIDPGID, remove otherwise + ###################################### + for PUIDPGID in "$PUID$PGID" "$PUID$PGID,forceuid,forcegid" ""; do + + # Test with iocharset utf8, remove otherwise + ############################################ + for CHARSET in ",iocharset=utf8" ""; do + + # Test with different SMB versions + ################################## + for SMBVERS in "" ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs"; do + + # Test with different security versions + ####################################### + for SECVERS in "" ",sec=ntlm" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=krb5i" ",sec=krb5"; do + if [ "$MOUNTED" = false ]; then + mount -t cifs -o "rw,file_mode=0775,dir_mode=0775,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS$PUIDPGID$CHARSET$DOMAINVAR" "$disk" /mnt/"$diskname" 2>/dev/null \ + && MOUNTED=true && MOUNTOPTIONS="$SMBVERS$SECVERS$PUIDPGID$CHARSET$DOMAINVAR" || MOUNTED=false + fi + done + + done + + done + + done + + done fi # Messages @@ -85,13 +112,13 @@ if bashio::config.has_value 'networkdisks'; then #Test write permissions # shellcheck disable=SC2015 touch "/mnt/$diskname/testaze" && rm "/mnt/$diskname/testaze" && - bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" || + bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $MOUNTOPTIONS" || bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw" # Test for serverino # shellcheck disable=SC2015 touch "/mnt/$diskname/testaze" && mv "/mnt/$diskname/testaze" "/mnt/$diskname/testaze2" && rm "/mnt/$diskname/testaze2" || - (umount "/mnt/$diskname" && mount -t cifs -o "rw,file_mode=0775,dir_mode=0775,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS,noserverino" "$disk" /mnt/"$diskname" && bashio::log.warning "noserverino option used") + (umount "/mnt/$diskname" && mount -t cifs -o "iocharset=utf8,rw,file_mode=0775,dir_mode=0775,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$MOUNTOPTIONS,noserverino" "$disk" /mnt/"$diskname" && bashio::log.warning "noserverino option used") else # Mounting failed messages @@ -117,6 +144,9 @@ if bashio::config.has_value 'networkdisks'; then done - if [ -f ERRORCODE ]; then rm ERRORCODE*; fi + if [ -f ERRORCODE ]; then + rm ERRORCODE* + + fi fi diff --git a/.templates/01-custom_script.sh b/.templates/01-custom_script.sh index 9b77fc363..28ddbadfd 100755 --- a/.templates/01-custom_script.sh +++ b/.templates/01-custom_script.sh @@ -14,6 +14,8 @@ fi # Execute scripts if [ -f /config/addons_autoscripts/"${slug}".sh ]; then bashio::log.info "... script found, executing" + # Convert scripts to linux + dos2unix /config/addons_autoscripts/"${slug}".sh chmod +x /config/addons_autoscripts/"${slug}".sh /./config/addons_autoscripts/"${slug}".sh else diff --git a/.templates/90-config_yaml.sh b/.templates/90-config_yaml.sh index 1ad3852e9..28d80f84d 100755 --- a/.templates/90-config_yaml.sh +++ b/.templates/90-config_yaml.sh @@ -112,12 +112,9 @@ while IFS= read -r line; do # Data validation if [[ "$line" =~ ^.+[=].+$ ]]; then export "$line" - # Export to scripts - sed -i "1a export $line" /etc/services.d/*/*run* 2>/dev/null || true - sed -i "1a export $line" /etc/cont-init.d/*run* 2>/dev/null || true - sed -i "1a export $line" /scripts/*run* 2>/dev/null || true - # Export to s6 - if [ -d /var/run/s6/container_environment ]; then printf "%s" "${VALUE}" > /var/run/s6/container_environment/"${KEYS}"; fi + # extract keys and values + KEYS="${line%%=*}" + VALUE="${line#*=}" # export to python if command -v "python3" &>/dev/null; then [ ! -f /env.py ] && echo "import os" > /env.py @@ -125,21 +122,19 @@ while IFS= read -r line; do python3 /env.py fi # set .env - echo "$line" >> /.env || true + echo "$KEYS=$VALUE" >> /.env || true mkdir -p /etc - echo "$line" >> /etc/environmemt + echo "$KEYS=$VALUE" >> /etc/environmemt + # Export to scripts + sed -i "1a export $KEYS=\'$VALUE\'" /etc/services.d/*/*run* 2>/dev/null || true + sed -i "1a export $KEYS=\'$VALUE\'" /etc/cont-init.d/*run* 2>/dev/null || true + sed -i "1a export $KEYS=\'$VALUE\'" /scripts/*run* 2>/dev/null || true + # Export to s6 + if [ -d /var/run/s6/container_environment ]; then printf "%s" "${VALUE}" > /var/run/s6/container_environment/"${KEYS}"; fi # Show in log - if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi + if ! bashio::config.false "verbose"; then bashio::log.blue "$KEYS=\'$VALUE\'"; fi else bashio::exit.nok "$line does not follow the correct structure. Please check your yaml file." fi done <"/tmpfile" -# Test mode -TZ=$(bashio::config "TZ") -if [ "$TZ" = "test" ]; then - echo "secret mode found, launching script in /config/test.sh" - cd /config || exit - chmod 777 test.sh - ./test.sh -fi diff --git a/.templates/automatic_packages.sh b/.templates/automatic_packages.sh index 1151fa007..b21b2bef6 100755 --- a/.templates/automatic_packages.sh +++ b/.templates/automatic_packages.sh @@ -68,6 +68,14 @@ for files in "/etc/cont-init.d" "/etc/services.d"; do #[ "$PACKMANAGER" = "pacman" ] && PACKAGES="$PACKAGES ntfs-3g" fi + COMMAND="ping" + if grep -q -rnw "$files/" -e "$COMMAND" && ! command -v $COMMAND &>/dev/null; then + [ "$VERBOSE" = true ] && echo "$COMMAND required" + [ "$PACKMANAGER" = "apk" ] && PACKAGES="$PACKAGES iputils" + [ "$PACKMANAGER" = "apt" ] && PACKAGES="$PACKAGES iputils-ping" + #[ "$PACKMANAGER" = "pacman" ] && PACKAGES="$PACKAGES iputils" + fi + COMMAND="cifs" if grep -q -rnw "$files/" -e "$COMMAND" && ! command -v $COMMAND &>/dev/null; then [ "$VERBOSE" = true ] && echo "$COMMAND required" @@ -190,6 +198,12 @@ fi # INSTALL MANUAL APPS # ####################### +# Install micro texteditor +curl https://getmic.ro | bash +mv micro /usr/bin +micro -plugin install bounce +micro -plugin install filemanager + for files in "/etc/services.d" "/etc/cont-init.d"; do # Next directory if does not exists diff --git a/README.md b/README.md index a5e2eea5f..fe919557d 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,11 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ - -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) _Thanks to all contributors !_ -[![contributors](https://contrib.rocks/image?repo=alexbelgium/hassio-addons)](https://contrib.rocks/image?repo=alexbelgium/hassio-addons) +[![contributors](https://contrib.rocks/image?repo=alexbelgium/hassio-addons)](https://github.com/alexbelgium/hassio-addons/graphs/contributors) ## About @@ -41,24 +40,36 @@ If you want to do add the repository manually, please follow the procedure highl ## Statistics -Number of addons in the repository : 75 +### Number of addons -Total number of addons installed : 13610 +- In the repository : 78 +- Installed : 19253 -Top 3 most installed addons : -1. Portainer (3080x) -2. Filebrowser (2036x) -3. Myelectricaldata (416x) +### Top 3 -Most used architectures : -- amd64: 58% +1. Portainer (3527x) +2. Filebrowser (3498x) +3. Myelectricaldata (803x) + +### Architectures used + +- amd64: 59% - aarch64: 38% -- armv7: 5% +- armv7: 4% -Downloads evolution : +### Total downloads evolution -![Downloads graph](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/stats.png) -![Addons graph](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/stats_addons.png) + + +### Specific downloads evolution + + + +### Stars evolution + + + + ## Add-ons provided by this repository @@ -71,6 +82,17 @@ Downloads evolution : ![amd64][amd64-badge] ![armv7][armv7-badge] +✓ ![image](https://api.iconify.design/mdi/television-classic.svg) [Autobrr](autobrr/) : Automation for downloads + +  ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fautobrr%2Fconfig.json) +![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fautobrr%2Fupdater.json) +![aarch64][aarch64-badge] +![amd64][amd64-badge] +![armv7][armv7-badge] +![ingress][ingress-badge] +![smb][smb-badge] +![localdisks][localdisks-badge] + ✓ [Baikal](baikal/) : Baïkal is a Calendar+Contacts server   ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fbaikal%2Fconfig.json) @@ -89,6 +111,15 @@ Downloads evolution : ![smb][smb-badge] ![localdisks][localdisks-badge] +✓ ![image](https://api.iconify.design/mdi/bitcoin.svg) [Binance Trading Bot](binance-trading-bot/) : Automated Binance trading bot - Trade multiple cryptocurrencies. Buy low/sell high with Grid Trading. Integrated with TradingView technical analysis + +  ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fbinance-trading-bot%2Fconfig.json) +![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fbinance-trading-bot%2Fupdater.json) +![aarch64][aarch64-badge] +![amd64][amd64-badge] +![armv7no][armv7no-badge] +![ingress][ingress-badge] + ✓ [Booksonic-air](booksonic_air/) : platform for accessing the audibooks you own wherever you are   ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fbooksonic_air%2Fconfig.json) @@ -113,7 +144,7 @@ Downloads evolution : ![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fcalibre%2Fupdater.json) ![aarch64][aarch64-badge] ![amd64][amd64-badge] -![armv7][armv7-badge] +![armv7no][armv7no-badge] ![ingress][ingress-badge] ![smb][smb-badge] ![localdisks][localdisks-badge] @@ -176,7 +207,7 @@ Downloads evolution : ![amd64][amd64-badge] ![armv7no][armv7no-badge] -✓ ![image](https://api.iconify.design/mdi/file-search.svg) [Filebrowser (2036x)](filebrowser/) : filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files +✓ ![image](https://api.iconify.design/mdi/file-search.svg) [Filebrowser (3498x)](filebrowser/) : filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files   ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Ffilebrowser%2Fconfig.json) ![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Ffilebrowser%2Fupdater.json) @@ -488,7 +519,7 @@ Downloads evolution : ![amd64][amd64-badge] ![armv7][armv7-badge] -✓ ![image](https://api.iconify.design/mdi/docker.svg) [Portainer (3080x)](portainer/) : Manage your Docker environment with ease +✓ ![image](https://api.iconify.design/mdi/docker.svg) [Portainer (3527x)](portainer/) : Manage your Docker environment with ease   ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fportainer%2Fconfig.json) ![Update](https://img.shields.io/badge/dynamic/json?label=Updated&query=%24.last_update&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fportainer%2Fupdater.json) @@ -617,6 +648,13 @@ Downloads evolution : ![smb][smb-badge] ![localdisks][localdisks-badge] +✓ [Sponsorblockcast](sponsorblockcast/) : skips sponsored YouTube content on all local Chromecasts + +  ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fsponsorblockcast%2Fconfig.json) +![aarch64][aarch64-badge] +![amd64][amd64-badge] +![armv7][armv7-badge] + ✓ ![image](https://api.iconify.design/mdi/chart-timeline.svg) [Spotweb](spotweb/) : Spotweb is a decentralized usenet community based on the Spotnet protocol   ![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fspotweb%2Fconfig.json) diff --git a/Stats b/Stats index 6b4a09b47..e65f8a2b9 100644 --- a/Stats +++ b/Stats @@ -1,75 +1,78 @@ -2023-02-17 2023-02-10 2023-02-03 2023-01-27 2023-01-21 2023-01-13 2023-01-06 2022-12-30 2022-12-24 2022-12-16 2022-12-09 2022-12-08 Date -13610 14133 12886 12065 11500 10919 9777 7647 7966 4937 3908 3691 TOTAL -2366 3080 2786 2538 2238 1987 1630 1327 1176 847 588 555 portainer -1569 2036 1730 1356 1359 1359 1070 888 727 477 285 264 filebrowser -416 365 279 254 504 397 403 272 289 35 59 39 myelectricaldata -404 373 368 328 276 192 142 7 90 53 38 35 mealie -374 437 353 493 407 393 377 98 359 91 321 313 epicgamesfree -364 340 340 325 323 323 337 312 407 266 240 225 qbittorrent -339 300 287 251 207 169 163 144 110 68 47 47 fireflyiii -316 429 325 238 468 468 405 328 283 193 124 94 nextcloud_ocr -277 270 243 225 193 164 139 109 97 61 43 40 browserless_chrome -262 268 268 251 193 193 225 172 181 156 201 196 jellyfin -243 201 170 122 188 144 176 150 131 91 59 57 guacamole -243 192 192 217 146 146 121 90 88 55 37 35 sonarr_nas -241 221 198 168 148 125 102 87 80 45 21 19 addons_updater -235 191 186 208 200 200 128 95 91 47 31 29 radarr_nas -225 281 231 243 288 288 237 181 298 226 195 195 plex_nas -218 193 183 168 142 126 98 88 75 39 30 29 arpspoof -202 333 260 277 254 254 294 218 282 205 204 195 transmission_ls -199 180 168 148 135 119 97 82 72 41 32 29 whoogle-search -176 148 152 108 134 134 123 84 104 57 86 80 paperless_ng -171 157 148 134 110 100 85 78 70 37 25 22 organizr -166 152 133 123 108 98 80 66 51 23 15 14 xteve -161 123 107 85 150 150 145 127 99 60 72 66 emby -155 124 112 127 115 115 125 98 112 86 107 69 calibre -150 150 136 113 91 89 71 43 60 38 22 20 scrutiny-fa -148 151 120 138 129 129 120 114 142 100 114 113 prowlarr -143 132 184 157 93 114 94 73 52 44 34 32 tandoor_recipes -140 133 119 103 80 64 50 39 26 7 4 4 vaultwarden -140 117 90 72 145 145 126 80 97 67 54 54 transmission_openvpn -139 121 98 75 155 155 134 110 95 82 17 17 code_server -138 131 119 111 89 75 65 55 46 29 17 15 wger -135 114 107 114 102 102 87 72 61 33 22 20 cloudcommander -134 140 111 129 118 118 94 106 136 104 95 95 jackett_nas -132 122 118 104 85 76 67 56 49 24 20 18 baikal -127 112 97 74 81 81 67 48 84 58 58 58 scrutiny -126 96 91 87 143 143 121 112 103 78 81 81 photoprism -121 148 113 223 174 119 117 123 104 45 19 14 zoneminder -120 110 99 91 68 65 53 42 35 16 11 9 papermerge -119 102 103 150 132 119 99 73 64 33 27 27 overseerr -118 103 84 83 77 73 62 51 47 23 16 15 fireflyiii_data_importer -117 112 100 90 70 56 44 39 34 11 7 6 flaresolverr -117 108 92 89 68 53 47 38 29 13 7 7 gazpar2mqtt -117 107 93 80 84 84 49 103 98 75 69 68 bazarr -113 118 152 127 122 122 120 86 122 79 67 65 webtop_kde -109 100 94 72 62 62 76 61 84 57 50 50 nzbget -104 89 87 82 64 52 46 43 37 19 13 13 teamspeak -96 159 149 130 105 85 69 74 81 48 24 23 joplin -87 81 73 65 50 40 39 30 24 9 4 4 ombi -87 73 72 65 45 38 55 48 43 21 10 9 grav -86 78 72 69 52 47 45 31 31 13 7 7 elasticsearch -82 75 79 84 127 105 93 88 78 53 51 51 omada -79 78 74 71 59 46 40 34 29 12 7 7 inadyn -79 72 63 53 39 57 38 45 32 21 14 12 gitea -70 63 56 46 29 25 55 49 45 27 23 22 spotweb -67 61 56 51 29 29 20 8 44 28 26 26 webtrees -67 58 43 65 58 58 52 42 68 51 45 44 lidarr_nas -60 48 54 62 52 52 43 39 65 49 42 41 readarr_nas -56 49 44 37 68 68 57 41 37 19 10 9 ubooquity -55 51 50 48 34 33 31 32 32 20 18 18 joal -55 51 43 37 44 44 40 31 30 12 8 7 tdarr -55 45 39 31 37 37 19 11 28 12 10 8 resiliosync -53 44 37 56 59 45 42 33 63 33 32 31 plex-media-manager -51 49 45 41 28 24 25 22 18 4 1 1 requestrr -41 39 33 29 20 16 8 24 18 5 7 7 fireflyiii_fints_importer -38 34 19 25 61 61 50 49 43 21 17 17 seafile -38 32 23 26 32 32 22 19 53 33 27 26 piwigo -31 36 26 37 30 23 20 24 38 22 26 26 flexget -29 22 29 28 2 2 0 - - - - - immich -27 23 21 20 25 25 24 22 19 6 3 3 mylar3 -23 66 10 86 22 22 73 72 81 69 73 69 calibre_web -22 23 17 25 32 32 21 22 20 11 9 9 unpackerr -19 17 14 27 43 38 34 30 24 7 13 11 omada_v3 -17 20 17 22 69 62 41 28 45 18 7 5 myelectricaldata_dev -11 7 2 - - - - - - - - - sabnzbd +2023-04-07 2023-03-31 2023-03-24 2023-03-17 2023-03-10 2023-03-03 2023-02-24 2023-02-17 2023-02-10 2023-02-03 2023-01-27 2023-01-21 2023-01-13 2023-01-06 2022-12-30 2022-12-24 2022-12-16 2022-12-09 2022-12-08 Date +19253 18223 18044 16127 15701 14436 13970 13610 14133 12886 12065 11500 10919 9777 7647 7966 4937 3908 3691 TOTAL +3527 3207 2848 2476 2542 2400 2836 2366 3080 2786 2538 2238 1987 1630 1327 1176 847 588 555 portainer +3498 3263 3035 2810 2532 2229 1960 1569 2036 1730 1356 1359 1359 1070 888 727 477 285 264 filebrowser +803 755 709 672 607 450 490 416 365 279 254 504 397 403 272 289 35 59 39 myelectricaldata +606 588 562 542 501 465 434 404 373 368 328 276 192 142 7 90 53 38 35 mealie +561 472 692 642 565 495 397 374 437 353 493 407 393 377 98 359 91 321 313 epicgamesfree +556 461 359 363 504 363 293 364 340 340 325 323 323 337 312 407 266 240 225 qbittorrent +353 291 331 285 274 254 173 262 268 268 251 193 193 225 172 181 156 201 196 jellyfin +322 301 262 236 202 158 111 176 148 152 108 134 134 123 84 104 57 86 80 paperless_ng +322 281 250 86 290 257 222 235 191 186 208 200 200 128 95 91 47 31 29 radarr_nas +320 283 247 246 288 248 191 243 192 192 217 146 146 121 90 88 55 37 35 sonarr_nas +306 282 232 284 228 298 268 243 201 170 122 188 144 176 150 131 91 59 57 guacamole +300 289 277 262 252 240 227 218 193 183 168 142 126 98 88 75 39 30 29 arpspoof +298 299 359 394 249 365 269 316 429 325 238 468 468 405 328 283 193 124 94 nextcloud_ocr +266 256 237 225 203 184 171 150 150 136 113 91 89 71 43 60 38 22 20 scrutiny-fa +263 249 240 231 214 200 190 171 157 148 134 110 100 85 78 70 37 25 22 organizr +261 246 225 214 112 170 152 126 96 91 87 143 143 121 112 103 78 81 81 photoprism +259 251 240 232 218 216 204 199 180 168 148 135 119 97 82 72 41 32 29 whoogle-search +254 307 243 252 236 226 196 225 281 231 243 288 288 237 181 298 226 195 195 plex_nas +249 224 215 226 214 395 371 339 300 287 251 207 169 163 144 110 68 47 47 fireflyiii +245 233 216 204 183 162 148 140 117 90 72 145 145 126 80 97 67 54 54 transmission_openvpn +238 231 219 210 195 189 179 166 152 133 123 108 98 80 66 51 23 15 14 xteve +213 221 274 203 206 277 145 202 333 260 277 254 254 294 218 282 205 204 195 transmission_ls +212 178 144 121 76 188 170 121 148 113 223 174 119 117 123 104 45 19 14 zoneminder +196 186 180 171 145 144 133 119 102 103 150 132 119 99 73 64 33 27 27 overseerr +194 169 139 200 167 150 123 143 132 184 157 93 114 94 73 52 44 34 32 tandoor_recipes +190 183 171 165 154 149 143 132 122 118 104 85 76 67 56 49 24 20 18 baikal +171 169 161 159 154 148 110 134 140 111 129 118 118 94 106 136 104 95 95 jackett_nas +170 168 173 168 157 146 123 148 151 120 138 129 129 120 114 142 100 114 113 prowlarr +170 166 158 153 138 126 114 104 89 87 82 64 52 46 43 37 19 13 13 teamspeak +161 186 150 145 86 127 83 155 124 112 127 115 115 125 98 112 86 107 69 calibre +158 144 132 119 103 81 130 127 112 97 74 81 81 67 48 84 58 58 58 scrutiny +155 138 121 88 303 282 266 241 221 198 168 148 125 102 87 80 45 21 19 addons_updater +154 150 146 138 129 115 112 109 100 94 72 62 62 76 61 84 57 50 50 nzbget +147 114 147 130 184 179 157 135 114 107 114 102 102 87 72 61 33 22 20 cloudcommander +143 139 133 123 105 83 125 117 108 92 89 68 53 47 38 29 13 7 7 gazpar2mqtt +140 143 130 137 156 125 97 113 118 152 127 122 122 120 86 122 79 67 65 webtop_kde +140 119 88 98 146 119 104 139 121 98 75 155 155 134 110 95 82 17 17 code_server +138 120 104 108 150 133 116 96 159 149 130 105 85 69 74 81 48 24 23 joplin +132 122 117 106 98 127 120 117 107 93 80 84 84 49 103 98 75 69 68 bazarr +120 114 109 104 98 91 86 79 78 74 71 59 46 40 34 29 12 7 7 inadyn +117 108 94 83 76 61 57 55 45 39 31 37 37 19 11 28 12 10 8 resiliosync +109 95 79 119 92 66 42 277 270 243 225 193 164 139 109 97 61 43 40 browserless_chrome +107 94 84 101 105 88 51 23 66 10 86 22 22 73 72 81 69 73 69 calibre_web +106 98 89 82 71 67 62 56 49 44 37 68 68 57 41 37 19 10 9 ubooquity +106 101 97 90 84 74 64 67 61 56 51 29 29 20 8 44 28 26 26 webtrees +105 286 266 248 221 200 179 161 123 107 85 150 150 145 127 99 60 72 66 emby +105 103 97 108 95 115 76 82 75 79 84 127 105 93 88 78 53 51 51 omada +99 86 95 177 156 131 132 118 103 84 83 77 73 62 51 47 23 16 15 fireflyiii_data_importer +88 84 80 73 59 93 92 87 81 73 65 50 40 39 30 24 9 4 4 ombi +88 100 94 82 146 138 128 117 112 100 90 70 56 44 39 34 11 7 6 flaresolverr +87 78 72 69 63 54 28 17 20 17 22 69 62 41 28 45 18 7 5 myelectricaldata_dev +76 74 71 67 63 61 55 55 51 50 48 34 33 31 32 32 20 18 18 joal +76 66 52 43 169 153 143 138 131 119 111 89 75 65 55 46 29 17 15 wger +74 54 35 14 - - - - - - - - - - - - - - - sponsorblockcast +69 62 94 87 74 59 45 79 72 63 53 39 57 38 45 32 21 14 12 gitea +64 75 69 60 60 62 50 67 58 43 65 58 58 52 42 68 51 45 44 lidarr_nas +64 63 60 60 58 55 52 51 49 45 41 28 24 25 22 18 4 1 1 requestrr +63 60 58 55 50 47 45 41 39 33 29 20 16 8 24 18 5 7 7 fireflyiii_fints_importer +59 54 51 41 31 27 79 70 63 56 46 29 25 55 49 45 27 23 22 spotweb +59 54 49 41 26 90 85 86 78 72 69 52 47 45 31 31 13 7 7 elasticsearch +59 47 39 35 25 17 15 38 32 23 26 32 32 22 19 53 33 27 26 piwigo +58 56 71 65 60 59 49 60 48 54 62 52 52 43 39 65 49 42 41 readarr_nas +58 53 70 60 48 21 23 29 22 29 28 2 2 0 - - - - - immich +55 46 42 37 29 22 26 55 51 43 37 44 44 40 31 30 12 8 7 tdarr +51 207 193 186 167 160 149 140 133 119 103 80 64 50 39 26 7 4 4 vaultwarden +49 35 39 31 17 9 - - - - - - - - - - - - - binance_trading_bot +45 32 38 32 33 32 30 31 36 26 37 30 23 20 24 38 22 26 26 flexget +44 41 55 53 47 51 44 53 44 37 56 59 45 42 33 63 33 32 31 plex-media-manager +35 30 13 9 42 27 98 87 73 72 65 45 38 55 48 43 21 10 9 grav +34 32 54 46 38 29 22 38 34 19 25 61 61 50 49 43 21 17 17 seafile +33 28 31 27 23 20 16 11 7 2 - - - - - - - - - sabnzbd +31 31 31 31 31 30 30 120 110 99 91 68 65 53 42 35 16 11 9 papermerge +27 36 35 28 21 29 26 22 23 17 25 32 32 21 22 20 11 9 9 unpackerr +17 17 46 43 40 34 28 27 23 21 20 25 25 24 22 19 6 3 3 mylar3 +14 22 13 1 - - - - - - - - - - - - - - - autobrr +11 17 13 15 17 17 10 19 17 14 27 43 38 34 30 24 7 13 11 omada_v3 diff --git a/Stats2 b/Stats2 index bddbebb47..49d132f1f 100644 --- a/Stats2 +++ b/Stats2 @@ -1,76 +1,79 @@ Name Total armv7 amd64 aarch64 ------------------------------ -zoneminder 121 3 85 33 -xteve 166 13 94 59 -whoogle-search 199 7 127 65 -wger 138 - 81 57 -webtrees 67 4 34 29 -webtop_kde 113 1 82 30 -unpackerr 22 - 16 6 -ubooquity 56 5 32 19 -transmission_openvpn 140 7 77 56 -transmission_ls 202 4 121 77 -teamspeak 104 8 60 36 -tdarr 55 4 36 15 -tandoor_recipes 143 6 82 55 -spotweb 70 4 43 23 -sonarr_nas 243 9 155 79 -seafile 38 10 19 9 -scrutiny-fa 150 - 87 63 -scrutiny 127 - 86 41 -sabnzbd 11 0 8 3 -resiliosync 55 7 27 21 -requestrr 51 8 27 16 -readarr_nas 60 2 42 16 -radarr_nas 235 6 150 79 -qbittorrent 364 11 200 153 -prowlarr 148 3 100 45 -portainer 2366 130 1353 883 -plex-media-manager 53 0 38 15 -plex_nas 225 9 135 81 -piwigo 38 3 17 18 -photoprism 126 - 89 37 -papermerge 120 10 59 51 -paperless_ng 176 6 103 67 -overseerr 119 3 82 34 -organizr 171 10 101 60 -ombi 87 9 49 29 -omada_v3 19 - 12 7 -omada 82 - 46 36 -nzbget 109 8 55 46 -nextcloud_ocr 316 8 168 140 -mylar3 27 4 13 10 -mealie 404 - 254 150 -lidarr_nas 67 1 44 22 -joplin 96 5 59 32 -joal 55 9 22 24 -jellyfin 262 10 149 103 -jackett_nas 134 4 90 40 -inadyn 79 8 40 31 -immich 29 18 11 -guacamole 243 - 182 61 -grav 87 6 53 28 -gitea 79 - 37 42 -gazpar2mqtt 117 12 53 52 -flexget 31 0 18 13 -flaresolverr 117 7 58 52 -fireflyiii_fints_importer 41 - 23 18 -fireflyiii_data_importer 118 0 61 57 -fireflyiii 339 15 187 137 -filebrowser 1569 67 819 683 -epicgamesfree 374 - 241 133 -myelectricaldata_dev 17 4 10 3 -myelectricaldata 416 35 187 194 -emby 161 7 91 63 -elasticsearch 86 - 51 35 -code_server 139 18 65 56 -cloudcommander 135 5 80 50 -calibre_web 23 0 16 7 -calibre 155 4 84 67 -browserless_chrome 277 - 184 93 -calibre_web 23 0 16 7 -vaultwarden 140 9 80 51 -bazarr 117 6 74 37 -baikal 132 10 76 46 -arpspoof 218 17 121 80 -addons_updater 241 15 123 103 +zoneminder 212 6 137 69 +xteve 238 16 146 76 +whoogle-search 259 11 169 79 +wger 76 - 49 27 +webtrees 106 4 65 37 +webtop_kde 140 0 107 33 +unpackerr 27 - 17 10 +ubooquity 106 7 66 33 +transmission_openvpn 245 9 130 106 +transmission_ls 213 9 113 91 +teamspeak 170 11 94 65 +tdarr 55 0 37 18 +tandoor_recipes 194 8 117 69 +spotweb 59 1 35 23 +sponsorblockcast 74 0 46 28 +sonarr_nas 320 4 206 110 +seafile 34 10 16 8 +scrutiny-fa 266 - 165 101 +scrutiny 158 - 105 53 +sabnzbd 33 0 27 6 +resiliosync 117 7 66 44 +requestrr 64 8 38 18 +readarr_nas 58 2 35 21 +radarr_nas 322 5 215 102 +qbittorrent 556 16 329 211 +prowlarr 170 5 105 60 +portainer 3527 166 2029 1332 +plex-media-manager 44 0 31 13 +plex_nas 254 13 146 95 +piwigo 59 1 33 25 +photoprism 261 - 176 85 +papermerge 31 1 24 6 +paperless_ng 322 7 207 108 +overseerr 196 4 133 59 +organizr 263 10 167 86 +ombi 88 1 56 31 +omada_v3 11 - 7 4 +omada 105 - 70 35 +nzbget 154 9 80 65 +nextcloud_ocr 298 10 174 114 +mylar3 17 0 15 2 +mealie 606 - 376 230 +lidarr_nas 64 1 42 21 +joplin 138 5 85 48 +joal 76 9 30 37 +jellyfin 353 11 204 138 +jackett_nas 171 1 115 55 +inadyn 120 11 66 43 +immich 58 - 33 25 +guacamole 306 - 223 83 +grav 35 0 27 8 +gitea 69 - 41 28 +gazpar2mqtt 143 11 60 72 +flexget 45 1 22 22 +flaresolverr 88 3 50 35 +fireflyiii_fints_importer 63 - 33 30 +fireflyiii_data_importer 99 1 54 44 +fireflyiii 249 9 137 103 +filebrowser 3498 126 1903 1469 +epicgamesfree 561 - 371 190 +myelectricaldata_dev 87 6 46 35 +myelectricaldata 803 63 374 366 +emby 105 2 62 41 +elasticsearch 59 - 36 23 +code_server 140 12 76 52 +cloudcommander 147 5 94 48 +calibre_web 107 4 55 48 +calibre 161 5 87 69 +browserless_chrome 109 - 78 31 +calibre_web 107 4 55 48 +vaultwarden 51 4 26 21 +binance_trading_bot 49 - 30 19 +bazarr 132 3 89 40 +baikal 190 12 114 64 +autobrr 14 0 6 8 +arpspoof 300 18 172 110 +addons_updater 155 6 100 49 diff --git a/addons_updater/CHANGELOG.md b/addons_updater/CHANGELOG.md index eed9f5a90..87e4ff9db 100644 --- a/addons_updater/CHANGELOG.md +++ b/addons_updater/CHANGELOG.md @@ -1,3 +1,8 @@ +## 3.10 +- Add dry run mode (test but does not commit) + +## 3.9.9 +- Add mode - WARNING : update to supervisor 2022.11 before installing - Fix : dockerhub_list_size corrected - New dockerhub_list_size tag for dockerhub diff --git a/addons_updater/Dockerfile b/addons_updater/Dockerfile index c32493d65..fa82862dc 100644 --- a/addons_updater/Dockerfile +++ b/addons_updater/Dockerfile @@ -104,3 +104,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/addons_updater/README.md b/addons_updater/README.md index c7b382a0e..708bea361 100644 --- a/addons_updater/README.md +++ b/addons_updater/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/addons_updater/stats.png) ## About diff --git a/addons_updater/config.json b/addons_updater/config.json index 5e73e015f..27e90eb95 100644 --- a/addons_updater/config.json +++ b/addons_updater/config.json @@ -19,6 +19,7 @@ "repository": "alexbelgium/hassio-addons" }, "schema": { + "dry_run": "bool?", "gitapi": "str?", "gitmail": "str?", "gitpass": "str", @@ -29,5 +30,5 @@ "slug": "updater", "startup": "once", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/addons_updater", - "version": "3.9.9" + "version": "3.14" } diff --git a/addons_updater/rootfs/entrypoint.sh b/addons_updater/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/addons_updater/rootfs/entrypoint.sh +++ b/addons_updater/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/addons_updater/rootfs/etc/cont-init.d/99-run.sh b/addons_updater/rootfs/etc/cont-init.d/99-run.sh index 2c6904a61..e16811735 100755 --- a/addons_updater/rootfs/etc/cont-init.d/99-run.sh +++ b/addons_updater/rootfs/etc/cont-init.d/99-run.sh @@ -7,6 +7,10 @@ bashio::log.info "Starting $(lastversion --version)" +if bashio::config.true "dry_run"; then + bashio::log.warning "Dry run mode : on" +fi + bashio::log.info "Checking status of referenced repositoriess..." VERBOSE=$(bashio::config 'verbose') @@ -39,8 +43,8 @@ if [ ! -d "/data/$BASENAME" ]; then else LOGINFO="... updating ${REPOSITORY}" && if [ "$VERBOSE" = true ]; then bashio::log.info "$LOGINFO"; fi cd "/data/$BASENAME" || exit - git pull --rebase >/dev/null || git reset --hard >/dev/null - git pull --rebase >/dev/null + git pull --rebase origin >/dev/null || git reset --hard origin/master >/dev/null + git pull --rebase origin >/dev/null fi LOGINFO="... parse addons" && if [ "$VERBOSE" = true ]; then bashio::log.info "$LOGINFO"; fi @@ -225,7 +229,9 @@ for f in */; do fi # Push - git push &>/dev/null + if ! bashio::config.true "dry_run"; then + git push &>/dev/null + fi #Log bashio::log.yellow "... $SLUG updated from ${CURRENT} to ${LASTVERSION}" diff --git a/addons_updater/stats.png b/addons_updater/stats.png new file mode 100644 index 000000000..f3735f9ba Binary files /dev/null and b/addons_updater/stats.png differ diff --git a/addons_updater/translations/en.yaml b/addons_updater/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/addons_updater/translations/en.yaml +++ b/addons_updater/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/arpspoof/CHANGELOG.md b/arpspoof/CHANGELOG.md index 279e4f0fb..ebf5f62d0 100644 --- a/arpspoof/CHANGELOG.md +++ b/arpspoof/CHANGELOG.md @@ -1,3 +1,4 @@ +- Implemented healthcheck - WARNING : update to supervisor 2022.11 before installing - Add codenotary sign - New standardized logic for Dockerfile build and packages installation diff --git a/arpspoof/Dockerfile b/arpspoof/Dockerfile index dcbeb5502..98f821984 100644 --- a/arpspoof/Dockerfile +++ b/arpspoof/Dockerfile @@ -100,3 +100,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="7022" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/arpspoof/README.md b/arpspoof/README.md index 16d7744ed..4b86e9527 100644 --- a/arpspoof/README.md +++ b/arpspoof/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/arpspoof/stats.png) ## About diff --git a/arpspoof/rootfs/entrypoint.sh b/arpspoof/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/arpspoof/rootfs/entrypoint.sh +++ b/arpspoof/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/arpspoof/stats.png b/arpspoof/stats.png new file mode 100644 index 000000000..e7205b074 Binary files /dev/null and b/arpspoof/stats.png differ diff --git a/arpspoof/translations/en.yaml b/arpspoof/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/arpspoof/translations/en.yaml +++ b/arpspoof/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/autobrr/CHANGELOG.md b/autobrr/CHANGELOG.md new file mode 100644 index 000000000..399ec6cab --- /dev/null +++ b/autobrr/CHANGELOG.md @@ -0,0 +1,14 @@ + +## 1.23.0 (31-03-2023) +- Update to latest version from autobrr/autobrr + +## 1.21.0 (24-03-2023) +- Update to latest version from autobrr/autobrr +### 1.19.0-2 (20-03-2023) +- Minor bugs fixed +- Ingress addition + +## 1.19.0 (18-03-2023) + +- Update to latest version from autobrr/autobrr +- First version diff --git a/autobrr/Dockerfile b/autobrr/Dockerfile new file mode 100644 index 000000000..dd0eb77bb --- /dev/null +++ b/autobrr/Dockerfile @@ -0,0 +1,145 @@ +#============================# +# ALEXBELGIUM'S DOCKERFILE # +#============================# +# _.------. +# _.-` ('>.-`"""-. +# '.--'` _'` _ .--.) +# -' '-.-';` ` +# ' - _.' ``'--. +# '---` .-'""` +# /` +#=== Home Assistant Addon ===# + +################# +# 1 Build Image # +################# + +ARG BUILD_FROM +ARG BUILD_VERSION +ARG BUILD_UPSTREAM="1.23.0" +FROM ${BUILD_FROM} + +################## +# 2 Modify Image # +################## + +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ + S6_SERVICES_GRACETIME=0 + +# Global LSIO modifications +ARG CONFIGLOCATION="/config/addons_config/autobrr" +# hadolint ignore=SC2015, SC2013, SC2086 +RUN \ + # Avoid custom-init.d duplications + for file in $(grep -sril 'Potential tampering with custom' /etc/cont-init.d /etc/services.d /etc/s6-overlay/s6-rc.d); do rm -f $file; done \ + \ + # Create new config folder if needed + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i "1a mkdir -p $CONFIGLOCATION" $file; done \ + \ + # Allow UID and GID setting + && for file in $(grep -srl "PUID" /etc/cont-init.d /etc/s6-overlay/s6-rc.d); do sed -i 's/bash/bashio/g' $file && sed -i '1a PUID="$(if bashio::config.has_value "PUID"; then bashio::config "PUID"; else echo "0"; fi)"' $file && sed -i '1a PGID="$(if bashio::config.has_value "PGID"; then bashio::config "PGID"; else echo "0"; fi)"' $file; done \ + \ + # Correct config location + && for file in $(grep -Esril "/config[ '\"/]|/config\$" /etc /defaults); do sed -Ei "s=(/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done \ + \ + # Avoid chmod /config + && for file in /etc/services.d/*/* /etc/cont-init.d/* /etc/s6-overlay/s6-rc.d/*/*;do if [ -f $file ] && [[ ! -z $(awk '/chown.*abc:abc.*\\/,/.*\/config( |$)/{print FILENAME}' $file) ]] ; then sed -i "s|/config$|/data|g" $file; fi ;done \ + \ + # Docker mods addition + #&& if [ -f /docker-mods ]; then sed -i 's|bash|bashio|g' /docker-mods && sed -i "1a if bashio::config.has_value \"DOCKER_MODS\"; then DOCKER_MODS=\$(bashio::config \"DOCKER_MODS\"); fi" /docker-mods; fi \ + \ + # Replace lsiown if not found + && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi + +################## +# 3 Install apps # +################## + +# Add rootfs +COPY rootfs/ / + +# Corrects permissions for s6 v3 +RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ + if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ + if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi + +# Modules +ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 00-local_mounts.sh 00-smb_mounts.sh" + +# Automatic modules download +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ + && mkdir -p /etc/cont-init.d \ + && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ + && chmod -R 755 /etc/cont-init.d + +# Manual apps +ENV PACKAGES="jq \ + curl \ + cifs-utils \ + keyutils nginx" + +# Automatic apps & bashio +# hadolint ignore=SC2015 +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ + && chmod 777 /automatic_packages.sh \ + && eval /./automatic_packages.sh "${PACKAGES:-}" \ + && rm /automatic_packages.sh + +################ +# 4 Entrypoint # +################ + +RUN chmod 777 /entrypoint.sh +#WORKDIR / +ENTRYPOINT [ "/usr/bin/env" ] +CMD [ "/entrypoint.sh" ] +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +############ +# 5 Labels # +############ + +ARG BUILD_ARCH +ARG BUILD_DATE +ARG BUILD_DESCRIPTION +ARG BUILD_NAME +ARG BUILD_REF +ARG BUILD_REPOSITORY +ARG BUILD_VERSION +LABEL \ + io.hass.name="${BUILD_NAME}" \ + io.hass.description="${BUILD_DESCRIPTION}" \ + io.hass.arch="${BUILD_ARCH}" \ + io.hass.type="addon" \ + io.hass.version=${BUILD_VERSION} \ + maintainer="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.title="${BUILD_NAME}" \ + org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ + org.opencontainers.image.vendor="Home Assistant Add-ons" \ + org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.url="https://github.com/alexbelgium" \ + org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ + org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="7474" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/autobrr/README.md b/autobrr/README.md new file mode 100644 index 000000000..486f56623 --- /dev/null +++ b/autobrr/README.md @@ -0,0 +1,69 @@ + +# Home assistant add-on: Autobrrf + +[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) + +![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fautobrr%2Fconfig.json) +![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fautobrr%2Fconfig.json) +![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fautobrr%2Fconfig.json) + +[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade) +[![GitHub Super-Linter](https://github.com/alexbelgium/hassio-addons/workflows/Lint%20Code%20Base/badge.svg)](https://github.com/marketplace/actions/super-linter) +[![Builder](https://github.com/alexbelgium/hassio-addons/workflows/Builder/badge.svg)](https://github.com/alexbelgium/hassio-addons/actions/workflows/builder.yaml) + +[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white + +_Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ + +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) + +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/autobrr/stats.png) + +## About + +--- + +[Autobrr](https://autobrr.com/) autobrr is the modern download automation tool for torrents. With inspiration and ideas from tools like trackarr, autodl-irssi and flexget we built one tool that can do it all, and then some. + +This addon is based on the docker image https://github.com/autobrr/autobrr + +## Installation + +--- + +The installation of this add-on is pretty straightforward and not different in comparison to installing any other add-on. + +1. Add my add-ons repository to your home assistant instance (in supervisor addons store at top right, or click button below if you have configured my HA) + [![Open your Home Assistant instance and show the add add-on repository dialog with a specific repository URL pre-filled.](https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Falexbelgium%2Fhassio-addons) +1. Install this add-on. +1. Click the `Save` button to store your configuration. +1. Set the add-on options to your preferences +1. Start the add-on. +1. Check the logs of the add-on to see if everything went well. +1. Open the webUI and adapt the software options + +## Configuration + +--- + +Webui can be found at . +The default username/password : described in the startup log. +Configurations can be done through the app webUI, except for the following options + +```yaml +PGID: user +GPID: user +TZ: timezone +localdisks: sda1 #put the hardware name of your drive to mount separated by commas, or its label. ex. sda1, sdb1, MYNAS... +networkdisks: "//SERVER/SHARE" # optional, list of smb servers to mount, separated by commas +cifsusername: "username" # optional, smb username, same for all smb shares +cifspassword: "password" # optional, smb password +WEBUI_USERNAME: webui username +WEBUI_PASSWORD: password +``` + +## Support + +Create an issue on github + +[repository]: https://github.com/alexbelgium/hassio-addons diff --git a/autobrr/apparmor.txt b/autobrr/apparmor.txt new file mode 100644 index 000000000..ad452921c --- /dev/null +++ b/autobrr/apparmor.txt @@ -0,0 +1,66 @@ +#include + +profile autobrr_addon flags=(attach_disconnected,mediate_deleted) { + #include + + capability, + file, + signal, + mount, + umount, + remount, + network udp, + network tcp, + network dgram, + network stream, + network inet, + network inet6, + network netlink raw, + network unix dgram, + + capability setgid, + capability setuid, + capability sys_admin, + capability dac_read_search, + # capability dac_override, + # capability sys_rawio, + +# S6-Overlay + /init ix, + /run/{s6,s6-rc*,service}/** ix, + /package/** ix, + /command/** ix, + /run/{,**} rwk, + /dev/tty rw, + /bin/** ix, + /usr/bin/** ix, + /usr/lib/bashio/** ix, + /etc/s6/** rix, + /run/s6/** rix, + /etc/services.d/** rwix, + /etc/cont-init.d/** rwix, + /etc/cont-finish.d/** rwix, + /init rix, + /var/run/** mrwkl, + /var/run/ mrwkl, + /dev/i2c-1 mrwkl, + # Files required + /dev/fuse mrwkl, + /dev/sda1 mrwkl, + /dev/sdb1 mrwkl, + /dev/nvme0 mrwkl, + /dev/nvme1 mrwkl, + /dev/mmcblk0p1 mrwkl, + /dev/* mrwkl, + /tmp/** mrkwl, + + # Data access + /data/** rw, + + # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container + ptrace (trace,read) peer=docker-default, + + # docker daemon confinement requires explict allow rule for signal + signal (receive) set=(kill,term) peer=/usr/bin/docker, + +} diff --git a/autobrr/build.json b/autobrr/build.json new file mode 100644 index 000000000..13364e3cc --- /dev/null +++ b/autobrr/build.json @@ -0,0 +1,10 @@ +{ + "build_from": { + "aarch64": "ghcr.io/autobrr/autobrr:latest", + "amd64": "ghcr.io/autobrr/autobrr:latest", + "armv7": "ghcr.io/autobrr/autobrr:latest" + }, + "codenotary": { + "signer": "alexandrep.github@gmail.com" + } +} diff --git a/autobrr/config.json b/autobrr/config.json new file mode 100644 index 000000000..7143f42a4 --- /dev/null +++ b/autobrr/config.json @@ -0,0 +1,89 @@ +{ + "arch": [ + "aarch64", + "amd64", + "armv7" + ], + "codenotary": "alexandrep.github@gmail.com", + "description": "Automation for downloads", + "devices": [ + "/dev/sda", + "/dev/sdb", + "/dev/sdc", + "/dev/sdd", + "/dev/sde", + "/dev/sdf", + "/dev/sdg", + "/dev/nvme", + "/dev/nvme0n1p1", + "/dev/nvme0n1p2", + "/dev/mmcblk", + "/dev/fuse", + "/dev/sda1", + "/dev/sdb1", + "/dev/sdc1", + "/dev/sdd1", + "/dev/sde1", + "/dev/sdf1", + "/dev/sdg1", + "/dev/sda2", + "/dev/sdb2", + "/dev/sdc2", + "/dev/sdd2", + "/dev/sde2", + "/dev/sdf2", + "/dev/sdg2", + "/dev/sda3", + "/dev/sdb3", + "/dev/sda4", + "/dev/sdb4", + "/dev/nvme0", + "/dev/nvme1", + "/dev/nvme2" + ], + "environment": { + "BASE_DOCKER_DATA_PATH": "/data/autobrr", + "PGID": "0", + "PUID": "0", + "WEBUI_PASSWORD": "password", + "WEBUI_PORT": "7474", + "WEBUI_USERNAME": "admin" + }, + "image": "ghcr.io/alexbelgium/autobrr-{arch}", + "ingress": true, + "init": false, + "map": [ + "config:rw", + "share:rw", + "media:rw", + "ssl" + ], + "name": "Autobrr", + "options": { + "PGID": 0, + "PUID": 0 + }, + "panel_icon": "mdi:television-classic", + "ports": { + "7474/tcp": 7474 + }, + "ports_description": { + "7474/tcp": "web interface" + }, + "privileged": [ + "SYS_ADMIN", + "DAC_READ_SEARCH" + ], + "schema": { + "PGID": "int", + "PUID": "int", + "TZ": "str?", + "cifspassword": "str?", + "cifsusername": "str?", + "localdisks": "str?", + "networkdisks": "str?" + }, + "slug": "autobrr", + "url": "https://github.com/alexbelgium/hassio-addons/tree/master/autobrr", + "version": "1.23.0" +} diff --git a/autobrr/icon.png b/autobrr/icon.png new file mode 100644 index 000000000..a059b0239 Binary files /dev/null and b/autobrr/icon.png differ diff --git a/autobrr/logo.png b/autobrr/logo.png new file mode 100644 index 000000000..a059b0239 Binary files /dev/null and b/autobrr/logo.png differ diff --git a/autobrr/rootfs/entrypoint.sh b/autobrr/rootfs/entrypoint.sh new file mode 100755 index 000000000..68c3fec4d --- /dev/null +++ b/autobrr/rootfs/entrypoint.sh @@ -0,0 +1,16 @@ +#!/bin/bash +echo "Starting..." + +#################### +# Starting scripts # +#################### + +for SCRIPTS in /etc/cont-init.d/*; do + [ -e "$SCRIPTS" ] || continue + echo "$SCRIPTS: executing" + chown "$(id -u)":"$(id -g)" "$SCRIPTS" + chmod a+x "$SCRIPTS" + # Change shebang if no s6 supervision + sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" + /."$SCRIPTS" || echo "$SCRIPTS: exiting $?" +done diff --git a/autobrr/rootfs/etc/cont-init.d/20-folders.sh b/autobrr/rootfs/etc/cont-init.d/20-folders.sh new file mode 100755 index 000000000..dd9e0253f --- /dev/null +++ b/autobrr/rootfs/etc/cont-init.d/20-folders.sh @@ -0,0 +1,14 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash + +if [ ! -d /data/autobrr ]; then + echo "Creating /data/autobrr" + mkdir -p /data/autobrr + chown -R "$(bashio::config "PUID"):$(bashio::config "PGID")" /data/autobrr +fi + +if [ ! -d /config/addons_config/autobrr ]; then + echo "Creating /config/addons_config/autobrr" + mkdir -p /config/addons_config/autobrr + chown -R "$(bashio::config "PUID"):$(bashio::config "PGID")" /config/addons_config/autobrr +fi diff --git a/autobrr/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/autobrr/rootfs/etc/cont-init.d/32-nginx_ingress.sh new file mode 100755 index 000000000..599020efe --- /dev/null +++ b/autobrr/rootfs/etc/cont-init.d/32-nginx_ingress.sh @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash + +################# +# NGINX SETTING # +################# +declare ingress_interface +declare ingress_port + +ingress_port=$(bashio::addon.ingress_port) +ingress_interface=$(bashio::addon.ip_address) +ingress_entry=$(bashio::addon.ingress_entry) +sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf +sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf +sed -i "s|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf +sed -i "s|%%ingress_entry2%%|${ingress_entry////\\/}|g" /etc/nginx/servers/ingress.conf diff --git a/autobrr/rootfs/etc/cont-init.d/91-run.sh b/autobrr/rootfs/etc/cont-init.d/91-run.sh new file mode 100755 index 000000000..d80a5e1ef --- /dev/null +++ b/autobrr/rootfs/etc/cont-init.d/91-run.sh @@ -0,0 +1,18 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash + +############### +# Start nginx # +############### + +# Set UrlBase + +bashio::log.info "Starting NGinx..." +nginx & true + +############# +# Start app # +############# + +bashio::log.info "Starting app" +exec /usr/local/bin/autobrr --config /config/addons_config/autobrr diff --git a/autobrr/rootfs/etc/entrypoint.sh b/autobrr/rootfs/etc/entrypoint.sh new file mode 100755 index 000000000..68c3fec4d --- /dev/null +++ b/autobrr/rootfs/etc/entrypoint.sh @@ -0,0 +1,16 @@ +#!/bin/bash +echo "Starting..." + +#################### +# Starting scripts # +#################### + +for SCRIPTS in /etc/cont-init.d/*; do + [ -e "$SCRIPTS" ] || continue + echo "$SCRIPTS: executing" + chown "$(id -u)":"$(id -g)" "$SCRIPTS" + chmod a+x "$SCRIPTS" + # Change shebang if no s6 supervision + sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" + /."$SCRIPTS" || echo "$SCRIPTS: exiting $?" +done diff --git a/autobrr/rootfs/etc/nginx/includes/mime.types b/autobrr/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..7c7cdef2d --- /dev/null +++ b/autobrr/rootfs/etc/nginx/includes/mime.types @@ -0,0 +1,96 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/autobrr/rootfs/etc/nginx/includes/proxy_params.conf b/autobrr/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..924ba949e --- /dev/null +++ b/autobrr/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,16 @@ +proxy_http_version 1.1; +proxy_ignore_client_abort off; +proxy_read_timeout 86400s; +proxy_redirect off; +proxy_send_timeout 86400s; +proxy_max_temp_file_size 0; + +proxy_hide_header X-Frame-Options; +proxy_set_header Accept-Encoding ""; +proxy_set_header Connection $connection_upgrade; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header Host $http_host; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header X-NginX-Proxy true; +proxy_set_header X-Real-IP $remote_addr; diff --git a/autobrr/rootfs/etc/nginx/includes/resolver.conf b/autobrr/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..6485af141 --- /dev/null +++ b/autobrr/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11; diff --git a/autobrr/rootfs/etc/nginx/includes/server_params.conf b/autobrr/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..e651dd8c5 --- /dev/null +++ b/autobrr/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,6 @@ +root /app/sonarr/bin/UI; +server_name $hostname; + +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +add_header X-Robots-Tag none; diff --git a/autobrr/rootfs/etc/nginx/includes/ssl_params.conf b/autobrr/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6f1500599 --- /dev/null +++ b/autobrr/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,9 @@ +ssl_protocols TLSv1.2; +ssl_prefer_server_ciphers on; +ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; +ssl_ecdh_curve secp384r1; +ssl_session_timeout 10m; +ssl_session_cache shared:SSL:10m; +ssl_session_tickets off; +ssl_stapling on; +ssl_stapling_verify on; diff --git a/autobrr/rootfs/etc/nginx/includes/upstream.conf b/autobrr/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 000000000..61ecbf251 --- /dev/null +++ b/autobrr/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:8080; +} diff --git a/autobrr/rootfs/etc/nginx/nginx.conf b/autobrr/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..833c2ad1d --- /dev/null +++ b/autobrr/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,57 @@ + +# Run nginx in foreground. +daemon off; + +# This is run inside Docker. +user root; + +# Pid storage location. +pid /var/run/nginx.pid; + +# Set number of worker processes. +worker_processes 1; + +# Enables the use of JIT for regular expressions to speed-up their processing. +pcre_jit on; + +# Write error log to Hass.io add-on log. +error_log /proc/1/fd/1 error; + +# Load allowed environment vars +env HASSIO_TOKEN; + +# Load dynamic modules. +include /etc/nginx/modules/*.conf; + +# Max num of simultaneous connections by a worker process. +events { + worker_connections 512; +} + +http { + include /etc/nginx/includes/mime.types; + + log_format hassio '[$time_local] $status ' + '$http_x_forwarded_for($remote_addr) ' + '$request ($http_user_agent)'; + + access_log /proc/1/fd/1 hassio; + client_max_body_size 4G; + default_type application/octet-stream; + gzip on; + keepalive_timeout 65; + sendfile on; + server_tokens off; + tcp_nodelay on; + tcp_nopush on; + + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; + } + + include /etc/nginx/includes/resolver.conf; + include /etc/nginx/includes/upstream.conf; + + include /etc/nginx/servers/*.conf; +} diff --git a/autobrr/rootfs/etc/nginx/servers/ingress.conf b/autobrr/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..ebb8d2da3 --- /dev/null +++ b/autobrr/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,30 @@ +server { + listen %%interface%%:%%port%% default_server; + + #include /etc/nginx/includes/server_params.conf; + #include /etc/nginx/includes/proxy_params.conf; + + client_max_body_size 0; + + location / { + add_header Access-Control-Allow-Origin *; + proxy_connect_timeout 30m; + proxy_send_timeout 30m; + proxy_read_timeout 30m; + proxy_pass http://0.0.0.0:7474; + + # Allow signalr + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $http_connection; + proxy_set_header X-Forwarded-Host $http_host; + + # Correct base_url + proxy_set_header Accept-Encoding ""; + sub_filter_once off; + sub_filter_types *; + sub_filter 'href="/"' 'href="%%ingress_entry%%/"'; + sub_filter '"\/"' '"%%ingress_entry2%%\/"'; + } + +} diff --git a/autobrr/stats.png b/autobrr/stats.png new file mode 100644 index 000000000..e88abc7f4 Binary files /dev/null and b/autobrr/stats.png differ diff --git a/autobrr/translations/en.yaml b/autobrr/translations/en.yaml new file mode 100644 index 000000000..f138d549f --- /dev/null +++ b/autobrr/translations/en.yaml @@ -0,0 +1,662 @@ +--- +configuration: + additional_apps: + name: additional_apps + description: Additional apps to install at boot + allow_ipv6: + name: allow_ipv6 + description: Enables ipv6 in the addon + ALLOW_SIGNUP: + name: ALLOW_SIGNUP + description: See upstream app documentation + ALLOWED_HOSTS: + name: ALLOWED_HOSTS + description: See upstream app documentation + APP_BASE_URL: + name: APP_BASE_URL + description: See upstream app documentation + APP_KEY: + name: APP_KEY + description: See upstream app documentation + APP_NAME: + name: APP_NAME + description: See upstream app documentation + append_myip: + name: append_myip + description: See upstream app documentation + auto_restart: + name: auto_restart + description: See upstream app documentation + BACKUP_PATH: + name: BACKUP_PATH + description: See upstream app documentation + base_folder: + name: base_folder + description: See upstream app documentation + BASE_URL: + name: BASE_URL + description: See upstream app documentation + base_url_portless: + name: base_url_portless + description: See upstream app documentation + certfile: + name: certfile + description: "fullchain.pem #ssl certificate, must be located in /ssl" + checkip_command: + name: checkip_command + description: See upstream app documentation + checkip_path: + name: checkip_path + description: See upstream app documentation + checkip_server: + name: checkip_server + description: See upstream app documentation + checkip_ssl: + name: checkip_ssl + description: See upstream app documentation + cifsdomain: + name: cifsdomain + description: Allow setting the domain for the smb share + cifspassword: + name: cifspassword + description: Your password to access your SMB share, same for all smb shares + cifsusername: + name: cifsusername + description: Your username to access your SMB share, same for all smb shares + claim: + name: claim + description: See upstream app documentation + CLI_ARGS: + name: CLI_ARGS + description: See upstream app documentation + COLLECTOR_API_ENDPOINT: + name: COLLECTOR_API_ENDPOINT + description: See upstream app documentation + COLLECTOR_HOST_ID: + name: COLLECTOR_HOST_ID + description: See upstream app documentation + CONFIG_LOCATION: + name: CONFIG_LOCATION + description: See upstream app documentation + CUSTOM_OPTIONS: + name: CUSTOM_OPTIONS + description: See upstream app documentation + custom_provider: + name: custom_provider + description: See upstream app documentation + customUI: + name: customUI + description: selection from list # alternative webUI can be set here + data_directory: + name: data_directory + description: See upstream app documentation + data_location: + name: data_location + description: Where do you want your data stored + database: + name: database + description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui + DB_CLIENT: + name: DB_CLIENT + description: See upstream app documentation + DB_CONNECTION: + name: DB_CONNECTION + description: See upstream app documentation + DB_DATABASE: + name: DB_DATABASE + description: See upstream app documentation + DB_DATABASE_NAME: + name: DB_DATABASE_NAME + description: If using external postgresql + DB_HOST: + name: DB_HOST + description: See upstream app documentation + DB_HOSTNAME: + name: DB_HOSTNAME + description: If using external database + DB_PASSWORD: + name: DB_PASSWORD + description: If using external database + DB_PORT: + name: DB_PORT + description: If using external database + DB_TYPE: + name: DB_TYPE + description: See upstream app documentation + DB_USERNAME: + name: DB_USERNAME + description: If using external database + ddns_path: + name: ddns_path + description: See upstream app documentation + ddns_server: + name: ddns_server + description: See upstream app documentation + DEBUG: + name: DEBUG + description: See upstream app documentation + DISABLE_MACHINE_LEARNING: + name: DISABLE_MACHINE_LEARNING + description: See upstream app documentation + DNS_server: + name: DNS_server + description: See upstream app documentation + DOCKER_MODS: + name: DOCKER_MODS + description: See upstream app documentation + DOMAIN: + name: DOMAIN + description: See upstream app documentation + download_dir: + name: download_dir + description: See upstream app documentation + downloads_location: + name: downloads_location + description: See upstream app documentation + DROPBOX_TOKEN: + name: DROPBOX_TOKEN + description: See upstream app documentation + edge_repositories: + name: edge_repositories + description: See upstream app documentation + elasticsearch_server: + name: elasticsearch_server + description: See upstream app documentation + expose_collector: + name: expose_collector + description: See upstream app documentation + EXTENSIONS: + name: EXTENSIONS + description: See upstream app documentation + extraction_path: + name: extraction_path + description: See upstream app documentation + fake_address: + name: fake_address + description: See upstream app documentation + FG_LOG_LEVEL: + name: FG_LOG_LEVEL + description: See upstream app documentation + FG_PLUGINS: + name: FG_PLUGINS + description: See upstream app documentation + FIREFLY_III_ACCESS_TOKEN: + name: FIREFLY_III_ACCESS_TOKEN + description: See upstream app documentation + FIREFLY_III_CLIENT_ID: + name: FIREFLY_III_CLIENT_ID + description: See upstream app documentation + FIREFLY_III_URL: + name: FIREFLY_III_URL + description: See upstream app documentation + forced_update: + name: forced_update + description: See upstream app documentation + Full_Text_Search: + name: Full_Text_Search + description: See upstream app documentation + gitapi: + name: gitapi + description: See upstream app documentation + gitmail: + name: gitmail + description: See upstream app documentation + gitpass: + name: gitpass + description: See upstream app documentation + gituser: + name: gituser + description: See upstream app documentation + graphic_drivers: + name: graphic_drivers + description: See upstream app documentation + hostname: + name: hostname + description: See upstream app documentation + HTTPS_ONLY: + name: HTTPS_ONLY + description: See upstream app documentation + iface: + name: iface + description: See upstream app documentation + Images_location: + name: Images_location + description: See upstream app documentation + imaphost: + name: imaphost + description: See upstream app documentation + imappassword: + name: imappassword + description: See upstream app documentation + imapusername: + name: imapusername + description: See upstream app documentation + import_dir: + name: import_dir + description: See upstream app documentation + IMPORT_PATH: + name: IMPORT_PATH + description: See upstream app documentation + incomplete_dir: + name: incomplete_dir + description: See upstream app documentation + ingress_disabled: + name: ingress_disabled + description: Remove baseurl and disable ingress + ingress_user: + name: ingress_user + description: See upstream app documentation + INTERFACE_NAME: + name: INTERFACE_NAME + description: See upstream app documentation + iterations: + name: iterations + description: See upstream app documentation + JWT_SECRET: + name: JWT_SECRET + description: Used to sign the authentication keys for user login + KEYBOARD: + name: KEYBOARD + description: See upstream app documentation + keyfile: + name: keyfile + description: privkey.pem #sslkeyfile, must be located in /ssl + LOCAL_NETWORK: + name: LOCAL_NETWORK + description: See upstream app documentation + localdisks: + name: localdisks + description: Physical name of the partition (ex. sda1) or the share (ex. SharedFiles) to mount separated by commas (ex. sda1,sdb1,MYNAS) + log_level: + name: log_level + description: See upstream app documentation + MAILER_AUTH_PASSWORD: + name: MAILER_AUTH_PASSWORD + description: See upstream app documentation + MAILER_AUTH_USER: + name: MAILER_AUTH_USER + description: See upstream app documentation + MAILER_ENABLED: + name: MAILER_ENABLED + description: See upstream app documentation + OPENVPN_PROVIDER: + name: OPENVPN_PROVIDER + description: See upstream app documentation + OPENVPN_USERNAME: + name: OPENVPN_USERNAME + description: See upstream app documentation + ORIGINALS_PATH: + name: ORIGINALS_PATH + description: See upstream app documentation + PAPERLESS_OCR_MODE: + name: PAPERLESS_OCR_MODE + description: See upstream app documentation + PAPERLESS_URL: + name: PAPERLESS_URL + description: See upstream app documentation + pass: + name: pass + description: See upstream app documentation + password: + name: password + description: See upstream app documentation + period: + name: period + description: See upstream app documentation + PGID: + name: PGID + description: The user group ID, as described in https://docs.linuxserver.io/general/understanding-puid-and-pgid + PMM_CONFIG: + name: PMM_CONFIG + description: See upstream app documentation + PMM_NO_MISSING: + name: PMM_NO_MISSING + description: See upstream app documentation + PMM_RUN: + name: PMM_RUN + description: See upstream app documentation + PMM_TEST: + name: PMM_TEST + description: See upstream app documentation + PMM_TIME: + name: PMM_TIME + description: See upstream app documentation + POSTGRES_DATABASE: + name: POSTGRES_DATABASE + description: See upstream app documentation + POSTGRES_DB: + name: POSTGRES_DB + description: See upstream app documentation + POSTGRES_HOST: + name: POSTGRES_HOST + description: See upstream app documentation + POSTGRES_PASSWORD: + name: POSTGRES_PASSWORD + description: See upstream app documentation + POSTGRES_PORT: + name: POSTGRES_PORT + description: See upstream app documentation + POSTGRES_USER: + name: POSTGRES_USER + description: See upstream app documentation + provider: + name: provider + description: See upstream app documentation + providers: + name: providers + description: See upstream app documentation + proxied: + name: proxied + description: See upstream app documentation + PUID: + name: PUID + description: The user group ID, as described in https://docs.linuxserver.io/general/understanding-puid-and-pgid + remote_mysql_database: + name: remote_mysql_database + description: See upstream app documentation + remote_mysql_host: + name: remote_mysql_host + description: See upstream app documentation + remote_mysql_password: + name: remote_mysql_password + description: See upstream app documentation + remote_mysql_port: + name: remote_mysql_port + description: See upstream app documentation + remote_mysql_username: + name: remote_mysql_username + description: See upstream app documentation + repository: + name: repository + description: See upstream app documentation + request_size_limit: + name: request_size_limit + description: See upstream app documentation + ROOT_URL: + name: ROOT_URL + description: See upstream app documentation + ROUTER_IP: + name: ROUTER_IP + description: See upstream app documentation + rpi_video_drivers: + name: rpi_video_drivers + description: See upstream app documentation + run_duration: + name: run_duration + description: 12h #for how long should the addon run. Must be formatted as number + time unit (ex : 5s, or 2m, or 12h, or 5d...) + SavePath: + name: SavePath + description: See upstream app documentation + SEAFILE_ADMIN_EMAIL: + name: SEAFILE_ADMIN_EMAIL + description: See upstream app documentation + SEAFILE_ADMIN_PASSWORD: + name: SEAFILE_ADMIN_PASSWORD + description: See upstream app documentation + SECRET_KEY: + name: SECRET_KEY + description: See upstream app documentation + secret_token: + name: secret_token + description: See upstream app documentation + secure_ssl: + name: secure_ssl + description: See upstream app documentation + silent: + name: silent + description: "true #suppresses debug messages" + SMARTCTL_COMMAND_DEVICE_TYPE: + name: SMARTCTL_COMMAND_DEVICE_TYPE + description: See upstream app documentation + SMARTCTL_MEGARAID_DISK_NUM: + name: SMARTCTL_MEGARAID_DISK_NUM + description: See upstream app documentation + smbv1: + name: smbv1 + description: See upstream app documentation + SPECTRE_APP_ID: + name: SPECTRE_APP_ID + description: See upstream app documentation + SPECTRE_SECRET: + name: SPECTRE_SECRET + description: See upstream app documentation + ssl: + name: ssl + description: true/false. enables ssl. Need certfile and keyfile filled' + storage_dir: + name: storage_dir + description: See upstream app documentation + STORAGE_PATH: + name: STORAGE_PATH + description: See upstream app documentation + theme: + name: theme + description: See upstream app documentation + TRANSMISSION_DOWNLOAD_DIR: + name: TRANSMISSION_DOWNLOAD_DIR + description: See upstream app documentation + TRANSMISSION_HOME: + name: TRANSMISSION_HOME + description: See upstream app documentation + TRANSMISSION_INCOMPLETE_DIR: + name: TRANSMISSION_INCOMPLETE_DIR + description: See upstream app documentation + TRANSMISSION_V3_UPDATE: + name: TRANSMISSION_V3_UPDATE + description: See upstream app documentation + TRANSMISSION_WATCH_DIR: + name: TRANSMISSION_WATCH_DIR + description: See upstream app documentation + TRANSMISSION_WEB_UI: + name: TRANSMISSION_WEB_UI + description: See upstream app documentation + trusted_domains: + name: trusted_domains + description: See upstream app documentation + trusted_headers: + name: trusted_headers + description: See upstream app documentation + ttl: + name: ttl + description: See upstream app documentation + TZ: + name: TZ + description: The timezone, as described in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones + ui_path: + name: ui_path + description: See upstream app documentation + Updates: + name: Updates + description: See upstream app documentation + UPLOAD_NSFW: + name: UPLOAD_NSFW + description: See upstream app documentation + URL: + name: URL + description: See upstream app documentation + use_own_certs: + name: use_own_certs + description: See upstream app documentation + user: + name: user + description: See upstream app documentation + user_agent: + name: user_agent + description: See upstream app documentation + username: + name: username + description: See upstream app documentation + verbose: + name: verbose + description: See upstream app documentation + verify_address: + name: verify_address + description: See upstream app documentation + watch_dir: + name: watch_dir + description: See upstream app documentation + watch_path: + name: watch_path + description: See upstream app documentation + WebuiPass: + name: WebuiPass + description: See upstream app documentation + whitelist: + name: whitelist + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' + WHOOGLE_ALT_IG: + name: WHOOGLE_ALT_IG + description: See upstream app documentation + WHOOGLE_ALT_MD: + name: WHOOGLE_ALT_MD + description: See upstream app documentation + WHOOGLE_ALT_RD: + name: WHOOGLE_ALT_RD + description: See upstream app documentation + WHOOGLE_ALT_TL: + name: WHOOGLE_ALT_TL + description: See upstream app documentation + WHOOGLE_ALT_TW: + name: WHOOGLE_ALT_TW + description: See upstream app documentation + WHOOGLE_ALT_YT: + name: WHOOGLE_ALT_YT + description: See upstream app documentation + WHOOGLE_AUTOCOMPLETE: + name: WHOOGLE_AUTOCOMPLETE + description: See upstream app documentation + WHOOGLE_CONFIG_ALTS: + name: WHOOGLE_CONFIG_ALTS + description: See upstream app documentation + WHOOGLE_CONFIG_BLOCK: + name: WHOOGLE_CONFIG_BLOCK + description: See upstream app documentation + WHOOGLE_CONFIG_COUNTRY: + name: WHOOGLE_CONFIG_COUNTRY + description: See upstream app documentation + WHOOGLE_CONFIG_DISABLE: + name: WHOOGLE_CONFIG_DISABLE + description: See upstream app documentation + WHOOGLE_CONFIG_GET_ONLY: + name: WHOOGLE_CONFIG_GET_ONLY + description: See upstream app documentation + WHOOGLE_CONFIG_LANGUAGE: + name: WHOOGLE_CONFIG_LANGUAGE + description: See upstream app documentation + WHOOGLE_CONFIG_NEAR: + name: WHOOGLE_CONFIG_NEAR + description: See upstream app documentation + WHOOGLE_CONFIG_NEW_TAB: + name: WHOOGLE_CONFIG_NEW_TAB + description: See upstream app documentation + WHOOGLE_CONFIG_SAFE: + name: WHOOGLE_CONFIG_SAFE + description: See upstream app documentation + WHOOGLE_CONFIG_SEARCH_LANGUAGE: + name: WHOOGLE_CONFIG_SEARCH_LANGUAGE + description: See upstream app documentation + WHOOGLE_CONFIG_THEME: + name: WHOOGLE_CONFIG_THEME + description: See upstream app documentation + WHOOGLE_CONFIG_URL: + name: WHOOGLE_CONFIG_URL + description: See upstream app documentation + WHOOGLE_CONFIG_VIEW_IMAGE: + name: WHOOGLE_CONFIG_VIEW_IMAGE + description: See upstream app documentation + WHOOGLE_CSP: + name: WHOOGLE_CSP + description: See upstream app documentation + WHOOGLE_MINIMAL: + name: WHOOGLE_MINIMAL + description: See upstream app documentation + WHOOGLE_PASS: + name: WHOOGLE_PASS + description: See upstream app documentation + WHOOGLE_PROXY_LOC: + name: WHOOGLE_PROXY_LOC + description: See upstream app documentation + WHOOGLE_PROXY_PASS: + name: WHOOGLE_PROXY_PASS + description: See upstream app documentation + WHOOGLE_PROXY_TYPE: + name: WHOOGLE_PROXY_TYPE + description: See upstream app documentation + WHOOGLE_PROXY_USER: + name: WHOOGLE_PROXY_USER + description: See upstream app documentation + WHOOGLE_RESULTS_PER_PAGE: + name: WHOOGLE_RESULTS_PER_PAGE + description: See upstream app documentation + WHOOGLE_USER: + name: WHOOGLE_USER + description: See upstream app documentation + wildcard: + name: wildcard + description: See upstream app documentation" + MAILER_HOST: + name: MAILER_HOST + description: See upstream app documentation + MAILER_NOREPLY_EMAIL: + name: MAILER_NOREPLY_EMAIL + description: See upstream app documentation + MAILER_NOREPLY_NAME: + name: MAILER_NOREPLY_NAME + description: See upstream app documentation + MAILER_PORT: + name: MAILER_PORT + description: See upstream app documentation + MAILER_SECURITY: + name: MAILER_SECURITY + description: See upstream app documentation + maxmem: + name: maxmem + description: See upstream app documentation + Mode: + name: Mode + description: See upstream app documentation + mqtt_autodiscover: + name: mqtt_autodiscover + description: See upstream app documentation + networkdisks: + name: networkdisks + description: list of smb servers to mount, separated by commas (//xxx.xx.xx.xx/share) + NoAuth: + name: NoAuth + description: See upstream app documentation + NORDIGEN_ID: + name: NORDIGEN_ID + description: See upstream app documentation + NORDIGEN_KEY: + name: NORDIGEN_KEY + description: See upstream app documentation + OAUTHLIB_RELAX_TOKEN_SCOPE: + name: OAUTHLIB_RELAX_TOKEN_SCOPE + description: See upstream app documentation + OCR: + name: OCR + description: See upstream app documentation + ocrlang: + name: ocrlang + description: See upstream app documentation + openvpn_alt_mode: + name: openvpn_alt_mode + description: bind at container level and not app level + openvpn_config: + name: openvpn_config + description: for example ""config.ovpn"" # name of the file located in /config/openvpn + OPENVPN_CUSTOM_PROVIDER: + name: OPENVPN_CUSTOM_PROVIDER + description: See upstream app documentation + OPENVPN_CUSTOM_PROVIDER_OVPN_LOCATION: + name: OPENVPN_CUSTOM_PROVIDER_OVPN_LOCATION + description: See upstream app documentation + openvpn_enabled: + name: openvpn_enabled + description: See upstream app documentation + OPENVPN_PASSWORD: + name: OPENVPN_PASSWORD + description: See upstream app documentation diff --git a/autobrr/updater.json b/autobrr/updater.json new file mode 100644 index 000000000..bd19cd4d6 --- /dev/null +++ b/autobrr/updater.json @@ -0,0 +1,8 @@ +{ + "last_update": "31-03-2023", + "repository": "alexbelgium/hassio-addons", + "slug": "autborr", + "source": "github", + "upstream_repo": "autobrr/autobrr", + "upstream_version": "1.23.0" +} diff --git a/baikal/CHANGELOG.md b/baikal/CHANGELOG.md index fe34a2e29..10f2fa56d 100644 --- a/baikal/CHANGELOG.md +++ b/baikal/CHANGELOG.md @@ -1,3 +1,4 @@ +- Implemented healthcheck ## 0.9.3 (13-12-2022) - Update to latest version from ckulka/baikal-docker diff --git a/baikal/Dockerfile b/baikal/Dockerfile index 0c7b7c2e1..da6fe0b4c 100644 --- a/baikal/Dockerfile +++ b/baikal/Dockerfile @@ -105,3 +105,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="80" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/baikal/README.md b/baikal/README.md index 60509fe5f..300b999b4 100644 --- a/baikal/README.md +++ b/baikal/README.md @@ -16,8 +16,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/baikal/stats.png) ## About @@ -34,6 +35,7 @@ Webui can be found at . Configurations can be done through the app webUI, except for the following options ```yaml + ``` ## Installation diff --git a/baikal/rootfs/entrypoint.sh b/baikal/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/baikal/rootfs/entrypoint.sh +++ b/baikal/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/baikal/stats.png b/baikal/stats.png new file mode 100644 index 000000000..893f2d576 Binary files /dev/null and b/baikal/stats.png differ diff --git a/baikal/translations/en.yaml b/baikal/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/baikal/translations/en.yaml +++ b/baikal/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/bazarr/CHANGELOG.md b/bazarr/CHANGELOG.md index f1ba9b8e8..a7c11c160 100644 --- a/bazarr/CHANGELOG.md +++ b/bazarr/CHANGELOG.md @@ -1,3 +1,7 @@ +- Implemented healthcheck + +## 1.2.0 (04-03-2023) +- Update to latest version from linuxserver/docker-bazarr ## 1.1.4 (07-01-2023) - Update to latest version from linuxserver/docker-bazarr diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 95a6c71fb..d6789e616 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="1.1.4" +ARG BUILD_UPSTREAM="1.2.0" FROM ${BUILD_FROM}${BUILD_UPSTREAM} ################## @@ -66,7 +66,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -121,3 +121,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="6767" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/bazarr/README.md b/bazarr/README.md index 680d4a5e3..2d1648f0d 100644 --- a/bazarr/README.md +++ b/bazarr/README.md @@ -1,4 +1,3 @@ - # Home assistant add-on: bazarr [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/bazarr/stats.png) ## About diff --git a/bazarr/config.json b/bazarr/config.json index 7a55def41..e1a1461e7 100644 --- a/bazarr/config.json +++ b/bazarr/config.json @@ -95,6 +95,6 @@ }, "slug": "bazarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/bazarr", - "version": "1.1.4-2", + "version": "1.2.0", "webui": "[PROTO:ssl]://[HOST]:[PORT:6767]" } diff --git a/bazarr/stats.png b/bazarr/stats.png new file mode 100644 index 000000000..8d042354d Binary files /dev/null and b/bazarr/stats.png differ diff --git a/bazarr/translations/en.yaml b/bazarr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/bazarr/translations/en.yaml +++ b/bazarr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/bazarr/updater.json b/bazarr/updater.json index db4efe807..3377a462d 100644 --- a/bazarr/updater.json +++ b/bazarr/updater.json @@ -1,8 +1,8 @@ { - "last_update": "07-01-2023", + "last_update": "04-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "bazarr", "source": "github", "upstream_repo": "linuxserver/docker-bazarr", - "upstream_version": "1.1.4" + "upstream_version": "1.2.0" } diff --git a/binance-trading-bot/CHANGELOG.md b/binance-trading-bot/CHANGELOG.md new file mode 100644 index 000000000..e698e2e7e --- /dev/null +++ b/binance-trading-bot/CHANGELOG.md @@ -0,0 +1,8 @@ + +## 0.0.97 (24-03-2023) +- Update to latest version from chrisleekr/binance-trading-bot +- Implemented healthcheck + +## 0.0.96 (04-03-2023) +- Update to latest version from chrisleekr/binance-trading-bot +- First version diff --git a/binance-trading-bot/Dockerfile b/binance-trading-bot/Dockerfile new file mode 100644 index 000000000..eea311835 --- /dev/null +++ b/binance-trading-bot/Dockerfile @@ -0,0 +1,137 @@ +#============================# +# ALEXBELGIUM'S DOCKERFILE # +#============================# +# _.------. +# _.-` ('>.-`"""-. +# '.--'` _'` _ .--.) +# -' '-.-';` ` +# ' - _.' ``'--. +# '---` .-'""` +# /` +#=== Home Assistant Addon ===# + +################# +# 1 Build Image # +################# + +ARG BUILD_VERSION +ARG BUILD_UPSTREAM="0.0.97" +ARG BUILD_FROM +FROM $BUILD_FROM + +################## +# 2 Modify Image # +################## + +# Set S6 wait time +ENV S6_CMD_WAIT_FOR_SERVICES=1 \ + S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ + S6_SERVICES_GRACETIME=0 + +################## +# 3 Install apps # +################## + +# Add rootfs +COPY rootfs/ / + +# Corrects permissions for s6 v3 +RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ + if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ + if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi + +# Install trading view +ENV FLASK_APP=main.py +ENV FLASK_ENV=production +RUN \ + apk add --no-cache --quiet python3 py3-pip curl \ + && curl -o requirements.txt https://raw.githubusercontent.com/chrisleekr/binance-trading-bot/master/tradingview/requirements.txt \ + && pip install --no-cache-dir -r requirements.txt \ + && rm requirements.txt \ + && curl -o /srv/main.py https://raw.githubusercontent.com/chrisleekr/binance-trading-bot/master/tradingview/main.py + +# Installing mongodb +ENV ME_CONFIG_MONGODB_SERVER=localhost \ + BINANCE_MONGO_HOST=localhost + +RUN \ + echo 'http://dl-cdn.alpinelinux.org/alpine/v3.9/main' >> /etc/apk/repositories \ + && echo 'http://dl-cdn.alpinelinux.org/alpine/v3.9/community' >> /etc/apk/repositories \ + && apk add mongodb mongodb-tools --no-cache >/dev/null \ + && sed -i "/v3.9/d" /etc/apk/repositories + +# Modules +ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh" + +# Automatic modules download +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ + && mkdir -p /etc/cont-init.d \ + && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ + && chmod -R 755 /etc/cont-init.d + +# Manual apps +ENV PACKAGES="sudo redis nginx" + +# Automatic apps & bashio +# hadolint ignore=SC2015 +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ + && chmod 777 /automatic_packages.sh \ + && eval /./automatic_packages.sh "${PACKAGES:-}" \ + && rm /automatic_packages.sh + +################ +# 4 Entrypoint # +################ + +VOLUME [ "/data" ] +WORKDIR / +RUN chmod 777 /entrypoint.sh +ENTRYPOINT [ "/usr/bin/env" ] +CMD [ "/entrypoint.sh" ] + +############ +# 5 Labels # +############ + +ARG BUILD_ARCH +ARG BUILD_DATE +ARG BUILD_DESCRIPTION +ARG BUILD_NAME +ARG BUILD_REF +ARG BUILD_REPOSITORY +ARG BUILD_VERSION +LABEL \ + io.hass.name="${BUILD_NAME}" \ + io.hass.description="${BUILD_DESCRIPTION}" \ + io.hass.arch="${BUILD_ARCH}" \ + io.hass.type="addon" \ + io.hass.version=${BUILD_VERSION} \ + maintainer="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.title="${BUILD_NAME}" \ + org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ + org.opencontainers.image.vendor="Home Assistant Add-ons" \ + org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.url="https://github.com/alexbelgium" \ + org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ + org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="80" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/binance-trading-bot/README.md b/binance-trading-bot/README.md new file mode 100644 index 000000000..135dd647d --- /dev/null +++ b/binance-trading-bot/README.md @@ -0,0 +1,48 @@ +# Home assistant add-on: Binance Trading Bot (do not use with real money!) + +[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) + +![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Ffilebrowser%2Fconfig.json) +![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Ffilebrowser%2Fconfig.json) +![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Ffilebrowser%2Fconfig.json) + +[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade) +[![GitHub Super-Linter](https://github.com/alexbelgium/hassio-addons/workflows/Lint%20Code%20Base/badge.svg)](https://github.com/marketplace/actions/super-linter) +[![Builder](https://github.com/alexbelgium/hassio-addons/workflows/Builder/badge.svg)](https://github.com/alexbelgium/hassio-addons/actions/workflows/builder.yaml) + +[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white + +_Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ + +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) + +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/binance-trading-bot/stats.png) + +## About + +Automated Binance trading bot - Trade multiple cryptocurrencies. Buy low/sell high with Grid Trading. Integrated with TradingView technical analysis. +This addon is based on https://github.com/chrisleekr/binance-trading-bot. + +This is a test app ; for any issues please contact the link above. + +## Configuration + +Webui can be found at . +Please see https://github.com/chrisleekr/binance-trading-bot for configuration. + +## Installation + +The installation of this add-on is pretty straightforward and not different in +comparison to installing any other Hass.io add-on. + +1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance. +1. Install this add-on. +1. Click the `Save` button to store your configuration. +1. Start the add-on. +1. Check the logs of the add-on to see if everything went well. +1. Carefully configure the add-on to your preferences, see the official documentation for for that. + +[repository]: https://github.com/alexbelgium/hassio-addons +[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg +[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg +[armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg diff --git a/binance-trading-bot/apparmor.txt b/binance-trading-bot/apparmor.txt new file mode 100644 index 000000000..93d13b450 --- /dev/null +++ b/binance-trading-bot/apparmor.txt @@ -0,0 +1,66 @@ +#include + +profile db21ed7f_binance-trading-bot flags=(attach_disconnected,mediate_deleted) { + #include + + capability, + file, + signal, + mount, + umount, + remount, + network udp, + network tcp, + network dgram, + network stream, + network inet, + network inet6, + network netlink raw, + network unix dgram, + + capability setgid, + capability setuid, + capability sys_admin, + capability dac_read_search, + # capability dac_override, + # capability sys_rawio, + +# S6-Overlay + /init ix, + /run/{s6,s6-rc*,service}/** ix, + /package/** ix, + /command/** ix, + /run/{,**} rwk, + /dev/tty rw, + /bin/** ix, + /usr/bin/** ix, + /usr/lib/bashio/** ix, + /etc/s6/** rix, + /run/s6/** rix, + /etc/services.d/** rwix, + /etc/cont-init.d/** rwix, + /etc/cont-finish.d/** rwix, + /init rix, + /var/run/** mrwkl, + /var/run/ mrwkl, + /dev/i2c-1 mrwkl, + # Files required + /dev/fuse mrwkl, + /dev/sda1 mrwkl, + /dev/sdb1 mrwkl, + /dev/nvme0 mrwkl, + /dev/nvme1 mrwkl, + /dev/mmcblk0p1 mrwkl, + /dev/* mrwkl, + /tmp/** mrkwl, + + # Data access + /data/** rw, + + # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container + ptrace (trace,read) peer=docker-default, + + # docker daemon confinement requires explict allow rule for signal + signal (receive) set=(kill,term) peer=/usr/bin/docker, + +} diff --git a/binance-trading-bot/build.json b/binance-trading-bot/build.json new file mode 100644 index 000000000..88ade2dce --- /dev/null +++ b/binance-trading-bot/build.json @@ -0,0 +1,9 @@ +{ + "build_from": { + "aarch64": "chrisleekr/binance-trading-bot:latest", + "amd64": "chrisleekr/binance-trading-bot:latest" + }, + "codenotary": { + "signer": "alexandrep.github@gmail.com" + } +} diff --git a/binance-trading-bot/config.json b/binance-trading-bot/config.json new file mode 100644 index 000000000..9a124ed63 --- /dev/null +++ b/binance-trading-bot/config.json @@ -0,0 +1,59 @@ +{ + "arch": [ + "aarch64", + "amd64" + ], + "codenotary": "alexandrep.github@gmail.com", + "description": "Automated Binance trading bot - Trade multiple cryptocurrencies. Buy low/sell high with Grid Trading. Integrated with TradingView technical analysis", + "environment": { + "BINANCE_REDIS_HOST": "localhost", + "BINANCE_REDIS_PASSWORD": "", + "BINANCE_REDIS_PORT": "6379", + "PYTHONUNBUFFERED": "1", + "TRADINGVIEW_LOG_LEVEL": "INFO" + }, + "image": "ghcr.io/alexbelgium/binance_trading_bot-{arch}", + "ingress": true, + "ingress_stream": true, + "map": [ + "config:rw" + ], + "name": "Binance Trading Bot", + "options": { + "BINANCE_AUTHENTICATION_ENABLED": true, + "BINANCE_AUTHENTICATION_PASSWORD": null, + "BINANCE_MODE": "test", + "BINANCE_SLACK_ENABLED": false + }, + "panel_icon": "mdi:bitcoin", + "ports": { + "80/tcp": null, + "8080/tcp": null + }, + "ports_description": { + "80/tcp": "Web UI port", + "8080/tcp": "Trading View port" + }, + "privileged": [ + "SYS_ADMIN", + "DAC_READ_SEARCH" + ], + "schema": { + "BINANCE_AUTHENTICATION_ENABLED": "bool", + "BINANCE_AUTHENTICATION_PASSWORD": "str", + "BINANCE_LIVE_API_KEY": "str?", + "BINANCE_LIVE_SECRET_KEY": "str?", + "BINANCE_LOCAL_TUNNEL_ENABLED": "bool?", + "BINANCE_LOCAL_TUNNEL_SUBDOMAIN": "str?", + "BINANCE_MODE": "list(live|test)", + "BINANCE_SLACK_CHANNEL": "str?", + "BINANCE_SLACK_ENABLED": "bool?", + "BINANCE_SLACK_USERNAME": "str?", + "BINANCE_SLACK_WEBHOOK_URL": "str?", + "BINANCE_TEST_API_KEY": "str?", + "BINANCE_TEST_SECRET_KEY": "str?" + }, + "slug": "binance-trading-bot", + "url": "https://github.com/alexbelgium/hassio-addons", + "version": "0.0.97" +} diff --git a/binance-trading-bot/icon.png b/binance-trading-bot/icon.png new file mode 100644 index 000000000..8681d3bd3 Binary files /dev/null and b/binance-trading-bot/icon.png differ diff --git a/binance-trading-bot/logo.png b/binance-trading-bot/logo.png new file mode 100644 index 000000000..8681d3bd3 Binary files /dev/null and b/binance-trading-bot/logo.png differ diff --git a/binance-trading-bot/rootfs/entrypoint.sh b/binance-trading-bot/rootfs/entrypoint.sh new file mode 100755 index 000000000..68c3fec4d --- /dev/null +++ b/binance-trading-bot/rootfs/entrypoint.sh @@ -0,0 +1,16 @@ +#!/bin/bash +echo "Starting..." + +#################### +# Starting scripts # +#################### + +for SCRIPTS in /etc/cont-init.d/*; do + [ -e "$SCRIPTS" ] || continue + echo "$SCRIPTS: executing" + chown "$(id -u)":"$(id -g)" "$SCRIPTS" + chmod a+x "$SCRIPTS" + # Change shebang if no s6 supervision + sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" + /."$SCRIPTS" || echo "$SCRIPTS: exiting $?" +done diff --git a/binance-trading-bot/rootfs/etc/cont-init.d/20-folders.sh b/binance-trading-bot/rootfs/etc/cont-init.d/20-folders.sh new file mode 100755 index 000000000..5ea416f2c --- /dev/null +++ b/binance-trading-bot/rootfs/etc/cont-init.d/20-folders.sh @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash + +if [ -d /config/binance-trading-bot ]; then + echo "Moving to new location /config/addons_config/binance-trading-bot" + mkdir -p /config/addons_config/binance-trading-bot + chmod 777 /config/addons_config/binance-trading-bot + mv /config/binance-trading-bot/* /config/addons_config/binance-trading-bot/ + rm -r /config/binance-trading-bot +fi + +if [ ! -d /config/addons_config/binance-trading-bot ]; then + echo "Creating /config/addons_config/binance-trading-bot" + mkdir -p /config/addons_config/binance-trading-bot + chmod 777 /config/addons_config/binance-trading-bot +fi diff --git a/binance-trading-bot/rootfs/etc/cont-init.d/32-ingress.sh b/binance-trading-bot/rootfs/etc/cont-init.d/32-ingress.sh new file mode 100755 index 000000000..5628d4868 --- /dev/null +++ b/binance-trading-bot/rootfs/etc/cont-init.d/32-ingress.sh @@ -0,0 +1,16 @@ +#!/usr/bin/bashio +# shellcheck shell=bash + +################# +# NGINX SETTING # +################# +declare ingress_interface +declare ingress_port + +ingress_port="$(bashio::addon.ingress_port)" +ingress_interface="$(bashio::addon.ip_address)" +ingress_entry=$(bashio::addon.ingress_entry) +sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf +sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf +sed -i "s|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf + diff --git a/binance-trading-bot/rootfs/etc/cont-init.d/99-run.sh b/binance-trading-bot/rootfs/etc/cont-init.d/99-run.sh new file mode 100755 index 000000000..892a8b77b --- /dev/null +++ b/binance-trading-bot/rootfs/etc/cont-init.d/99-run.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bashio +# shellcheck shell=bash + +############## +# Export env # +############## + +################## +# Starting redis # +################## +exec redis-server & bashio::log.info "Starting redis" + +#################### +# Starting mongodb # +#################### +mkdir -p /data/db +exec mongod --bind_ip 127.0.0.1 & bashio::log.info "Starting mongod" + +################ +# Starting app # +################ +cd /srv || true +npm start docker-entrypoint.sh & bashio::log.info "Starting binance bot" + +######################### +# Starting Trading View # +######################### +python main.py & bashio::log.info "Starting trading view" + +################## +# Starting nginx # +################## +nginx diff --git a/binance-trading-bot/rootfs/etc/nginx/includes/mime.types b/binance-trading-bot/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..7c7cdef2d --- /dev/null +++ b/binance-trading-bot/rootfs/etc/nginx/includes/mime.types @@ -0,0 +1,96 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/binance-trading-bot/rootfs/etc/nginx/includes/proxy_params.conf b/binance-trading-bot/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..10585e29f --- /dev/null +++ b/binance-trading-bot/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,15 @@ +proxy_http_version 1.1; +proxy_ignore_client_abort off; +proxy_read_timeout 86400s; +proxy_redirect off; +proxy_send_timeout 86400s; +proxy_max_temp_file_size 0; + +proxy_set_header Host $host; +proxy_set_header Accept-Encoding ""; +proxy_set_header Connection $connection_upgrade; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header X-NginX-Proxy true; +proxy_set_header X-Real-IP $remote_addr; diff --git a/binance-trading-bot/rootfs/etc/nginx/includes/resolver.conf b/binance-trading-bot/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..6485af141 --- /dev/null +++ b/binance-trading-bot/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11; diff --git a/binance-trading-bot/rootfs/etc/nginx/includes/server_params.conf b/binance-trading-bot/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..a0ff6baa0 --- /dev/null +++ b/binance-trading-bot/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,5 @@ +server_name $hostname; + +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +add_header X-Robots-Tag none; diff --git a/binance-trading-bot/rootfs/etc/nginx/includes/ssl_params.conf b/binance-trading-bot/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6f1500599 --- /dev/null +++ b/binance-trading-bot/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,9 @@ +ssl_protocols TLSv1.2; +ssl_prefer_server_ciphers on; +ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; +ssl_ecdh_curve secp384r1; +ssl_session_timeout 10m; +ssl_session_cache shared:SSL:10m; +ssl_session_tickets off; +ssl_stapling on; +ssl_stapling_verify on; diff --git a/binance-trading-bot/rootfs/etc/nginx/nginx.conf b/binance-trading-bot/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..6d99eb7bc --- /dev/null +++ b/binance-trading-bot/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,55 @@ +# Run nginx in foreground. +daemon off; + +# This is run inside Docker. +user root; + +# Pid storage location. +pid /var/run/nginx.pid; + +# Set number of worker processes. +worker_processes 1; + +# Enables the use of JIT for regular expressions to speed-up their processing. +pcre_jit on; + +# Write error log to Hass.io add-on log. +error_log /proc/1/fd/1 error; + +# Load allowed environment vars +env HASSIO_TOKEN; + +# Load dynamic modules. +include /etc/nginx/modules/*.conf; + +# Max num of simultaneous connections by a worker process. +events { + worker_connections 512; +} + +http { + include /etc/nginx/includes/mime.types; + + log_format hassio '[$time_local] $status ' + '$http_x_forwarded_for($remote_addr) ' + '$request ($http_user_agent)'; + + access_log /proc/1/fd/1 hassio; + client_max_body_size 4G; + default_type application/octet-stream; + gzip on; + keepalive_timeout 65; + sendfile on; + server_tokens off; + tcp_nodelay on; + tcp_nopush on; + + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; + } + + include /etc/nginx/includes/resolver.conf; + + include /etc/nginx/servers/*.conf; +} diff --git a/binance-trading-bot/rootfs/etc/nginx/servers/ingress.conf b/binance-trading-bot/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..c1540b7a7 --- /dev/null +++ b/binance-trading-bot/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,18 @@ +server { + listen %%interface%%:%%port%% default_server; + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + client_max_body_size 0; + +location / { + proxy_pass http://127.0.0.1:80; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + sub_filter_once off; + sub_filter_types *; + proxy_set_header Accept-Encoding ""; + sub_filter "location.port!==80?':'+location.port:''}" "location.port!==80?':'+location.port:''}%%ingress_entry%%/"; + sub_filter /auth %%ingress_entry%%/auth; + } +} diff --git a/binance-trading-bot/stats.png b/binance-trading-bot/stats.png new file mode 100644 index 000000000..965a24d94 Binary files /dev/null and b/binance-trading-bot/stats.png differ diff --git a/binance-trading-bot/translations/en.yaml b/binance-trading-bot/translations/en.yaml new file mode 100644 index 000000000..f5df557fd --- /dev/null +++ b/binance-trading-bot/translations/en.yaml @@ -0,0 +1,662 @@ +--- +configuration: + additional_apps: + name: additional_apps + description: Additional apps to install at boot + allow_ipv6: + name: allow_ipv6 + description: Enables ipv6 in the addon + ALLOW_SIGNUP: + name: ALLOW_SIGNUP + description: See upstream app documentation + ALLOWED_HOSTS: + name: ALLOWED_HOSTS + description: See upstream app documentation + APP_BASE_URL: + name: APP_BASE_URL + description: See upstream app documentation + APP_KEY: + name: APP_KEY + description: See upstream app documentation + APP_NAME: + name: APP_NAME + description: See upstream app documentation + append_myip: + name: append_myip + description: See upstream app documentation + auto_restart: + name: auto_restart + description: See upstream app documentation + BACKUP_PATH: + name: BACKUP_PATH + description: See upstream app documentation + base_folder: + name: base_folder + description: See upstream app documentation + BASE_URL: + name: BASE_URL + description: See upstream app documentation + base_url_portless: + name: base_url_portless + description: See upstream app documentation + certfile: + name: certfile + description: "fullchain.pem #ssl certificate, must be located in /ssl" + checkip_command: + name: checkip_command + description: See upstream app documentation + checkip_path: + name: checkip_path + description: See upstream app documentation + checkip_server: + name: checkip_server + description: See upstream app documentation + checkip_ssl: + name: checkip_ssl + description: See upstream app documentation + cifsdomain: + name: cifsdomain + description: Allow setting the domain for the smb share + cifspassword: + name: cifspassword + description: Your password to access your SMB share, same for all smb shares + cifsusername: + name: cifsusername + description: Your username to access your SMB share, same for all smb shares + claim: + name: claim + description: See upstream app documentation + CLI_ARGS: + name: CLI_ARGS + description: See upstream app documentation + COLLECTOR_API_ENDPOINT: + name: COLLECTOR_API_ENDPOINT + description: See upstream app documentation + COLLECTOR_HOST_ID: + name: COLLECTOR_HOST_ID + description: See upstream app documentation + CONFIG_LOCATION: + name: CONFIG_LOCATION + description: See upstream app documentation + CUSTOM_OPTIONS: + name: CUSTOM_OPTIONS + description: See upstream app documentation + custom_provider: + name: custom_provider + description: See upstream app documentation + customUI: + name: customUI + description: selection from list # alternative webUI can be set here + data_directory: + name: data_directory + description: See upstream app documentation + data_location: + name: data_location + description: Where do you want your data stored + database: + name: database + description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui + DB_CLIENT: + name: DB_CLIENT + description: See upstream app documentation + DB_CONNECTION: + name: DB_CONNECTION + description: See upstream app documentation + DB_DATABASE: + name: DB_DATABASE + description: See upstream app documentation + DB_DATABASE_NAME: + name: DB_DATABASE_NAME + description: If using external postgresql + DB_HOST: + name: DB_HOST + description: See upstream app documentation + DB_HOSTNAME: + name: DB_HOSTNAME + description: If using external database + DB_PASSWORD: + name: DB_PASSWORD + description: If using external database + DB_PORT: + name: DB_PORT + description: If using external database + DB_TYPE: + name: DB_TYPE + description: See upstream app documentation + DB_USERNAME: + name: DB_USERNAME + description: If using external database + ddns_path: + name: ddns_path + description: See upstream app documentation + ddns_server: + name: ddns_server + description: See upstream app documentation + DEBUG: + name: DEBUG + description: See upstream app documentation + DISABLE_MACHINE_LEARNING: + name: DISABLE_MACHINE_LEARNING + description: See upstream app documentation + DNS_server: + name: DNS_server + description: See upstream app documentation + DOCKER_MODS: + name: DOCKER_MODS + description: See upstream app documentation + DOMAIN: + name: DOMAIN + description: See upstream app documentation + download_dir: + name: download_dir + description: See upstream app documentation + downloads_location: + name: downloads_location + description: See upstream app documentation + DROPBOX_TOKEN: + name: DROPBOX_TOKEN + description: See upstream app documentation + edge_repositories: + name: edge_repositories + description: See upstream app documentation + elasticsearch_server: + name: elasticsearch_server + description: See upstream app documentation + expose_collector: + name: expose_collector + description: See upstream app documentation + EXTENSIONS: + name: EXTENSIONS + description: See upstream app documentation + extraction_path: + name: extraction_path + description: See upstream app documentation + fake_address: + name: fake_address + description: See upstream app documentation + FG_LOG_LEVEL: + name: FG_LOG_LEVEL + description: See upstream app documentation + FG_PLUGINS: + name: FG_PLUGINS + description: See upstream app documentation + FIREFLY_III_ACCESS_TOKEN: + name: FIREFLY_III_ACCESS_TOKEN + description: See upstream app documentation + FIREFLY_III_CLIENT_ID: + name: FIREFLY_III_CLIENT_ID + description: See upstream app documentation + FIREFLY_III_URL: + name: FIREFLY_III_URL + description: See upstream app documentation + forced_update: + name: forced_update + description: See upstream app documentation + Full_Text_Search: + name: Full_Text_Search + description: See upstream app documentation + gitapi: + name: gitapi + description: See upstream app documentation + gitmail: + name: gitmail + description: See upstream app documentation + gitpass: + name: gitpass + description: See upstream app documentation + gituser: + name: gituser + description: See upstream app documentation + graphic_drivers: + name: graphic_drivers + description: See upstream app documentation + hostname: + name: hostname + description: See upstream app documentation + HTTPS_ONLY: + name: HTTPS_ONLY + description: See upstream app documentation + iface: + name: iface + description: See upstream app documentation + Images_location: + name: Images_location + description: See upstream app documentation + imaphost: + name: imaphost + description: See upstream app documentation + imappassword: + name: imappassword + description: See upstream app documentation + imapusername: + name: imapusername + description: See upstream app documentation + import_dir: + name: import_dir + description: See upstream app documentation + IMPORT_PATH: + name: IMPORT_PATH + description: See upstream app documentation + incomplete_dir: + name: incomplete_dir + description: See upstream app documentation + ingress_disabled: + name: ingress_disabled + description: See upstream app documentation + ingress_user: + name: ingress_user + description: See upstream app documentation + INTERFACE_NAME: + name: INTERFACE_NAME + description: See upstream app documentation + iterations: + name: iterations + description: See upstream app documentation + JWT_SECRET: + name: JWT_SECRET + description: Used to sign the authentication keys for user login + KEYBOARD: + name: KEYBOARD + description: See upstream app documentation + keyfile: + name: keyfile + description: privkey.pem #sslkeyfile, must be located in /ssl + LOCAL_NETWORK: + name: LOCAL_NETWORK + description: See upstream app documentation + localdisks: + name: localdisks + description: Physical name of the partition (ex. sda1) or the share (ex. SharedFiles) to mount separated by commas (ex. sda1,sdb1,MYNAS) + log_level: + name: log_level + description: See upstream app documentation + MAILER_AUTH_PASSWORD: + name: MAILER_AUTH_PASSWORD + description: See upstream app documentation + MAILER_AUTH_USER: + name: MAILER_AUTH_USER + description: See upstream app documentation + MAILER_ENABLED: + name: MAILER_ENABLED + description: See upstream app documentation + OPENVPN_PROVIDER: + name: OPENVPN_PROVIDER + description: See upstream app documentation + OPENVPN_USERNAME: + name: OPENVPN_USERNAME + description: See upstream app documentation + ORIGINALS_PATH: + name: ORIGINALS_PATH + description: See upstream app documentation + PAPERLESS_OCR_MODE: + name: PAPERLESS_OCR_MODE + description: See upstream app documentation + PAPERLESS_URL: + name: PAPERLESS_URL + description: See upstream app documentation + pass: + name: pass + description: See upstream app documentation + password: + name: password + description: See upstream app documentation + period: + name: period + description: See upstream app documentation + PGID: + name: PGID + description: The user group ID, as described in https://docs.linuxserver.io/general/understanding-puid-and-pgid + PMM_CONFIG: + name: PMM_CONFIG + description: See upstream app documentation + PMM_NO_MISSING: + name: PMM_NO_MISSING + description: See upstream app documentation + PMM_RUN: + name: PMM_RUN + description: See upstream app documentation + PMM_TEST: + name: PMM_TEST + description: See upstream app documentation + PMM_TIME: + name: PMM_TIME + description: See upstream app documentation + POSTGRES_DATABASE: + name: POSTGRES_DATABASE + description: See upstream app documentation + POSTGRES_DB: + name: POSTGRES_DB + description: See upstream app documentation + POSTGRES_HOST: + name: POSTGRES_HOST + description: See upstream app documentation + POSTGRES_PASSWORD: + name: POSTGRES_PASSWORD + description: See upstream app documentation + POSTGRES_PORT: + name: POSTGRES_PORT + description: See upstream app documentation + POSTGRES_USER: + name: POSTGRES_USER + description: See upstream app documentation + provider: + name: provider + description: See upstream app documentation + providers: + name: providers + description: See upstream app documentation + proxied: + name: proxied + description: See upstream app documentation + PUID: + name: PUID + description: The user group ID, as described in https://docs.linuxserver.io/general/understanding-puid-and-pgid + remote_mysql_database: + name: remote_mysql_database + description: See upstream app documentation + remote_mysql_host: + name: remote_mysql_host + description: See upstream app documentation + remote_mysql_password: + name: remote_mysql_password + description: See upstream app documentation + remote_mysql_port: + name: remote_mysql_port + description: See upstream app documentation + remote_mysql_username: + name: remote_mysql_username + description: See upstream app documentation + repository: + name: repository + description: See upstream app documentation + request_size_limit: + name: request_size_limit + description: See upstream app documentation + ROOT_URL: + name: ROOT_URL + description: See upstream app documentation + ROUTER_IP: + name: ROUTER_IP + description: See upstream app documentation + rpi_video_drivers: + name: rpi_video_drivers + description: See upstream app documentation + run_duration: + name: run_duration + description: 12h #for how long should the addon run. Must be formatted as number + time unit (ex : 5s, or 2m, or 12h, or 5d...) + SavePath: + name: SavePath + description: See upstream app documentation + SEAFILE_ADMIN_EMAIL: + name: SEAFILE_ADMIN_EMAIL + description: See upstream app documentation + SEAFILE_ADMIN_PASSWORD: + name: SEAFILE_ADMIN_PASSWORD + description: See upstream app documentation + SECRET_KEY: + name: SECRET_KEY + description: See upstream app documentation + secret_token: + name: secret_token + description: See upstream app documentation + secure_ssl: + name: secure_ssl + description: See upstream app documentation + silent: + name: silent + description: "true #suppresses debug messages" + SMARTCTL_COMMAND_DEVICE_TYPE: + name: SMARTCTL_COMMAND_DEVICE_TYPE + description: See upstream app documentation + SMARTCTL_MEGARAID_DISK_NUM: + name: SMARTCTL_MEGARAID_DISK_NUM + description: See upstream app documentation + smbv1: + name: smbv1 + description: See upstream app documentation + SPECTRE_APP_ID: + name: SPECTRE_APP_ID + description: See upstream app documentation + SPECTRE_SECRET: + name: SPECTRE_SECRET + description: See upstream app documentation + ssl: + name: ssl + description: true/false. enables ssl. Need certfile and keyfile filled' + storage_dir: + name: storage_dir + description: See upstream app documentation + STORAGE_PATH: + name: STORAGE_PATH + description: See upstream app documentation + theme: + name: theme + description: See upstream app documentation + TRANSMISSION_DOWNLOAD_DIR: + name: TRANSMISSION_DOWNLOAD_DIR + description: See upstream app documentation + TRANSMISSION_HOME: + name: TRANSMISSION_HOME + description: See upstream app documentation + TRANSMISSION_INCOMPLETE_DIR: + name: TRANSMISSION_INCOMPLETE_DIR + description: See upstream app documentation + TRANSMISSION_V3_UPDATE: + name: TRANSMISSION_V3_UPDATE + description: See upstream app documentation + TRANSMISSION_WATCH_DIR: + name: TRANSMISSION_WATCH_DIR + description: See upstream app documentation + TRANSMISSION_WEB_UI: + name: TRANSMISSION_WEB_UI + description: See upstream app documentation + trusted_domains: + name: trusted_domains + description: See upstream app documentation + trusted_headers: + name: trusted_headers + description: See upstream app documentation + ttl: + name: ttl + description: See upstream app documentation + TZ: + name: TZ + description: The timezone, as described in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones + ui_path: + name: ui_path + description: See upstream app documentation + Updates: + name: Updates + description: See upstream app documentation + UPLOAD_NSFW: + name: UPLOAD_NSFW + description: See upstream app documentation + URL: + name: URL + description: See upstream app documentation + use_own_certs: + name: use_own_certs + description: See upstream app documentation + user: + name: user + description: See upstream app documentation + user_agent: + name: user_agent + description: See upstream app documentation + username: + name: username + description: See upstream app documentation + verbose: + name: verbose + description: See upstream app documentation + verify_address: + name: verify_address + description: See upstream app documentation + watch_dir: + name: watch_dir + description: See upstream app documentation + watch_path: + name: watch_path + description: See upstream app documentation + WebuiPass: + name: WebuiPass + description: See upstream app documentation + whitelist: + name: whitelist + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' + WHOOGLE_ALT_IG: + name: WHOOGLE_ALT_IG + description: See upstream app documentation + WHOOGLE_ALT_MD: + name: WHOOGLE_ALT_MD + description: See upstream app documentation + WHOOGLE_ALT_RD: + name: WHOOGLE_ALT_RD + description: See upstream app documentation + WHOOGLE_ALT_TL: + name: WHOOGLE_ALT_TL + description: See upstream app documentation + WHOOGLE_ALT_TW: + name: WHOOGLE_ALT_TW + description: See upstream app documentation + WHOOGLE_ALT_YT: + name: WHOOGLE_ALT_YT + description: See upstream app documentation + WHOOGLE_AUTOCOMPLETE: + name: WHOOGLE_AUTOCOMPLETE + description: See upstream app documentation + WHOOGLE_CONFIG_ALTS: + name: WHOOGLE_CONFIG_ALTS + description: See upstream app documentation + WHOOGLE_CONFIG_BLOCK: + name: WHOOGLE_CONFIG_BLOCK + description: See upstream app documentation + WHOOGLE_CONFIG_COUNTRY: + name: WHOOGLE_CONFIG_COUNTRY + description: See upstream app documentation + WHOOGLE_CONFIG_DISABLE: + name: WHOOGLE_CONFIG_DISABLE + description: See upstream app documentation + WHOOGLE_CONFIG_GET_ONLY: + name: WHOOGLE_CONFIG_GET_ONLY + description: See upstream app documentation + WHOOGLE_CONFIG_LANGUAGE: + name: WHOOGLE_CONFIG_LANGUAGE + description: See upstream app documentation + WHOOGLE_CONFIG_NEAR: + name: WHOOGLE_CONFIG_NEAR + description: See upstream app documentation + WHOOGLE_CONFIG_NEW_TAB: + name: WHOOGLE_CONFIG_NEW_TAB + description: See upstream app documentation + WHOOGLE_CONFIG_SAFE: + name: WHOOGLE_CONFIG_SAFE + description: See upstream app documentation + WHOOGLE_CONFIG_SEARCH_LANGUAGE: + name: WHOOGLE_CONFIG_SEARCH_LANGUAGE + description: See upstream app documentation + WHOOGLE_CONFIG_THEME: + name: WHOOGLE_CONFIG_THEME + description: See upstream app documentation + WHOOGLE_CONFIG_URL: + name: WHOOGLE_CONFIG_URL + description: See upstream app documentation + WHOOGLE_CONFIG_VIEW_IMAGE: + name: WHOOGLE_CONFIG_VIEW_IMAGE + description: See upstream app documentation + WHOOGLE_CSP: + name: WHOOGLE_CSP + description: See upstream app documentation + WHOOGLE_MINIMAL: + name: WHOOGLE_MINIMAL + description: See upstream app documentation + WHOOGLE_PASS: + name: WHOOGLE_PASS + description: See upstream app documentation + WHOOGLE_PROXY_LOC: + name: WHOOGLE_PROXY_LOC + description: See upstream app documentation + WHOOGLE_PROXY_PASS: + name: WHOOGLE_PROXY_PASS + description: See upstream app documentation + WHOOGLE_PROXY_TYPE: + name: WHOOGLE_PROXY_TYPE + description: See upstream app documentation + WHOOGLE_PROXY_USER: + name: WHOOGLE_PROXY_USER + description: See upstream app documentation + WHOOGLE_RESULTS_PER_PAGE: + name: WHOOGLE_RESULTS_PER_PAGE + description: See upstream app documentation + WHOOGLE_USER: + name: WHOOGLE_USER + description: See upstream app documentation + wildcard: + name: wildcard + description: See upstream app documentation" + MAILER_HOST: + name: MAILER_HOST + description: See upstream app documentation + MAILER_NOREPLY_EMAIL: + name: MAILER_NOREPLY_EMAIL + description: See upstream app documentation + MAILER_NOREPLY_NAME: + name: MAILER_NOREPLY_NAME + description: See upstream app documentation + MAILER_PORT: + name: MAILER_PORT + description: See upstream app documentation + MAILER_SECURITY: + name: MAILER_SECURITY + description: See upstream app documentation + maxmem: + name: maxmem + description: See upstream app documentation + Mode: + name: Mode + description: See upstream app documentation + mqtt_autodiscover: + name: mqtt_autodiscover + description: See upstream app documentation + networkdisks: + name: networkdisks + description: list of smb servers to mount, separated by commas (//xxx.xx.xx.xx/share) + NoAuth: + name: NoAuth + description: See upstream app documentation + NORDIGEN_ID: + name: NORDIGEN_ID + description: See upstream app documentation + NORDIGEN_KEY: + name: NORDIGEN_KEY + description: See upstream app documentation + OAUTHLIB_RELAX_TOKEN_SCOPE: + name: OAUTHLIB_RELAX_TOKEN_SCOPE + description: See upstream app documentation + OCR: + name: OCR + description: See upstream app documentation + ocrlang: + name: ocrlang + description: See upstream app documentation + openvpn_alt_mode: + name: openvpn_alt_mode + description: bind at container level and not app level + openvpn_config: + name: openvpn_config + description: for example ""config.ovpn"" # name of the file located in /config/openvpn + OPENVPN_CUSTOM_PROVIDER: + name: OPENVPN_CUSTOM_PROVIDER + description: See upstream app documentation + OPENVPN_CUSTOM_PROVIDER_OVPN_LOCATION: + name: OPENVPN_CUSTOM_PROVIDER_OVPN_LOCATION + description: See upstream app documentation + openvpn_enabled: + name: openvpn_enabled + description: See upstream app documentation + OPENVPN_PASSWORD: + name: OPENVPN_PASSWORD + description: See upstream app documentation diff --git a/binance-trading-bot/updater.json b/binance-trading-bot/updater.json new file mode 100644 index 000000000..d410190ef --- /dev/null +++ b/binance-trading-bot/updater.json @@ -0,0 +1,9 @@ +{ + "github_beta": "true", + "last_update": "24-03-2023", + "repository": "alexbelgium/hassio-addons", + "slug": "binance-trading-bot", + "source": "github", + "upstream_repo": "chrisleekr/binance-trading-bot", + "upstream_version": "0.0.97" +} diff --git a/bitwarden/CHANGELOG.md b/bitwarden/CHANGELOG.md index 3735f8cdf..9f4201c27 100644 --- a/bitwarden/CHANGELOG.md +++ b/bitwarden/CHANGELOG.md @@ -1,4 +1,11 @@ +## 1.28.1 (08-04-2023) +- Update to latest version from dani-garcia/bitwarden_rs + +## 1.28.0 (31-03-2023) +- Update to latest version from dani-garcia/bitwarden_rs +- Implemented healthcheck + ## 1.27.0 (25-12-2022) - Update to latest version from dani-garcia/bitwarden_rs - WARNING : update to supervisor 2022.11 before installing diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index 6c5f6deb3..4f23cc078 100644 --- a/bitwarden/Dockerfile +++ b/bitwarden/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.2.2 ARG BUILD_VERSION -ARG BUILD_UPSTREAM="1.27.0" +ARG BUILD_UPSTREAM="1.28.1" FROM "vaultwarden/server:${BUILD_UPSTREAM}" as vaultwarden FROM ${BUILD_FROM} SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -114,3 +114,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="80" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/bitwarden/README.md b/bitwarden/README.md index 4c2d49e0d..c70d0a103 100644 --- a/bitwarden/README.md +++ b/bitwarden/README.md @@ -16,7 +16,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) + +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/bitwarden/stats.png) ## About diff --git a/bitwarden/config.json b/bitwarden/config.json index a5005d809..51d35c53c 100644 --- a/bitwarden/config.json +++ b/bitwarden/config.json @@ -32,6 +32,6 @@ }, "slug": "bitwarden", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/bitwarden", - "version": "1.27.0", + "version": "1.28.1", "webui": "[PROTO:ssl]://[HOST]:[PORT:7277]" } diff --git a/bitwarden/stats.png b/bitwarden/stats.png new file mode 100644 index 000000000..b68603154 Binary files /dev/null and b/bitwarden/stats.png differ diff --git a/bitwarden/translations/en.yaml b/bitwarden/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/bitwarden/translations/en.yaml +++ b/bitwarden/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/bitwarden/updater.json b/bitwarden/updater.json index 8d99ae61d..fb7394ac3 100644 --- a/bitwarden/updater.json +++ b/bitwarden/updater.json @@ -1,8 +1,8 @@ { - "last_update": "25-12-2022", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "bitwarden", "source": "github", "upstream_repo": "dani-garcia/bitwarden_rs", - "upstream_version": "1.27.0" + "upstream_version": "1.28.1" } diff --git a/booksonic_air/CHANGELOG.md b/booksonic_air/CHANGELOG.md index d4e964d2a..d585e0d00 100644 --- a/booksonic_air/CHANGELOG.md +++ b/booksonic_air/CHANGELOG.md @@ -1,4 +1,20 @@ +## v2201.1.0-ls87 (08-04-2023) +- Update to latest version from linuxserver/docker-booksonic-air + +## v2201.1.0-ls85 (31-03-2023) +- Update to latest version from linuxserver/docker-booksonic-air + +## v2201.1.0-ls84 (11-03-2023) +- Update to latest version from linuxserver/docker-booksonic-air +- Implemented healthcheck + +## v2201.1.0-ls83 (04-03-2023) +- Update to latest version from linuxserver/docker-booksonic-air + +## v2201.1.0-ls82 (25-02-2023) +- Update to latest version from linuxserver/docker-booksonic-air + ## v2201.1.0-ls81 (19-02-2023) - Update to latest version from linuxserver/docker-booksonic-air diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index cb6170f81..c4b9682b0 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -68,7 +68,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -132,3 +132,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="4040" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/booksonic_air/README.md b/booksonic_air/README.md index af33c56ae..faf4336b7 100644 --- a/booksonic_air/README.md +++ b/booksonic_air/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/booksonic_air/stats.png) ## About diff --git a/booksonic_air/config.json b/booksonic_air/config.json index 0afa7025c..74c338f92 100644 --- a/booksonic_air/config.json +++ b/booksonic_air/config.json @@ -77,6 +77,6 @@ }, "slug": "booksonic-air_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/booksonic_air", - "version": "v2201.1.0-ls81-2", + "version": "v2201.1.0-ls87", "webui": "[PROTO:ssl]://[HOST]:[PORT:4040]" } diff --git a/booksonic_air/translations/en.yaml b/booksonic_air/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/booksonic_air/translations/en.yaml +++ b/booksonic_air/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/booksonic_air/updater.json b/booksonic_air/updater.json index 15ccdce98..a89f2484a 100644 --- a/booksonic_air/updater.json +++ b/booksonic_air/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "booksonic_air", "source": "github", "upstream_repo": "linuxserver/docker-booksonic-air", - "upstream_version": "v2201.1.0-ls81" + "upstream_version": "v2201.1.0-ls87" } diff --git a/browserless_chrome/CHANGELOG.md b/browserless_chrome/CHANGELOG.md index 2a1ec1e41..5421f6123 100644 --- a/browserless_chrome/CHANGELOG.md +++ b/browserless_chrome/CHANGELOG.md @@ -1,4 +1,8 @@ +## 1.58.0 (18-03-2023) +- Update to latest version from browserless/chrome +- Implemented healthcheck + ## 0.0.0 (19-02-2023) - Update to latest version from browserless/chrome diff --git a/browserless_chrome/Dockerfile b/browserless_chrome/Dockerfile index 8c42ed380..888159ae7 100644 --- a/browserless_chrome/Dockerfile +++ b/browserless_chrome/Dockerfile @@ -100,3 +100,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="3000" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/browserless_chrome/README.md b/browserless_chrome/README.md index 399862daf..b0e471324 100644 --- a/browserless_chrome/README.md +++ b/browserless_chrome/README.md @@ -1,4 +1,3 @@ - # Home assistant add-on: Browserless Chrome [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/browserless_chrome/stats.png) ## About @@ -33,6 +33,7 @@ Webui can be found at . Configurations can be done through the app webUI, except for the following options ```yaml + ``` ## Installation diff --git a/browserless_chrome/config.json b/browserless_chrome/config.json index 622b2707e..7b3507e93 100644 --- a/browserless_chrome/config.json +++ b/browserless_chrome/config.json @@ -19,6 +19,6 @@ }, "slug": "browserless_chrome", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/browserless_chrome", - "version": "0.0.0-beta6", + "version": "1.58.0", "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" } diff --git a/browserless_chrome/rootfs/entrypoint.sh b/browserless_chrome/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/browserless_chrome/rootfs/entrypoint.sh +++ b/browserless_chrome/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/browserless_chrome/stats.png b/browserless_chrome/stats.png new file mode 100644 index 000000000..94f5d728c Binary files /dev/null and b/browserless_chrome/stats.png differ diff --git a/browserless_chrome/translations/en.yaml b/browserless_chrome/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/browserless_chrome/translations/en.yaml +++ b/browserless_chrome/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/browserless_chrome/updater.json b/browserless_chrome/updater.json index 3b959cfde..a135cd0eb 100644 --- a/browserless_chrome/updater.json +++ b/browserless_chrome/updater.json @@ -1,9 +1,9 @@ { "github_tagfilter": "v", - "last_update": "19-02-2023", + "last_update": "18-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "browserless_chrome", "source": "github", "upstream_repo": "browserless/chrome", - "upstream_version": "0.0.0" + "upstream_version": "1.58.0" } diff --git a/calibre/CHANGELOG.md b/calibre/CHANGELOG.md index 8a07fd530..fc52cffd4 100644 --- a/calibre/CHANGELOG.md +++ b/calibre/CHANGELOG.md @@ -1,3 +1,21 @@ +### v6.14.1-ls210 (09-04-2023) +- Minor bugs fixed + +## v6.15.0-ls211 (08-04-2023) +- Update to latest version from linuxserver/docker-calibre + +## v6.14.1-ls208 (31-03-2023) +- Update to latest version from linuxserver/docker-calibre + +## v6.14.1-ls207 (18-03-2023) +- Update to latest version from linuxserver/docker-calibre + +## v6.14.0-ls206 (11-03-2023) +- Update to latest version from linuxserver/docker-calibre +- Implemented healthcheck + +## v6.13.0-ls204 (04-03-2023) +- Update to latest version from linuxserver/docker-calibre ## v6.13.0-ls204 (21-02-2023) - Add wireless connection port diff --git a/calibre/Dockerfile b/calibre/Dockerfile index a004d0835..80f32a1ac 100644 --- a/calibre/Dockerfile +++ b/calibre/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="v6.7.1-ls186" +ARG BUILD_UPSTREAM="v6.14.1-ls210" FROM ${BUILD_FROM}${BUILD_UPSTREAM} ENV BASHIO_VERSION=1.29.1 @@ -72,7 +72,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -132,3 +132,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8080" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/calibre/README.md b/calibre/README.md index e34ec9e8f..52f821165 100644 --- a/calibre/README.md +++ b/calibre/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [Location of Calibre Database (opened 2023-02-20)](https://github.com/alexbelgium/hassio-addons/issues/723) by [@FancyNerd92](https://github.com/FancyNerd92) # Home assistant add-on: calibre [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/calibre/stats.png) ## About diff --git a/calibre/build.json b/calibre/build.json index 1e6e9770c..b76fe636f 100644 --- a/calibre/build.json +++ b/calibre/build.json @@ -1,9 +1,8 @@ { "build_from": { "aarch64": "lscr.io/linuxserver/calibre:arm64v8-", - "amd64": "lscr.io/linuxserver/calibre:amd64-", - "armv7": "lscr.io/linuxserver/calibre:arm32v7-" - }, + "amd64": "lscr.io/linuxserver/calibre:amd64-" + }, "codenotary": { "signer": "alexandrep.github@gmail.com" } diff --git a/calibre/config.json b/calibre/config.json index 56012a977..c40a3f3f5 100644 --- a/calibre/config.json +++ b/calibre/config.json @@ -1,8 +1,7 @@ { "arch": [ "aarch64", - "amd64", - "armv7" + "amd64" ], "codenotary": "alexandrep.github@gmail.com", "description": "e-book manager", @@ -92,6 +91,6 @@ }, "slug": "calibre", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre", - "version": "v6.13.0-ls203-2", + "version": "v6.14.1-ls210_reverted", "video": true } diff --git a/calibre/rootfs/etc/cont-init.d/31-correct_smb.sh b/calibre/rootfs/etc/cont-init.d/31-correct_smb.sh index 9f87d5c09..53d4711ba 100755 --- a/calibre/rootfs/etc/cont-init.d/31-correct_smb.sh +++ b/calibre/rootfs/etc/cont-init.d/31-correct_smb.sh @@ -1,5 +1,5 @@ #!/bin/bash -if [ -f /etc/cont-init.d/92-smb_mounts.sh ]; then - sed -i "s|cifs -o \"|cifs -o \"nobrl," /etc/cont-init.d/92-smb_mounts.sh +if [ -f /etc/cont-init.d/00-smb_mounts.sh ]; then + sed -i "s|cifs -o \"|cifs -o \"nobrl,|g" /etc/cont-init.d/00-smb_mounts.sh fi diff --git a/calibre/stats.png b/calibre/stats.png new file mode 100644 index 000000000..a03fef914 Binary files /dev/null and b/calibre/stats.png differ diff --git a/calibre/translations/en.yaml b/calibre/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/calibre/translations/en.yaml +++ b/calibre/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/calibre/updater.json b/calibre/updater.json index 095088c7c..538ea124c 100644 --- a/calibre/updater.json +++ b/calibre/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "19-02-2023", - "paused": false, + "last_update": "08-04-2023", + "paused": true, "repository": "alexbelgium/hassio-addons", "slug": "calibre", "source": "github", "upstream_repo": "linuxserver/docker-calibre", - "upstream_version": "v6.13.0-ls203" + "upstream_version": "v6.15.0-ls211" } diff --git a/calibre_web/CHANGELOG.md b/calibre_web/CHANGELOG.md index 0bb8d38dd..f93d7d674 100644 --- a/calibre_web/CHANGELOG.md +++ b/calibre_web/CHANGELOG.md @@ -1,4 +1,26 @@ +## 0.6.20-ls203 (01-04-2023) +- Update to latest version from linuxserver/docker-calibre-web + +## 0.6.20-ls202 (31-03-2023) +- Update to latest version from linuxserver/docker-calibre-web + +## 0.6.19-ls200 (24-03-2023) +- Update to latest version from linuxserver/docker-calibre-web + +## 0.6.19-ls199 (18-03-2023) +- Update to latest version from linuxserver/docker-calibre-web + +## 0.6.19-ls198 (11-03-2023) +- Update to latest version from linuxserver/docker-calibre-web +- Implemented healthcheck + +## 0.6.19-ls197 (04-03-2023) +- Update to latest version from linuxserver/docker-calibre-web + +## 0.6.19-ls196 (25-02-2023) +- Update to latest version from linuxserver/docker-calibre-web + ## 0.6.19-ls195 (19-02-2023) - Update to latest version from linuxserver/docker-calibre-web diff --git a/calibre_web/Dockerfile b/calibre_web/Dockerfile index a9582c65a..a0942ce00 100644 --- a/calibre_web/Dockerfile +++ b/calibre_web/Dockerfile @@ -71,7 +71,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -135,3 +135,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8083" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/calibre_web/README.md b/calibre_web/README.md index b94d74657..7fb1ad368 100644 --- a/calibre_web/README.md +++ b/calibre_web/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/calibre_web/stats.png) ## About diff --git a/calibre_web/config.json b/calibre_web/config.json index 0fef7ecef..7a77a8e7f 100644 --- a/calibre_web/config.json +++ b/calibre_web/config.json @@ -91,6 +91,6 @@ }, "slug": "calibre-web", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/calibre-web", - "version": "0.6.19-ls195-2", + "version": "0.6.20-ls203", "video": true } diff --git a/calibre_web/rootfs/etc/cont-init.d/31-correct_smb.sh b/calibre_web/rootfs/etc/cont-init.d/31-correct_smb.sh index 9f87d5c09..1f6b65e45 100755 --- a/calibre_web/rootfs/etc/cont-init.d/31-correct_smb.sh +++ b/calibre_web/rootfs/etc/cont-init.d/31-correct_smb.sh @@ -1,5 +1,5 @@ #!/bin/bash -if [ -f /etc/cont-init.d/92-smb_mounts.sh ]; then - sed -i "s|cifs -o \"|cifs -o \"nobrl," /etc/cont-init.d/92-smb_mounts.sh +if [ -f /etc/cont-init.d/00-smb_mounts.sh ]; then + sed -i "s|cifs -o \"|cifs -o \"nobrl," /etc/cont-init.d/00-smb_mounts.sh fi diff --git a/calibre_web/translations/en.yaml b/calibre_web/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/calibre_web/translations/en.yaml +++ b/calibre_web/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/calibre_web/updater.json b/calibre_web/updater.json index d2585be8b..154a6e607 100644 --- a/calibre_web/updater.json +++ b/calibre_web/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "19-02-2023", + "last_update": "01-04-2023", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "calibre-web", "source": "github", "upstream_repo": "linuxserver/docker-calibre-web", - "upstream_version": "0.6.19-ls195" + "upstream_version": "0.6.20-ls203" } diff --git a/cloudcommander/CHANGELOG.md b/cloudcommander/CHANGELOG.md index 635f49a57..96e288be3 100644 --- a/cloudcommander/CHANGELOG.md +++ b/cloudcommander/CHANGELOG.md @@ -1,4 +1,11 @@ +## 16.14.1 (24-03-2023) +- Update to latest version from coderaiser/cloudcmd + +## 16.14.0 (11-03-2023) +- Update to latest version from coderaiser/cloudcmd +- Implemented healthcheck + ## 16.13.1 (04-02-2023) - Update to latest version from coderaiser/cloudcmd diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 10ed3ef15..18f24544c 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -40,7 +40,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -101,3 +101,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8000" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/cloudcommander/README.md b/cloudcommander/README.md index 4dd9a7d9a..8e0791fde 100644 --- a/cloudcommander/README.md +++ b/cloudcommander/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/cloudcommander/stats.png) ## About diff --git a/cloudcommander/config.json b/cloudcommander/config.json index 23d0cacc8..26f26a035 100644 --- a/cloudcommander/config.json +++ b/cloudcommander/config.json @@ -76,5 +76,5 @@ }, "slug": "cloudcommander", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/cloudcommander", - "version": "16.13.1" + "version": "16.14.1" } diff --git a/cloudcommander/rootfs/entrypoint.sh b/cloudcommander/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/cloudcommander/rootfs/entrypoint.sh +++ b/cloudcommander/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/cloudcommander/stats.png b/cloudcommander/stats.png new file mode 100644 index 000000000..6a0cea4c5 Binary files /dev/null and b/cloudcommander/stats.png differ diff --git a/cloudcommander/translations/en.yaml b/cloudcommander/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/cloudcommander/translations/en.yaml +++ b/cloudcommander/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/cloudcommander/updater.json b/cloudcommander/updater.json index 9f185308c..71d31d64c 100644 --- a/cloudcommander/updater.json +++ b/cloudcommander/updater.json @@ -1,8 +1,8 @@ { - "last_update": "04-02-2023", + "last_update": "24-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "cloudcommander", "source": "github", "upstream_repo": "coderaiser/cloudcmd", - "upstream_version": "16.13.1" + "upstream_version": "16.14.1" } diff --git a/code-server/CHANGELOG.md b/code-server/CHANGELOG.md index bf66868f4..92eb2b171 100644 --- a/code-server/CHANGELOG.md +++ b/code-server/CHANGELOG.md @@ -1,4 +1,11 @@ +## 4.11.0 (18-03-2023) +- Update to latest version from linuxserver/docker-code-server + +## 4.10.1 (11-03-2023) +- Update to latest version from linuxserver/docker-code-server +- Implemented healthcheck + ## 4.10.0 (19-02-2023) - Update to latest version from linuxserver/docker-code-server diff --git a/code-server/Dockerfile b/code-server/Dockerfile index e90af909d..d773383dd 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -66,7 +66,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -127,3 +127,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8443" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/code-server/README.md b/code-server/README.md index f2dbb7916..c45d945fc 100644 --- a/code-server/README.md +++ b/code-server/README.md @@ -16,7 +16,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) + +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/code-server/stats.png) ## About diff --git a/code-server/config.json b/code-server/config.json index d3c4ab40b..0732b0588 100644 --- a/code-server/config.json +++ b/code-server/config.json @@ -76,6 +76,6 @@ }, "slug": "code-server", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/coder-server", - "version": "4.10.0", + "version": "4.11.0", "webui": "[PROTO:ssl]://[HOST]:[PORT:8443]" } diff --git a/code-server/stats.png b/code-server/stats.png new file mode 100644 index 000000000..b59f17505 Binary files /dev/null and b/code-server/stats.png differ diff --git a/code-server/translations/en.yaml b/code-server/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/code-server/translations/en.yaml +++ b/code-server/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/code-server/updater.json b/code-server/updater.json index bc13ec96c..08eb0a4ed 100644 --- a/code-server/updater.json +++ b/code-server/updater.json @@ -1,8 +1,8 @@ { - "last_update": "19-02-2023", + "last_update": "18-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "code-server", "source": "github", "upstream_repo": "linuxserver/docker-code-server", - "upstream_version": "4.10.0" + "upstream_version": "4.11.0" } diff --git a/elasticsearch/CHANGELOG.md b/elasticsearch/CHANGELOG.md index de2a870ef..5f2bd05aa 100644 --- a/elasticsearch/CHANGELOG.md +++ b/elasticsearch/CHANGELOG.md @@ -1,3 +1,4 @@ +- Implemented healthcheck - WARNING : update to supervisor 2022.11 before installing - Add codenotary sign - New standardized logic for Dockerfile build and packages installation diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 385edd969..d5e65c602 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -14,7 +14,7 @@ # 1 Build Image # ################# -ARG BUILD_UPSTREAM="7.14.2" +ARG BUILD_UPSTREAM="7.17.9" FROM elasticsearch:$BUILD_UPSTREAM ################## @@ -108,3 +108,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="9200" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/elasticsearch/README.md b/elasticsearch/README.md index a9a0d157c..5d4ab7b0c 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/elasticsearch/stats.png) ## About diff --git a/elasticsearch/config.json b/elasticsearch/config.json index d665ce4fb..d440efff4 100644 --- a/elasticsearch/config.json +++ b/elasticsearch/config.json @@ -28,5 +28,5 @@ "slug": "elasticsearch", "startup": "services", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/elasticsearch", - "version": "7.14.2" + "version": "7.17.9" } diff --git a/elasticsearch/stats.png b/elasticsearch/stats.png new file mode 100644 index 000000000..55293740b Binary files /dev/null and b/elasticsearch/stats.png differ diff --git a/elasticsearch/translations/en.yaml b/elasticsearch/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/elasticsearch/translations/en.yaml +++ b/elasticsearch/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/emby/CHANGELOG.md b/emby/CHANGELOG.md index b8b29e1b4..41665d514 100644 --- a/emby/CHANGELOG.md +++ b/emby/CHANGELOG.md @@ -1,3 +1,11 @@ +- Fix issue with smb + +## 4.8.0.29 (08-04-2023) +- Update to latest version from linuxserver/docker-emby + +## 4.8.0.28 (31-03-2023) +- Update to latest version from linuxserver/docker-emby +- Implemented healthcheck ## 4.8.0.21 (13-12-2022) - Update to latest version from linuxserver/docker-emby diff --git a/emby/Dockerfile b/emby/Dockerfile index 125918645..62b74365f 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="4.8.0.21" +ARG BUILD_UPSTREAM="4.8.0.29" FROM ${BUILD_FROM}${BUILD_UPSTREAM} ################## @@ -65,7 +65,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -120,3 +120,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8096" \ + HEALTH_URL="/emby/system/info/public?format=json" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/emby/README.md b/emby/README.md index 9d42f9140..68d4c5f4d 100644 --- a/emby/README.md +++ b/emby/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/emby/stats.png) ## About diff --git a/emby/config.json b/emby/config.json index 799aa2bca..9cf70e032 100644 --- a/emby/config.json +++ b/emby/config.json @@ -109,6 +109,6 @@ }, "slug": "emby_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby", - "version": "4.8.0.21-3", + "version": "4.8.0.29-2", "video": true } diff --git a/emby/stats.png b/emby/stats.png new file mode 100644 index 000000000..f7336c926 Binary files /dev/null and b/emby/stats.png differ diff --git a/emby/translations/en.yaml b/emby/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/emby/translations/en.yaml +++ b/emby/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/emby/updater.json b/emby/updater.json index 343ccef48..323a470dc 100644 --- a/emby/updater.json +++ b/emby/updater.json @@ -1,9 +1,9 @@ { "github_beta": "true", - "last_update": "13-12-2022", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "emby", "source": "github", "upstream_repo": "linuxserver/docker-emby", - "upstream_version": "4.8.0.21" + "upstream_version": "4.8.0.29" } diff --git a/enedisgateway2mqtt/CHANGELOG.md b/enedisgateway2mqtt/CHANGELOG.md index 9ab2743dc..d4d6e6ece 100644 --- a/enedisgateway2mqtt/CHANGELOG.md +++ b/enedisgateway2mqtt/CHANGELOG.md @@ -1,3 +1,4 @@ +- Implemented healthcheck - Ingress addition ## 0.8.13 (22-01-2023) diff --git a/enedisgateway2mqtt/Dockerfile b/enedisgateway2mqtt/Dockerfile index dc2871f38..85a9101be 100644 --- a/enedisgateway2mqtt/Dockerfile +++ b/enedisgateway2mqtt/Dockerfile @@ -100,3 +100,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="5000" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/enedisgateway2mqtt/README.md b/enedisgateway2mqtt/README.md index a877807fe..66b1ef867 100644 --- a/enedisgateway2mqtt/README.md +++ b/enedisgateway2mqtt/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/enedisgateway2mqtt/stats.png) ## About diff --git a/enedisgateway2mqtt/rootfs/entrypoint.sh b/enedisgateway2mqtt/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/enedisgateway2mqtt/rootfs/entrypoint.sh +++ b/enedisgateway2mqtt/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/enedisgateway2mqtt/stats.png b/enedisgateway2mqtt/stats.png new file mode 100644 index 000000000..6dcd64fdd Binary files /dev/null and b/enedisgateway2mqtt/stats.png differ diff --git a/enedisgateway2mqtt/translations/en.yaml b/enedisgateway2mqtt/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/enedisgateway2mqtt/translations/en.yaml +++ b/enedisgateway2mqtt/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/enedisgateway2mqtt_dev/CHANGELOG.md b/enedisgateway2mqtt_dev/CHANGELOG.md index 87835cbde..7f04e35cd 100644 --- a/enedisgateway2mqtt_dev/CHANGELOG.md +++ b/enedisgateway2mqtt_dev/CHANGELOG.md @@ -1,3 +1,4 @@ +- Implemented healthcheck ## 0.8.14b3 (11-02-2023) - Update to latest version from m4dm4rtig4n/myelectricaldata diff --git a/enedisgateway2mqtt_dev/Dockerfile b/enedisgateway2mqtt_dev/Dockerfile index dc2871f38..85a9101be 100644 --- a/enedisgateway2mqtt_dev/Dockerfile +++ b/enedisgateway2mqtt_dev/Dockerfile @@ -100,3 +100,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="5000" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/enedisgateway2mqtt_dev/README.md b/enedisgateway2mqtt_dev/README.md index a877807fe..5ef567ad8 100644 --- a/enedisgateway2mqtt_dev/README.md +++ b/enedisgateway2mqtt_dev/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/enedisgateway2mqtt_dev/stats.png) ## About diff --git a/enedisgateway2mqtt_dev/rootfs/entrypoint.sh b/enedisgateway2mqtt_dev/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/enedisgateway2mqtt_dev/rootfs/entrypoint.sh +++ b/enedisgateway2mqtt_dev/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/enedisgateway2mqtt_dev/stats.png b/enedisgateway2mqtt_dev/stats.png new file mode 100644 index 000000000..f0ca847eb Binary files /dev/null and b/enedisgateway2mqtt_dev/stats.png differ diff --git a/enedisgateway2mqtt_dev/translations/en.yaml b/enedisgateway2mqtt_dev/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/enedisgateway2mqtt_dev/translations/en.yaml +++ b/enedisgateway2mqtt_dev/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/epicgamesfree/CHANGELOG.md b/epicgamesfree/CHANGELOG.md index 674801686..3e9484314 100644 --- a/epicgamesfree/CHANGELOG.md +++ b/epicgamesfree/CHANGELOG.md @@ -1,4 +1,7 @@ +## c1a798ebd8712c4c13793d64c4a1b64bd8ea1323-2023-03-20 (2023-03-20) +- Update to latest version from charlocharlie/epicgames-freegames + ## 851cbbdc4d3e4e40d41f0358cefcdba281487758-2023-02-13 (2023-02-13) - Update to latest version from charlocharlie/epicgames-freegames diff --git a/epicgamesfree/Dockerfile b/epicgamesfree/Dockerfile index fcffb0a88..2b0720d3e 100644 --- a/epicgamesfree/Dockerfile +++ b/epicgamesfree/Dockerfile @@ -103,3 +103,9 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### + +# Can't be implemented as container is optimized for memory usage, so the webserver and Node are spun down during idle diff --git a/epicgamesfree/README.md b/epicgamesfree/README.md index 94071b152..aed69b311 100644 --- a/epicgamesfree/README.md +++ b/epicgamesfree/README.md @@ -1,3 +1,5 @@ +## ⚠ Open Request : [✨ [REQUEST] epicgamesfree ingress support (opened 2023-03-10)](https://github.com/alexbelgium/hassio-addons/issues/754) by [@nordeep](https://github.com/nordeep) + # Home assistant add-on: Epic Games Free [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -14,8 +16,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/epicgamesfree/stats.png) ## About diff --git a/epicgamesfree/config.json b/epicgamesfree/config.json index ab2782843..1967c5bad 100644 --- a/epicgamesfree/config.json +++ b/epicgamesfree/config.json @@ -22,6 +22,6 @@ }, "slug": "epicgamesfree", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "851cbbdc4d3e4e40d41f0358cefcdba281487758-2023-02-13", + "version": "c1a798ebd8712c4c13793d64c4a1b64bd8ea1323-2023-03-20", "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" } diff --git a/epicgamesfree/rootfs/entrypoint.sh b/epicgamesfree/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/epicgamesfree/rootfs/entrypoint.sh +++ b/epicgamesfree/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/epicgamesfree/stats.png b/epicgamesfree/stats.png new file mode 100644 index 000000000..34481a1ec Binary files /dev/null and b/epicgamesfree/stats.png differ diff --git a/epicgamesfree/translations/en.yaml b/epicgamesfree/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/epicgamesfree/translations/en.yaml +++ b/epicgamesfree/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/epicgamesfree/updater.json b/epicgamesfree/updater.json index 458005b44..ddc638909 100644 --- a/epicgamesfree/updater.json +++ b/epicgamesfree/updater.json @@ -1,10 +1,10 @@ { "dockerhub_by_date": true, "dockerhub_list_size": 2, - "last_update": "2023-02-13", + "last_update": "2023-03-20", "repository": "alexbelgium/hassio-addons", "slug": "epicgamesfree", "source": "dockerhub", "upstream_repo": "charlocharlie/epicgames-freegames", - "upstream_version": "851cbbdc4d3e4e40d41f0358cefcdba281487758-2023-02-13" + "upstream_version": "c1a798ebd8712c4c13793d64c4a1b64bd8ea1323-2023-03-20" } diff --git a/filebrowser/CHANGELOG.md b/filebrowser/CHANGELOG.md index afc26735a..a93ba9086 100644 --- a/filebrowser/CHANGELOG.md +++ b/filebrowser/CHANGELOG.md @@ -1,3 +1,4 @@ +- Implemented healthcheck - Add NTFS support - Disable external port by default - WARNING : update to supervisor 2022.11 before installing diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index ac0fdce09..355efa4bb 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -40,7 +40,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -102,3 +102,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8080" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/filebrowser/README.md b/filebrowser/README.md index f278df1ca..83d621e12 100644 --- a/filebrowser/README.md +++ b/filebrowser/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/filebrowser/stats.png) ## About diff --git a/filebrowser/rootfs/entrypoint.sh b/filebrowser/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/filebrowser/rootfs/entrypoint.sh +++ b/filebrowser/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/filebrowser/stats.png b/filebrowser/stats.png new file mode 100644 index 000000000..265aec847 Binary files /dev/null and b/filebrowser/stats.png differ diff --git a/filebrowser/translations/en.yaml b/filebrowser/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/filebrowser/translations/en.yaml +++ b/filebrowser/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/fireflyiii/CHANGELOG.md b/fireflyiii/CHANGELOG.md index b5debdcfc..d26c6ae20 100644 --- a/fireflyiii/CHANGELOG.md +++ b/fireflyiii/CHANGELOG.md @@ -1,4 +1,21 @@ +## 6.0.6 (08-04-2023) +- Update to latest version from firefly-iii/firefly-iii + +## 6.0.5 (24-03-2023) +- Update to latest version from firefly-iii/firefly-iii + +## 6.0.4 (18-03-2023) +- Update to latest version from firefly-iii/firefly-iii + +## 6.0.1 (11-03-2023) +- Update to latest version from firefly-iii/firefly-iii +- Implemented healthcheck + +## 6.0.0 (04-03-2023) +- MAJOR CHANGE, BACKUP DATABASE AND ADDON BEFORE UPDATING +- Update to latest version from firefly-iii/firefly-iii + ## 5.7.18 (07-01-2023) - Update to latest version from firefly-iii/firefly-iii diff --git a/fireflyiii/Dockerfile b/fireflyiii/Dockerfile index d7f8de4f9..3859ba10c 100644 --- a/fireflyiii/Dockerfile +++ b/fireflyiii/Dockerfile @@ -33,16 +33,10 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # # Change data location # grep -rl "/var/www/html" /etc/ | xargs sed -i 's|/var/www/html|/data/firefly|g' -ARG BUILD_UPSTREAM="5.7.18" -RUN \ - ################# - # Fix for 5.7.5 # - ################# - if [ "$BUILD_UPSTREAM" = "5.7.18" ] ; then \ - sed -i "s|, \$transaction\[\x27amount\x27\] ?? \x270\x27);|, (string)(\$transaction\[\x27amount\x27\] ?? \x270\x27));|g" /var/www/html/app/Helpers/Collector/GroupCollector.php; else echo "not 5.7.5"; fi +ARG BUILD_UPSTREAM="6.0.6" RUN \ # Change upload folder to "ha_upload" since the default one is binded to a volume (see base image) - sed -i "s/'root' => storage_path('upload'),/'root' => storage_path('ha_upload'),/g" /var/www/html/config/fileystems.php + sed -i "s/'root' => storage_path('upload'),/'root' => storage_path('ha_upload'),/g" /var/www/html/config/filesystems.php ################## # 3 Install apps # @@ -116,3 +110,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/health" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/fireflyiii/README.md b/fireflyiii/README.md index 4522f6fb0..9343bb4a0 100644 --- a/fireflyiii/README.md +++ b/fireflyiii/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Request : [✨ [REQUEST] Firefly iii Data Importer - upload Json config file for auto import (opened 2023-02-16)](https://github.com/alexbelgium/hassio-addons/issues/712) by [@MaoZ1993](https://github.com/MaoZ1993) # Home assistant add-on: fireflyiii [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -14,8 +15,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/fireflyiii/stats.png) ## About diff --git a/fireflyiii/config.json b/fireflyiii/config.json index 556388e88..1ccf2af55 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -47,6 +47,6 @@ "slug": "fireflyiii", "startup": "services", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.7.18", + "version": "6.0.6", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/fireflyiii/rootfs/entrypoint.sh b/fireflyiii/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/fireflyiii/rootfs/entrypoint.sh +++ b/fireflyiii/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/fireflyiii/stats.png b/fireflyiii/stats.png new file mode 100644 index 000000000..1b43b9724 Binary files /dev/null and b/fireflyiii/stats.png differ diff --git a/fireflyiii/translations/en.yaml b/fireflyiii/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/fireflyiii/translations/en.yaml +++ b/fireflyiii/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/fireflyiii/updater.json b/fireflyiii/updater.json index 14ba3905d..9ed37c5ee 100644 --- a/fireflyiii/updater.json +++ b/fireflyiii/updater.json @@ -1,8 +1,8 @@ { - "last_update": "07-01-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "fireflyiii", "source": "github", "upstream_repo": "firefly-iii/firefly-iii", - "upstream_version": "5.7.18" + "upstream_version": "6.0.6" } diff --git a/fireflyiii_data_importer/CHANGELOG.md b/fireflyiii_data_importer/CHANGELOG.md index a3d8c5ef3..a94e07381 100644 --- a/fireflyiii_data_importer/CHANGELOG.md +++ b/fireflyiii_data_importer/CHANGELOG.md @@ -1,3 +1,16 @@ +### version-1.2.2-3 (28-03-2023) +- Minor bugs fixed +- Allow IMPORT_DIR_WHITELIST +- ### version-1.2.2-2 (25-03-2023) +- Minor bugs fixed +- Allow IMPORT_DIR_ALLOWLIST https://github.com/alexbelgium/hassio-addons/issues/770 + +## version-1.2.2 (24-03-2023) +- Update to latest version from fireflyiii/data-importer + +## version-1.2.1 (18-03-2023) +- Update to latest version from fireflyiii/data-importer +- Implemented healthcheck ## version-v1.0.2 (28-01-2023) - Update to latest version from fireflyiii/data-importer diff --git a/fireflyiii_data_importer/Dockerfile b/fireflyiii_data_importer/Dockerfile index 597a8e7a3..1e8134ec7 100644 --- a/fireflyiii_data_importer/Dockerfile +++ b/fireflyiii_data_importer/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="version-v1.0.2" +ARG BUILD_UPSTREAM="version-1.2.2" FROM ${BUILD_FROM} ################## @@ -106,3 +106,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/health" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/fireflyiii_data_importer/README.md b/fireflyiii_data_importer/README.md index 1a35d5ccf..019102964 100644 --- a/fireflyiii_data_importer/README.md +++ b/fireflyiii_data_importer/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Request : [✨ [REQUEST] Firefly iii Data Importer - upload Json config file for auto import (opened 2023-02-16)](https://github.com/alexbelgium/hassio-addons/issues/712) by [@MaoZ1993](https://github.com/MaoZ1993) # Home assistant add-on: Fireflyiii data importer [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -14,8 +15,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/fireflyiii_data_importer/stats.png) ## About diff --git a/fireflyiii_data_importer/config.json b/fireflyiii_data_importer/config.json index 337479c27..0b81a8639 100644 --- a/fireflyiii_data_importer/config.json +++ b/fireflyiii_data_importer/config.json @@ -40,6 +40,6 @@ }, "slug": "fireflyiii_data_importer", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "version-v1.0.2", + "version": "version-1.2.2-3", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/fireflyiii_data_importer/rootfs/entrypoint.sh b/fireflyiii_data_importer/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/fireflyiii_data_importer/rootfs/entrypoint.sh +++ b/fireflyiii_data_importer/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh b/fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh index ee14aee51..4398f8808 100755 --- a/fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh +++ b/fireflyiii_data_importer/rootfs/etc/cont-init.d/99-run.sh @@ -14,6 +14,10 @@ if [ "$(ls -A "$CONFIGSOURCE/configurations")" ]; then export JSON_CONFIGURATION_DIR fi +# Allow config dir +export IMPORT_DIR_ALLOWLIST="$CONFIGSOURCE" +export IMPORT_DIR_WHITELIST="${CONFIGSOURCE}/import_files" + ################ # CRON OPTIONS # ################ diff --git a/fireflyiii_data_importer/stats.png b/fireflyiii_data_importer/stats.png new file mode 100644 index 000000000..e53221a79 Binary files /dev/null and b/fireflyiii_data_importer/stats.png differ diff --git a/fireflyiii_data_importer/translations/en.yaml b/fireflyiii_data_importer/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/fireflyiii_data_importer/translations/en.yaml +++ b/fireflyiii_data_importer/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/fireflyiii_data_importer/updater.json b/fireflyiii_data_importer/updater.json index 17d058d38..a9c69146f 100644 --- a/fireflyiii_data_importer/updater.json +++ b/fireflyiii_data_importer/updater.json @@ -1,8 +1,8 @@ { - "last_update": "28-01-2023", + "last_update": "24-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "fireflyiii_data_importer", "source": "dockerhub", "upstream_repo": "fireflyiii/data-importer", - "upstream_version": "version-v1.0.2" + "upstream_version": "version-1.2.2" } diff --git a/fireflyiii_fints_importer/CHANGELOG.md b/fireflyiii_fints_importer/CHANGELOG.md index 8b03e8e08..2dfa05028 100644 --- a/fireflyiii_fints_importer/CHANGELOG.md +++ b/fireflyiii_fints_importer/CHANGELOG.md @@ -1,3 +1,4 @@ +- Implemented healthcheck - WARNING : update to supervisor 2022.11 before installing - Add codenotary sign - Initial release diff --git a/fireflyiii_fints_importer/Dockerfile b/fireflyiii_fints_importer/Dockerfile index 3c2c19a47..575f28596 100644 --- a/fireflyiii_fints_importer/Dockerfile +++ b/fireflyiii_fints_importer/Dockerfile @@ -100,3 +100,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/health" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/fireflyiii_fints_importer/README.md b/fireflyiii_fints_importer/README.md index 2e053a435..a56509f45 100644 --- a/fireflyiii_fints_importer/README.md +++ b/fireflyiii_fints_importer/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/fireflyiii_fints_importer/stats.png) ## About diff --git a/fireflyiii_fints_importer/rootfs/entrypoint.sh b/fireflyiii_fints_importer/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/fireflyiii_fints_importer/rootfs/entrypoint.sh +++ b/fireflyiii_fints_importer/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/fireflyiii_fints_importer/stats.png b/fireflyiii_fints_importer/stats.png new file mode 100644 index 000000000..c38a43381 Binary files /dev/null and b/fireflyiii_fints_importer/stats.png differ diff --git a/fireflyiii_fints_importer/translations/en.yaml b/fireflyiii_fints_importer/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/fireflyiii_fints_importer/translations/en.yaml +++ b/fireflyiii_fints_importer/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/flaresolverr/CHANGELOG.md b/flaresolverr/CHANGELOG.md index b488dce9a..3da0a3e5d 100644 --- a/flaresolverr/CHANGELOG.md +++ b/flaresolverr/CHANGELOG.md @@ -1,4 +1,17 @@ +## 3.1.2 (08-04-2023) +- Update to latest version from FlareSolverr/FlareSolverr + +## 3.1.1 (31-03-2023) +- Update to latest version from FlareSolverr/FlareSolverr + +## 3.1.0 (24-03-2023) +- Update to latest version from FlareSolverr/FlareSolverr + +## 3.0.4 (11-03-2023) +- Update to latest version from FlareSolverr/FlareSolverr +- Implemented healthcheck + ## 3.0.2 (14-01-2023) - Update to latest version from FlareSolverr/FlareSolverr diff --git a/flaresolverr/Dockerfile b/flaresolverr/Dockerfile index 88997bb7c..efbf4d84a 100644 --- a/flaresolverr/Dockerfile +++ b/flaresolverr/Dockerfile @@ -102,3 +102,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8191" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/flaresolverr/README.md b/flaresolverr/README.md index 420de0978..78c6d4154 100644 --- a/flaresolverr/README.md +++ b/flaresolverr/README.md @@ -1,4 +1,5 @@ ## ⚠ Open Request : [✨ [REQUEST] FlareSolverr: OpenVPN support (opened 2023-02-20)](https://github.com/alexbelgium/hassio-addons/issues/725) by [@ralphioli](https://github.com/ralphioli) + # Home assistant add-on: Flaresolver [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +16,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/flaresolverr/stats.png) ## About diff --git a/flaresolverr/config.json b/flaresolverr/config.json index e9dc60b85..a7fa7acfe 100644 --- a/flaresolverr/config.json +++ b/flaresolverr/config.json @@ -16,6 +16,6 @@ }, "slug": "flaresolverr", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.0.2", + "version": "3.1.2", "webui": "[PROTO:ssl]://[HOST]:[PORT:8191]" } diff --git a/flaresolverr/rootfs/entrypoint.sh b/flaresolverr/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/flaresolverr/rootfs/entrypoint.sh +++ b/flaresolverr/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/flaresolverr/stats.png b/flaresolverr/stats.png new file mode 100644 index 000000000..185c70104 Binary files /dev/null and b/flaresolverr/stats.png differ diff --git a/flaresolverr/translations/en.yaml b/flaresolverr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/flaresolverr/translations/en.yaml +++ b/flaresolverr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/flaresolverr/updater.json b/flaresolverr/updater.json index c30aed93f..f3960546b 100644 --- a/flaresolverr/updater.json +++ b/flaresolverr/updater.json @@ -1,8 +1,8 @@ { - "last_update": "14-01-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "flaresolverr", "source": "github", "upstream_repo": "FlareSolverr/FlareSolverr", - "upstream_version": "3.0.2" + "upstream_version": "3.1.2" } diff --git a/flexget/CHANGELOG.md b/flexget/CHANGELOG.md index ca268cced..898d32077 100644 --- a/flexget/CHANGELOG.md +++ b/flexget/CHANGELOG.md @@ -1,4 +1,23 @@ +## 3.5.36 (08-04-2023) +- Update to latest version from wiserain/flexget + +## 3.5.34 (25-03-2023) +- Update to latest version from wiserain/flexget + +## 3.5.32 (18-03-2023) +- Update to latest version from wiserain/flexget + +## 3.5.30 (11-03-2023) +- Update to latest version from wiserain/flexget +- Implemented healthcheck + +## 3.5.29 (04-03-2023) +- Update to latest version from wiserain/flexget + +## 3.5.27 (25-02-2023) +- Update to latest version from wiserain/flexget + ## 3.5.25 (19-02-2023) - Update to latest version from wiserain/flexget diff --git a/flexget/Dockerfile b/flexget/Dockerfile index 6fe96ebd2..e4184f8fb 100644 --- a/flexget/Dockerfile +++ b/flexget/Dockerfile @@ -137,3 +137,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="5050" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/flexget/README.md b/flexget/README.md index 47f54badb..4339f7adc 100644 --- a/flexget/README.md +++ b/flexget/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/flexget/stats.png) ## About diff --git a/flexget/config.json b/flexget/config.json index d0e6270ef..d44dc11e2 100644 --- a/flexget/config.json +++ b/flexget/config.json @@ -38,6 +38,6 @@ }, "slug": "flexget", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.5.25", + "version": "3.5.36", "webui": "[PROTO:ssl]://[HOST]:[PORT:5050]" } diff --git a/flexget/stats.png b/flexget/stats.png new file mode 100644 index 000000000..bc037e433 Binary files /dev/null and b/flexget/stats.png differ diff --git a/flexget/translations/en.yaml b/flexget/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/flexget/translations/en.yaml +++ b/flexget/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/flexget/updater.json b/flexget/updater.json index 2b7c37c20..5432e334b 100644 --- a/flexget/updater.json +++ b/flexget/updater.json @@ -1,8 +1,8 @@ { - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "flexget", "source": "dockerhub", "upstream_repo": "wiserain/flexget", - "upstream_version": "3.5.25" + "upstream_version": "3.5.36" } diff --git a/gazpar2mqtt/Dockerfile b/gazpar2mqtt/Dockerfile index cc93813e3..413feeca6 100644 --- a/gazpar2mqtt/Dockerfile +++ b/gazpar2mqtt/Dockerfile @@ -104,3 +104,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/gazpar2mqtt/README.md b/gazpar2mqtt/README.md index bd056d74e..d4a46d63a 100644 --- a/gazpar2mqtt/README.md +++ b/gazpar2mqtt/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/gazpar2mqtt/stats.png) ## About diff --git a/gazpar2mqtt/config.json b/gazpar2mqtt/config.json index 7177286de..0e5bea3e5 100644 --- a/gazpar2mqtt/config.json +++ b/gazpar2mqtt/config.json @@ -29,5 +29,5 @@ ], "slug": "gazpar2mqtt", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "0.8.2-2" + "version": "0.8.2-5" } diff --git a/gazpar2mqtt/rootfs/entrypoint.sh b/gazpar2mqtt/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/gazpar2mqtt/rootfs/entrypoint.sh +++ b/gazpar2mqtt/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/gazpar2mqtt/stats.png b/gazpar2mqtt/stats.png new file mode 100644 index 000000000..ae7626f5f Binary files /dev/null and b/gazpar2mqtt/stats.png differ diff --git a/gazpar2mqtt/translations/en.yaml b/gazpar2mqtt/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/gazpar2mqtt/translations/en.yaml +++ b/gazpar2mqtt/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/gitea/Dockerfile b/gitea/Dockerfile index bd9655a87..ab83684e8 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -102,3 +102,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="3000" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/gitea/README.md b/gitea/README.md index 493e602a9..c275729a2 100644 --- a/gitea/README.md +++ b/gitea/README.md @@ -14,6 +14,10 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) + +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/gitea/stats.png) + ## About Various tweaks and configuration options addition. diff --git a/gitea/build.json b/gitea/build.json index 511b51ab8..62ab6944d 100644 --- a/gitea/build.json +++ b/gitea/build.json @@ -1,7 +1,7 @@ { "build_from": { - "aarch64": "gitea/gitea:1.18.4", - "amd64": "gitea/gitea:1.18.4" + "aarch64": "gitea/gitea:1.18.5", + "amd64": "gitea/gitea:1.18.5" }, "codenotary": { "signer": "alexandrep.github@gmail.com" diff --git a/gitea/config.json b/gitea/config.json index 082adafeb..892f75a6a 100644 --- a/gitea/config.json +++ b/gitea/config.json @@ -37,10 +37,6 @@ }, "slug": "gitea", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/gitea", -<<<<<<< Updated upstream - "version": "1.18.4", -======= "version": "1.19.1", ->>>>>>> Stashed changes "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" } diff --git a/gitea/rootfs/entrypoint.sh b/gitea/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/gitea/rootfs/entrypoint.sh +++ b/gitea/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/gitea/stats.png b/gitea/stats.png new file mode 100644 index 000000000..4405b79ec Binary files /dev/null and b/gitea/stats.png differ diff --git a/gitea/translations/en.yaml b/gitea/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/gitea/translations/en.yaml +++ b/gitea/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/gitea/updater.json b/gitea/updater.json index f1adefb1a..fff4c3c2c 100644 --- a/gitea/updater.json +++ b/gitea/updater.json @@ -1,16 +1,8 @@ { -<<<<<<< Updated upstream - "last_update": "20-02-2023", -======= - "last_update": "13-04-2023", ->>>>>>> Stashed changes + "last_update": "24-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "gitea", "source": "github", "upstream_repo": "go-gitea/gitea", -<<<<<<< Updated upstream - "upstream_version": "1.18.4" -======= "upstream_version": "1.19.1" ->>>>>>> Stashed changes } diff --git a/grav/CHANGELOG.md b/grav/CHANGELOG.md index df50a5d43..9446fb38b 100644 --- a/grav/CHANGELOG.md +++ b/grav/CHANGELOG.md @@ -1,4 +1,11 @@ +## 1.7.40 (24-03-2023) +- Update to latest version from linuxserver/docker-grav +- Implemented healthcheck + +## 1.7.39.4 (25-02-2023) +- Update to latest version from linuxserver/docker-grav + ## 1.7.38 (07-01-2023) - Update to latest version from linuxserver/docker-grav - WARNING : update to supervisor 2022.11 before installing diff --git a/grav/Dockerfile b/grav/Dockerfile index 825100adc..de1960680 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -123,3 +123,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="80" \ + HEALTH_URL="/health" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/grav/README.md b/grav/README.md index 4077b60bb..01a2087d1 100644 --- a/grav/README.md +++ b/grav/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/grav/stats.png) ## About diff --git a/grav/config.json b/grav/config.json index 88e18e155..bbf58336a 100644 --- a/grav/config.json +++ b/grav/config.json @@ -15,8 +15,8 @@ ], "name": "Grav web server", "options": { - "PGID": 0, - "PUID": 0 + "PGID": 1000, + "PUID": 1000 }, "ports": { "80/tcp": 9191 @@ -31,6 +31,6 @@ }, "slug": "grav", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.7.38", + "version": "1.7.40", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" } diff --git a/grav/stats.png b/grav/stats.png new file mode 100644 index 000000000..18ea749ca Binary files /dev/null and b/grav/stats.png differ diff --git a/grav/translations/en.yaml b/grav/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/grav/translations/en.yaml +++ b/grav/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/grav/updater.json b/grav/updater.json index c08ff6a96..dc15992f1 100644 --- a/grav/updater.json +++ b/grav/updater.json @@ -1,8 +1,8 @@ { - "last_update": "07-01-2023", + "last_update": "24-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "grav", "source": "github", "upstream_repo": "linuxserver/docker-grav", - "upstream_version": "1.7.38" + "upstream_version": "1.7.40" } diff --git a/guacamole/CHANGELOG.md b/guacamole/CHANGELOG.md index fdf28cc8c..1c2aab3f7 100644 --- a/guacamole/CHANGELOG.md +++ b/guacamole/CHANGELOG.md @@ -1,3 +1,10 @@ + +## 1.5.0 (18-03-2023) +- Update to latest version from MaxWaldorf/guacamole +- Implemented healthcheck + +## 1.4.3 (04-03-2023) +- Update to latest version from MaxWaldorf/guacamole - Switch upstream image to abesnier/guacamole - Allow custom fonts (thanks @fischer-felix) - WARNING : update to supervisor 2022.11 before installing diff --git a/guacamole/Dockerfile b/guacamole/Dockerfile index fc95d5d8b..11d49d089 100644 --- a/guacamole/Dockerfile +++ b/guacamole/Dockerfile @@ -133,3 +133,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8080" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/guacamole/README.md b/guacamole/README.md index c58369dd4..9cbbc857e 100644 --- a/guacamole/README.md +++ b/guacamole/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/guacamole/stats.png) ## About diff --git a/guacamole/config.json b/guacamole/config.json index 128ea6c9e..ca7854d99 100644 --- a/guacamole/config.json +++ b/guacamole/config.json @@ -26,6 +26,6 @@ }, "slug": "guacamole", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.4.2-17", + "version": "1.5.0", "video": true } diff --git a/guacamole/stats.png b/guacamole/stats.png new file mode 100644 index 000000000..3ab442d71 Binary files /dev/null and b/guacamole/stats.png differ diff --git a/guacamole/translations/en.yaml b/guacamole/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/guacamole/translations/en.yaml +++ b/guacamole/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/guacamole/updater.json b/guacamole/updater.json index cca12de26..397d7dc19 100644 --- a/guacamole/updater.json +++ b/guacamole/updater.json @@ -1,8 +1,8 @@ { - "last_update": "14-05-2022", + "last_update": "18-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "guacamole", "source": "github", "upstream_repo": "MaxWaldorf/guacamole", - "upstream_version": "1.4.2" + "upstream_version": "1.5.0" } diff --git a/immich/CHANGELOG.md b/immich/CHANGELOG.md index d663cc836..01fc99288 100644 --- a/immich/CHANGELOG.md +++ b/immich/CHANGELOG.md @@ -1,4 +1,20 @@ +## 1.53.0 (08-04-2023) +- Update to latest version from imagegenius/docker-immich + +## 1.52.1 (31-03-2023) +- Update to latest version from imagegenius/docker-immich + +## 1.51.2 (24-03-2023) +- Update to latest version from imagegenius/docker-immich +- Implemented healthcheck + +## 1.50.1 (04-03-2023) +- Update to latest version from imagegenius/docker-immich + +## 1.49.0 (25-02-2023) +- Update to latest version from imagegenius/docker-immich + ## 1.47.3 (19-02-2023) - Update to latest version from imagegenius/docker-immich diff --git a/immich/Dockerfile b/immich/Dockerfile index ad9fa95fa..71aab2aca 100644 --- a/immich/Dockerfile +++ b/immich/Dockerfile @@ -2,11 +2,11 @@ # ALEXBELGIUM'S DOCKERFILE # #============================# # _.------. -# _.-` ('>.-`"1.47.3""-. +# _.-` ('>.-`"1.53.0""-. # '.--'` _'` _ .--.) # -' '-.-';` ` # ' - _.' ``'--. -# '---` .-'"1.47.3"` +# '---` .-'"1.53.0"` # /` #=== Home Assistant Addon ===# @@ -16,7 +16,7 @@ ARG BUILD_VERSION ARG BUILD_FROM -ARG BUILD_UPSTREAM="1.47.3" +ARG BUILD_UPSTREAM="1.53.0" FROM ${BUILD_FROM} ################## @@ -85,14 +85,14 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "1.47.3" ] || (echo "script failed to install $scripts" && exit 1); done \ + && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "1.53.0" ] || (echo "script failed to install $scripts" && exit 1); done \ && chmod -R 755 /etc/cont-init.d # Manual apps @@ -144,3 +144,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/api/server-info/ping" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/immich/README.md b/immich/README.md index 52e52560b..82781d809 100644 --- a/immich/README.md +++ b/immich/README.md @@ -14,7 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) + +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/immich/stats.png) ## About diff --git a/immich/config.json b/immich/config.json index 37b780b3b..6d6ccb71e 100644 --- a/immich/config.json +++ b/immich/config.json @@ -96,6 +96,6 @@ ], "slug": "immich", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.47.3-2", + "version": "1.53.0", "webui": "http://[HOST]:[PORT:8080]" } diff --git a/immich/stats.png b/immich/stats.png new file mode 100644 index 000000000..12d2ea37c Binary files /dev/null and b/immich/stats.png differ diff --git a/immich/translations/en.yaml b/immich/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/immich/translations/en.yaml +++ b/immich/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/immich/updater.json b/immich/updater.json index bee7fd850..faa95afee 100644 --- a/immich/updater.json +++ b/immich/updater.json @@ -1,9 +1,9 @@ { "github_beta": "false", - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "immich", "source": "github", "upstream_repo": "imagegenius/docker-immich", - "upstream_version": "1.47.3" + "upstream_version": "1.53.0" } diff --git a/inadyn/Dockerfile b/inadyn/Dockerfile index f027f6635..f75539063 100644 --- a/inadyn/Dockerfile +++ b/inadyn/Dockerfile @@ -126,3 +126,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/inadyn/README.md b/inadyn/README.md index 354e6aef3..912f79277 100644 --- a/inadyn/README.md +++ b/inadyn/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/inadyn/stats.png) ## About @@ -129,26 +130,26 @@ If you want use this add-on with several subdomains with the same provider, you ```json { - "providers": [ - { - "hostname": "first.mydomain.dev", - "provider": "domains.google.com:1", - "username": "xxxxxxxxxxxxxxxx", - "password": "xxxxxxxxxxxxxxxx" - }, - { - "hostname": "second.mydomain.dev", - "provider": "domains.google.com:2", - "username": "xxxxxxxxxxxxxxxx", - "password": "xxxxxxxxxxxxxxxx" - }, - { - "hostname": "another.mydomain.dev", - "provider": "domains.google.com:3", - "username": "xxxxxxxxxxxxxxxx", - "password": "xxxxxxxxxxxxxxxx" - } - ], + "providers": [ + { + "hostname": "first.mydomain.dev", + "provider": "domains.google.com:1", + "username": "xxxxxxxxxxxxxxxx", + "password": "xxxxxxxxxxxxxxxx" + }, + { + "hostname": "second.mydomain.dev", + "provider": "domains.google.com:2", + "username": "xxxxxxxxxxxxxxxx", + "password": "xxxxxxxxxxxxxxxx" + }, + { + "hostname": "another.mydomain.dev", + "provider": "domains.google.com:3", + "username": "xxxxxxxxxxxxxxxx", + "password": "xxxxxxxxxxxxxxxx" + } + ] } ``` diff --git a/inadyn/rootfs/entrypoint.sh b/inadyn/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/inadyn/rootfs/entrypoint.sh +++ b/inadyn/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/inadyn/stats.png b/inadyn/stats.png new file mode 100644 index 000000000..fda8540c1 Binary files /dev/null and b/inadyn/stats.png differ diff --git a/inadyn/translations/en.yaml b/inadyn/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/inadyn/translations/en.yaml +++ b/inadyn/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md index f980d8dc2..339dfd158 100644 --- a/jackett/CHANGELOG.md +++ b/jackett/CHANGELOG.md @@ -1,4 +1,26 @@ +## 0.20.3817 (08-04-2023) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.3723 (31-03-2023) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.3678 (24-03-2023) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.3627 (18-03-2023) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.3579 (11-03-2023) +- Update to latest version from linuxserver/docker-jackett +- Implemented healthcheck + +## 0.20.3444 (04-03-2023) +- Update to latest version from linuxserver/docker-jackett + +## 0.20.3288 (25-02-2023) +- Update to latest version from linuxserver/docker-jackett + ## 0.20.3164 (19-02-2023) - Update to latest version from linuxserver/docker-jackett diff --git a/jackett/Dockerfile b/jackett/Dockerfile index 37713de16..707f5a4de 100644 --- a/jackett/Dockerfile +++ b/jackett/Dockerfile @@ -68,7 +68,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -123,3 +123,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="9117" \ + HEALTH_URL="/UI/Dashboard" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/jackett/README.md b/jackett/README.md index 3cdcdcbce..9f60e2d4f 100644 --- a/jackett/README.md +++ b/jackett/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/jackett/stats.png) ## About diff --git a/jackett/config.json b/jackett/config.json index fbbd1125c..43f6e923c 100644 --- a/jackett/config.json +++ b/jackett/config.json @@ -92,6 +92,6 @@ }, "slug": "jackett_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/jackett", - "version": "0.20.3164-2", + "version": "0.20.3817", "webui": "[PROTO:ssl]://[HOST]:[PORT:9117]" } diff --git a/jackett/stats.png b/jackett/stats.png new file mode 100644 index 000000000..3f2f9ef71 Binary files /dev/null and b/jackett/stats.png differ diff --git a/jackett/translations/en.yaml b/jackett/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/jackett/translations/en.yaml +++ b/jackett/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/jackett/updater.json b/jackett/updater.json index 88b3c488e..bf9ea1f69 100644 --- a/jackett/updater.json +++ b/jackett/updater.json @@ -1,8 +1,8 @@ { - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "jackett", "source": "github", "upstream_repo": "linuxserver/docker-jackett", - "upstream_version": "0.20.3164" + "upstream_version": "0.20.3817" } diff --git a/jellyfin/CHANGELOG.md b/jellyfin/CHANGELOG.md index 90ffa2e78..432816fdb 100644 --- a/jellyfin/CHANGELOG.md +++ b/jellyfin/CHANGELOG.md @@ -1,4 +1,17 @@ +## 10.8.9 (25-03-2023) +- Update to latest version from linuxserver/docker-jellyfin + +## 10.8.9-1-ls203 (11-03-2023) +- Update to latest version from linuxserver/docker-jellyfin +- Implemented healthcheck + +## 10.8.9-1-ls202 (04-03-2023) +- Update to latest version from linuxserver/docker-jellyfin + +## 10.8.9-1-ls201 (25-02-2023) +- Update to latest version from linuxserver/docker-jellyfin + ## 10.8.9-1-ls200 (19-02-2023) - Update to latest version from linuxserver/docker-jellyfin diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 7e5f27074..8970255b9 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -73,7 +73,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -134,3 +134,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8096" \ + HEALTH_URL="/health" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/jellyfin/README.md b/jellyfin/README.md index ee536b07e..abff91809 100644 --- a/jellyfin/README.md +++ b/jellyfin/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Issue : [✨ [REQUEST] Jellyfin customize transcodes folder location (inside data) to a separate folder (opened 2023-03-31)](https://github.com/alexbelgium/hassio-addons/issues/777) by [@cali15](https://github.com/cali15) # Home assistant add-on: jellyfin [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -14,8 +15,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/jellyfin/stats.png) ## About diff --git a/jellyfin/config.json b/jellyfin/config.json index a7798547a..3fcf89235 100644 --- a/jellyfin/config.json +++ b/jellyfin/config.json @@ -4,6 +4,12 @@ "amd64", "armv7" ], + "backup_exclude": [ + "*/cache/", + "*/logs/", + "*/transcoding-temp/", + "*/metadata/" + ], "codenotary": "alexandrep.github@gmail.com", "description": "A Free Software Media System that puts you in control of managing and streaming your media.", "devices": [ @@ -106,6 +112,6 @@ }, "slug": "jellyfin", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "10.8.9-1-ls200-2", + "version": "10.8.9", "video": true } diff --git a/jellyfin/stats.png b/jellyfin/stats.png new file mode 100644 index 000000000..dc79aa760 Binary files /dev/null and b/jellyfin/stats.png differ diff --git a/jellyfin/translations/en.yaml b/jellyfin/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/jellyfin/translations/en.yaml +++ b/jellyfin/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/jellyfin/updater.json b/jellyfin/updater.json index c02a66535..7ed30ec74 100644 --- a/jellyfin/updater.json +++ b/jellyfin/updater.json @@ -1,9 +1,9 @@ { - "github_fulltag": "true", - "last_update": "19-02-2023", + "github_fulltag": "false", + "last_update": "25-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "jellyfin", "source": "github", "upstream_repo": "linuxserver/docker-jellyfin", - "upstream_version": "10.8.9-1-ls200" + "upstream_version": "10.8.9" } diff --git a/joal/CHANGELOG.md b/joal/CHANGELOG.md index 4e6ccd5cf..5519cd200 100644 --- a/joal/CHANGELOG.md +++ b/joal/CHANGELOG.md @@ -1,15 +1,20 @@ +- Implemented healthcheck ## 2.1.33 (01-12-2022) + - Update to latest version from anthonyraymond/joal - WARNING : update to supervisor 2022.11 before installing ## 2.1.32 (05-11-2022) + - Update to latest version from anthonyraymond/joal ## 2.1.31 (04-08-2022) + - Update to latest version from anthonyraymond/joal ## 2.1.30 (19-04-2022) + - Update to latest version from anthonyraymond/joal - Add codenotary sign diff --git a/joal/Dockerfile b/joal/Dockerfile index a22ebe157..2cc3d691e 100644 --- a/joal/Dockerfile +++ b/joal/Dockerfile @@ -112,3 +112,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8081" \ + HEALTH_URL="/joal/ui" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/joal/README.md b/joal/README.md index 16e09173c..786c2c0c7 100644 --- a/joal/README.md +++ b/joal/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/joal/stats.png) ## About diff --git a/joal/rootfs/entrypoint.sh b/joal/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/joal/rootfs/entrypoint.sh +++ b/joal/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/joal/rootfs/etc/cont-init.d/99-run.sh b/joal/rootfs/etc/cont-init.d/99-run.sh index f5a61e872..c2d0387eb 100755 --- a/joal/rootfs/etc/cont-init.d/99-run.sh +++ b/joal/rootfs/etc/cont-init.d/99-run.sh @@ -18,9 +18,9 @@ fi # download latest version if [ "$VERBOSE" = true ]; then - curl -f -J -L -o /tmp/joal.tar.gz "$(curl -f -s https://api.github.com/repos/anthonyraymond/joal/releases/latest | grep -o "http.*joal.tar.gz")" + curl --progress-bar -f -J -L -o /tmp/joal.tar.gz "$(curl -f -s https://api.github.com/repos/anthonyraymond/joal/releases/latest | grep -o "http.*joal.tar.gz")" else - curl -f -s -S -J -L -o /tmp/joal.tar.gz "$(curl -f -s https://api.github.com/repos/anthonyraymond/joal/releases/latest | grep -o "http.*joal.tar.gz")" >/dev/null + curl --progress-bar -f -S -J -L -o /tmp/joal.tar.gz "$(curl -f -s https://api.github.com/repos/anthonyraymond/joal/releases/latest | grep -o "http.*joal.tar.gz")" >/dev/null fi mkdir -p /data/joal tar zxvf /tmp/joal.tar.gz -C /data/joal >/dev/null diff --git a/joal/stats.png b/joal/stats.png new file mode 100644 index 000000000..96bff8dae Binary files /dev/null and b/joal/stats.png differ diff --git a/joal/translations/en.yaml b/joal/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/joal/translations/en.yaml +++ b/joal/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/joplin/CHANGELOG.md b/joplin/CHANGELOG.md index 6023ab9da..ad9622f56 100644 --- a/joplin/CHANGELOG.md +++ b/joplin/CHANGELOG.md @@ -1,4 +1,11 @@ +## 2.10.11 (18-03-2023) +- Update to latest version from etechonomy/joplin-server + +## 2.10.10 (11-03-2023) +- Update to latest version from etechonomy/joplin-server +- Implemented healthcheck + ## 2.10.9 (11-02-2023) - Update to latest version from etechonomy/joplin-server diff --git a/joplin/Dockerfile b/joplin/Dockerfile index fdeaa0306..6ed5624be 100644 --- a/joplin/Dockerfile +++ b/joplin/Dockerfile @@ -109,3 +109,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="22300" \ + HEALTH_URL="/health" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD [[ $(curl -s "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}") == *"Invalid"* ]] || exit 1 diff --git a/joplin/README.md b/joplin/README.md index f68ac67f4..18318456a 100644 --- a/joplin/README.md +++ b/joplin/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/joplin/stats.png) ## About diff --git a/joplin/config.json b/joplin/config.json index 32d1733df..0278037e0 100644 --- a/joplin/config.json +++ b/joplin/config.json @@ -48,6 +48,6 @@ }, "slug": "joplin", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.10.9", + "version": "2.10.11", "webui": "[PROTO:ssl]://[HOST]:[PORT:22300]" } diff --git a/joplin/rootfs/entrypoint.sh b/joplin/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/joplin/rootfs/entrypoint.sh +++ b/joplin/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/joplin/stats.png b/joplin/stats.png new file mode 100644 index 000000000..afad38f50 Binary files /dev/null and b/joplin/stats.png differ diff --git a/joplin/translations/en.yaml b/joplin/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/joplin/translations/en.yaml +++ b/joplin/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/joplin/updater.json b/joplin/updater.json index cc9b8ded1..c417ecc3a 100644 --- a/joplin/updater.json +++ b/joplin/updater.json @@ -1,8 +1,8 @@ { - "last_update": "11-02-2023", + "last_update": "18-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "joplin", "source": "github", "upstream_repo": "etechonomy/joplin-server", - "upstream_version": "2.10.9" + "upstream_version": "2.10.11" } diff --git a/lidarr/CHANGELOG.md b/lidarr/CHANGELOG.md index 68fccd8f2..ebdbd154a 100644 --- a/lidarr/CHANGELOG.md +++ b/lidarr/CHANGELOG.md @@ -1,4 +1,19 @@ +## 1.0.2.2592-ls116 (08-04-2023) +- Update to latest version from linuxserver/docker-lidarr + +## 1.0.2.2592-ls114 (31-03-2023) +- Update to latest version from linuxserver/docker-lidarr +### 1.0.2.2592-ls113-2 (12-03-2023) +- Minor bugs fixed +- Implemented healthcheck + +## 1.0.2.2592-ls113 (11-03-2023) +- Update to latest version from linuxserver/docker-lidarr + +## 1.0.2.2592-ls112 (04-03-2023) +- Update to latest version from linuxserver/docker-lidarr + ## 1.0.2.2592-ls111 (19-02-2023) - Update to latest version from linuxserver/docker-lidarr diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 60fdc2d2d..fef324b7a 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -65,7 +65,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -129,3 +129,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8686" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 diff --git a/lidarr/README.md b/lidarr/README.md index f763bc068..720790a0a 100644 --- a/lidarr/README.md +++ b/lidarr/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/lidarr/stats.png) ## About diff --git a/lidarr/config.json b/lidarr/config.json index c411a0e20..4c28e40bb 100644 --- a/lidarr/config.json +++ b/lidarr/config.json @@ -80,6 +80,6 @@ }, "slug": "lidarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/blob/master/lidarr/Readme.md", - "version": "1.0.2.2592-ls111-2", + "version": "1.0.2.2592-ls116", "webui": "[PROTO:ssl]://[HOST]:[PORT:8686]" } diff --git a/lidarr/stats.png b/lidarr/stats.png new file mode 100644 index 000000000..20a44b13f Binary files /dev/null and b/lidarr/stats.png differ diff --git a/lidarr/translations/en.yaml b/lidarr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/lidarr/translations/en.yaml +++ b/lidarr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/lidarr/updater.json b/lidarr/updater.json index 13dcbdae3..40773f42e 100644 --- a/lidarr/updater.json +++ b/lidarr/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "lidarr", "source": "github", "upstream_repo": "linuxserver/docker-lidarr", - "upstream_version": "1.0.2.2592-ls111" + "upstream_version": "1.0.2.2592-ls116" } diff --git a/mealie/CHANGELOG.md b/mealie/CHANGELOG.md index f970f6e00..58148d895 100644 --- a/mealie/CHANGELOG.md +++ b/mealie/CHANGELOG.md @@ -1,17 +1,28 @@ +### v1.0.0-beta-3 (11-04-2023) +- Minor bugs fixed +## v1.0.0-beta-2 (11-04-2023) + +- Fix : ssl (https://github.com/alexbelgium/hassio-addons/issues/782) +- Implemented healthcheck ## v1.0.0-beta-1 (07-01-2023) + - Update to latest version from hay-kot/mealie + ## 1.0.1 (03-01-2023) -- Migrates data to cp -r /data/* /config/addons_config/mealie_data/ to enable usage of new addons + +- Migrates data to cp -r /data/\* /config/addons_config/mealie_data/ to enable usage of new addons - WARNING : update to supervisor 2022.11 before installing - Optional passing of env variables by adding them in a config.yml file (see readme) - Breaking change : amd64 updated to mealie 1.0 - You'll lose your database : first do a backup from within mealie, then restore after upgrading ## 1.0.0 (18-06-2022) + - Update to latest version from hay-kot/mealie ## 1.0.0.1 (26-05-2022) + - Update to latest version from hay-kot/mealie - Add codenotary sign diff --git a/mealie/Dockerfile b/mealie/Dockerfile index 7798634d5..08c0fe9e0 100644 --- a/mealie/Dockerfile +++ b/mealie/Dockerfile @@ -27,9 +27,13 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ S6_SERVICES_GRACETIME=0 +ENV FRONTEND_PORT=9925 + # Correct data path # hadolint ignore=DL4006 -RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/mealie_data|g' +RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/mealie_data|g' && \ + # Sets port to 9925 as default port + sed -i "s|yarn start -p 3000|yarn start -p 9925|g" /app/run.sh ################## # 3 Install apps # @@ -55,7 +59,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get && chmod -R 755 /etc/cont-init.d # Manual apps -ENV PACKAGES="jq curl bash" +ENV PACKAGES="nginx" # Automatic apps & bashio # hadolint ignore=SC2015 @@ -72,17 +76,10 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get RUN \ # Add custom instructions to run.sh on armv7 - if [ -f /app/run.sh ]; then \ sed -i '1d' /app/run.sh \ && cat /app/run.sh >> /run.txt \ && cat /run.txt > /app/run.sh \ - && chmod +x /app/run.sh; \ - # Add custom instructions to run.sh on other aarch - elif [ -f /app/mealie/run.sh ]; then \ - sed -i '1d' /app/mealie/run.sh \ - && cat /app/mealie/run.sh >> /run.txt \ - && cat /run.txt > /app/mealie/run.sh \ - && chmod +x /app/mealie/run.sh; fi + && chmod +x /app/run.sh ############ # 5 Labels # @@ -113,3 +110,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD python $MEALIE_HOME/mealie/scripts/healthcheck.py || exit 1 diff --git a/mealie/README.md b/mealie/README.md index e7dbb0520..e65321160 100644 --- a/mealie/README.md +++ b/mealie/README.md @@ -1,5 +1,3 @@ -## Breaking change : no database migration with v1.0. Please backup your database from within Mealie before upgrading, then restore the database after upgrading. Infos here : https://hay-kot.github.io/mealie/documentation/getting-started/updating/. Something to note however about the database migration is that only the recipe data gets migrated. Not user data or other settings, and the favorite recipes are also no longer listed as such so they need to be selected again (Thanks @SeeThisIsMe) - # Hass.io Add-ons: Mealie [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -18,8 +16,9 @@ Warning : armv7 only supported up to version 0.4.3! It won't be updated with lat _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/mealie/stats.png) ## About @@ -59,14 +58,15 @@ The complete list of options can be seen here : https://nightly.mealie.io/docume ### Detailed infos (Thanks @michelangelonz) Create a restful sensor + ```yaml sensor: - platform: rest - resource: 'http://###.###.#.#:9090/api/groups/mealplans/today' + resource: "http://###.###.#.#:9090/api/groups/mealplans/today" method: GET - name: Mealie todays meal + name: Mealie todays meal headers: - Authorization: Bearer + Authorization: Bearer value_template: "{{ value_json.value }}" json_attributes_path: $..recipe json_attributes: @@ -80,19 +80,20 @@ sensor: ``` Create template sensors from attributes + ```yaml - - name: TodaysDinner - unique_id: sensor.TodaysDinner - state: "{{ state_attr('sensor.mealie_todays_meal', 'name') }}" - - name: TodaysDinnerDescription - unique_id: sensor.DinnerDescription - state: "{{ state_attr('sensor.mealie_todays_meal', 'description') }}" - - name: TodaysDinnerSlug - unique_id: sensor.DinnerSlug - state: "{{ state_attr('sensor.mealie_todays_meal', 'slug') }}" - - name: TodaysDinnerID - unique_id: sensor.DinnerID - state: "{{ state_attr('sensor.mealie_todays_meal', 'id') }}" +- name: TodaysDinner + unique_id: sensor.TodaysDinner + state: "{{ state_attr('sensor.mealie_todays_meal', 'name') }}" +- name: TodaysDinnerDescription + unique_id: sensor.DinnerDescription + state: "{{ state_attr('sensor.mealie_todays_meal', 'description') }}" +- name: TodaysDinnerSlug + unique_id: sensor.DinnerSlug + state: "{{ state_attr('sensor.mealie_todays_meal', 'slug') }}" +- name: TodaysDinnerID + unique_id: sensor.DinnerID + state: "{{ state_attr('sensor.mealie_todays_meal', 'id') }}" ``` Add a generic camera for image diff --git a/mealie/config.json b/mealie/config.json index 04f431dc5..72400ec8b 100644 --- a/mealie/config.json +++ b/mealie/config.json @@ -44,6 +44,6 @@ }, "slug": "mealie", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v1.0.0-beta-1", + "version": "v1.0.0-beta-3", "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" -} +} \ No newline at end of file diff --git a/mealie/rootfs/caddy.txt b/mealie/rootfs/caddy.txt deleted file mode 100644 index cbe2bb26f..000000000 --- a/mealie/rootfs/caddy.txt +++ /dev/null @@ -1,70 +0,0 @@ - -:%%port%% { - @proxied path /api/* /docs /openapi.json - - @static { - file - path *.ico *.css *.js *.gif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.webp - } - - encode gzip zstd - - # Handles Recipe Images / Assets - handle_path /api/media/recipes/* { - header Access-Control-Allow-Origin * - header X-Content-Type-Options nosniff - header X-Robots-Tag none - header -X-Frame-Options - header Accept-Encoding "" - header Connection $connection_upgrade - header Upgrade $http_upgrade - header Host $http_host - header X-Forwarded-For $proxy_add_x_forwarded_for - header X-Forwarded-Proto $scheme - header X-NginX-Proxy true - header X-External-Path $http_x_ingress_path - header X-Real-IP $remote_addr - header @static Cache-Control max-age=31536000 - root * /app/data/recipes/ - file_server - } - - handle @proxied { - header Access-Control-Allow-Origin * - header X-Content-Type-Options nosniff - header X-Robots-Tag none - header -X-Frame-Options - header Accept-Encoding "" - header Connection $connection_upgrade - header Upgrade $http_upgrade - header Host $http_host - header X-Forwarded-For $proxy_add_x_forwarded_for - header X-Forwarded-Proto $scheme - header X-NginX-Proxy true - header X-Real-IP $remote_addr - header X-External-Path $http_x_ingress_path; - rewrite * {Referer}{uri} - reverse_proxy http://127.0.0.1:9000 - } - - handle { - header Access-Control-Allow-Origin * - header X-Content-Type-Options nosniff - header X-Robots-Tag none - header -X-Frame-Options - header Accept-Encoding "" - header Connection $connection_upgrade - header Upgrade $http_upgrade - header Host $http_host - header X-Forwarded-For $proxy_add_x_forwarded_for - header X-Forwarded-Proto $scheme - header X-NginX-Proxy true - header X-Real-IP $remote_addr - header X-External-Path $http_x_ingress_path; - header @static Cache-Control max-age=31536000 - root * /app/dist - try_files {path}.html {path} / - file_server - } - -} diff --git a/mealie/rootfs/etc/cont-init.d/31-nginx.sh b/mealie/rootfs/etc/cont-init.d/31-nginx.sh new file mode 100755 index 000000000..f24088241 --- /dev/null +++ b/mealie/rootfs/etc/cont-init.d/31-nginx.sh @@ -0,0 +1,20 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash + +if bashio::config.true 'ssl'; then + + # Validate ssl + bashio::config.require.ssl + + # Adapt nginx template + certfile=$(bashio::config 'certfile') + keyfile=$(bashio::config 'keyfile') + sed -i "s|%%certfile%%|${certfile}|g" /etc/nginx/servers/ssl.conf + sed -i "s|%%keyfile%%|${keyfile}|g" /etc/nginx/servers/ssl.conf + sed -i "s|3000;|3000 ssl;|g" /etc/nginx/servers/ssl.conf + +else + + sed -i "/ssl/d" /etc/nginx/servers/ssl.conf + +fi diff --git a/mealie/rootfs/etc/nginx/includes/mime.types b/mealie/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 000000000..7c7cdef2d --- /dev/null +++ b/mealie/rootfs/etc/nginx/includes/mime.types @@ -0,0 +1,96 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} diff --git a/mealie/rootfs/etc/nginx/includes/proxy_params.conf b/mealie/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 000000000..924ba949e --- /dev/null +++ b/mealie/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,16 @@ +proxy_http_version 1.1; +proxy_ignore_client_abort off; +proxy_read_timeout 86400s; +proxy_redirect off; +proxy_send_timeout 86400s; +proxy_max_temp_file_size 0; + +proxy_hide_header X-Frame-Options; +proxy_set_header Accept-Encoding ""; +proxy_set_header Connection $connection_upgrade; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header Host $http_host; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header X-NginX-Proxy true; +proxy_set_header X-Real-IP $remote_addr; diff --git a/mealie/rootfs/etc/nginx/includes/resolver.conf b/mealie/rootfs/etc/nginx/includes/resolver.conf new file mode 100644 index 000000000..6485af141 --- /dev/null +++ b/mealie/rootfs/etc/nginx/includes/resolver.conf @@ -0,0 +1 @@ +resolver 127.0.0.11; diff --git a/mealie/rootfs/etc/nginx/includes/server_params.conf b/mealie/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 000000000..09c06543e --- /dev/null +++ b/mealie/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,6 @@ +root /dev/null; +server_name $hostname; + +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +add_header X-Robots-Tag none; diff --git a/mealie/rootfs/etc/nginx/includes/ssl_params.conf b/mealie/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6f1500599 --- /dev/null +++ b/mealie/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,9 @@ +ssl_protocols TLSv1.2; +ssl_prefer_server_ciphers on; +ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA; +ssl_ecdh_curve secp384r1; +ssl_session_timeout 10m; +ssl_session_cache shared:SSL:10m; +ssl_session_tickets off; +ssl_stapling on; +ssl_stapling_verify on; diff --git a/mealie/rootfs/etc/nginx/includes/upstream.conf b/mealie/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 000000000..55545898b --- /dev/null +++ b/mealie/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:9925; +} diff --git a/mealie/rootfs/etc/nginx/nginx.conf b/mealie/rootfs/etc/nginx/nginx.conf new file mode 100644 index 000000000..fb597811c --- /dev/null +++ b/mealie/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,78 @@ + +# Run nginx in foreground. +daemon off; + +# This is run inside Docker. +user root; + +# Pid storage location. +pid /var/run/nginx.pid; + +# Set number of worker processes. +worker_processes auto; + +# Enables the use of JIT for regular expressions to speed-up their processing. +pcre_jit on; + +# Write error log to Hass.io add-on log. +error_log /proc/1/fd/1 error; + +# Load allowed environment vars +env HASSIO_TOKEN; + +# Load dynamic modules. +include /etc/nginx/modules/*.conf; + +# Max num of simultaneous connections by a worker process. +events { + worker_connections 8192; +} + +http { + include /etc/nginx/includes/mime.types; + + # https://emby.media/community/index.php?/topic/93074-how-to-emby-with-nginx-with-windows-specific-tips-and-csp-options/ + server_names_hash_bucket_size 64; + gzip_disable "msie6"; + gzip_comp_level 6; + gzip_min_length 1100; + gzip_buffers 16 8k; + gzip_proxied any; + gzip_types + text/plain + text/css + text/js + text/xml + text/javascript + application/javascript + application/x-javascript + application/json + application/xml + application/rss+xml + image/svg+xml; + proxy_connect_timeout 1h; + + log_format hassio '[$time_local] $status ' + '$http_x_forwarded_for($remote_addr) ' + '$request ($http_user_agent)'; + + access_log /proc/1/fd/1 hassio; + client_max_body_size 4G; + default_type application/octet-stream; + gzip on; + keepalive_timeout 65; + sendfile on; + server_tokens off; + tcp_nodelay on; + tcp_nopush on; + + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; + } + + include /etc/nginx/includes/resolver.conf; + include /etc/nginx/includes/upstream.conf; + + include /etc/nginx/servers/*.conf; +} diff --git a/mealie/rootfs/etc/nginx/servers/ssl.conf b/mealie/rootfs/etc/nginx/servers/ssl.conf new file mode 100644 index 000000000..3a4a4e70a --- /dev/null +++ b/mealie/rootfs/etc/nginx/servers/ssl.conf @@ -0,0 +1,22 @@ + server { + + listen 3000; + + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + ssl_certificate /ssl/%%certfile%%; + ssl_certificate_key /ssl/%%keyfile%%; + + location / { + # Proxy pass + proxy_pass http://127.0.0.1:9925; + + # Next three lines allow websockets + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + + } + +} diff --git a/mealie/rootfs/run.txt b/mealie/rootfs/run.txt index 535d23580..74dd1cbfa 100644 --- a/mealie/rootfs/run.txt +++ b/mealie/rootfs/run.txt @@ -19,22 +19,6 @@ for SCRIPTS in /etc/cont-init.d/*; do /."$SCRIPTS" || echo "$SCRIPTS: exiting $?" done -################ -# MODIFY IMAGE # -################ - -#Sets caddyfile to 9925 as default port -if [ -f /app/Caddyfile ]; then - sed -i "s/80/9925/g" /app/Caddyfile - echo "Caddyfile adapted" -fi - -#Sets caddyfile to 9925 as default port -if [ -f /app/frontend/Caddyfile ]; then - sed -i "s/3000/9925/g" /app/frontend/Caddyfile - echo "Caddyfile adapted" -fi - #################### # Export variables # #################### @@ -123,19 +107,8 @@ touch /config/addons_config/mealie_data/.secret chmod -R 777 /config/addons_config/mealie_data cp -r /data/* /config/addons_config/mealie_data/ -####### -# SSL # -####### - -bashio::config.require.ssl -if bashio::config.true 'ssl'; then - bashio::log.info "Configuring ssl" - CERTFILE=$(bashio::config 'certfile') - KEYFILE=$(bashio::config 'keyfile') - if [ -f /app/Caddyfile ]; then sed -i "7 i tls /ssl/$CERTFILE /ssl/$KEYFILE" /app/Caddyfile; fi - if [ -f /app/frontend/Caddyfile ]; then sed -i "7 i tls /ssl/$CERTFILE /ssl/$KEYFILE" /app/frontend/Caddyfile; fi -fi +bashio::log.info "Starting app" +nginx & true bashio::log.info "Starting app" - fi diff --git a/mealie/stats.png b/mealie/stats.png new file mode 100644 index 000000000..fb034c30e Binary files /dev/null and b/mealie/stats.png differ diff --git a/mealie/translations/en.yaml b/mealie/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/mealie/translations/en.yaml +++ b/mealie/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/mylar3/CHANGELOG.md b/mylar3/CHANGELOG.md index fe54e2457..91040a377 100644 --- a/mylar3/CHANGELOG.md +++ b/mylar3/CHANGELOG.md @@ -1,4 +1,8 @@ +## 0.7.1 (24-03-2023) +- Update to latest version from linuxserver/docker-mylar3 +- Implemented healthcheck + ## 0.7.0 (10-12-2022) - Update to latest version from linuxserver/docker-mylar3 - WARNING : update to supervisor 2022.11 before installing diff --git a/mylar3/Dockerfile b/mylar3/Dockerfile index 670130469..ea3d50408 100644 --- a/mylar3/Dockerfile +++ b/mylar3/Dockerfile @@ -65,7 +65,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -125,3 +125,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8090" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/mylar3/README.md b/mylar3/README.md index 7159f3276..fe21fef0b 100644 --- a/mylar3/README.md +++ b/mylar3/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/mylar3/stats.png) ## About diff --git a/mylar3/config.json b/mylar3/config.json index 7ef2d89a0..63023488c 100644 --- a/mylar3/config.json +++ b/mylar3/config.json @@ -79,6 +79,6 @@ }, "slug": "mylar3", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "0.7.0-2", + "version": "0.7.1", "webui": "[PROTO:ssl]://[HOST]:[PORT:8090]" } diff --git a/mylar3/stats.png b/mylar3/stats.png new file mode 100644 index 000000000..a565349e2 Binary files /dev/null and b/mylar3/stats.png differ diff --git a/mylar3/translations/en.yaml b/mylar3/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/mylar3/translations/en.yaml +++ b/mylar3/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/mylar3/updater.json b/mylar3/updater.json index b72d9d54a..b17e31072 100644 --- a/mylar3/updater.json +++ b/mylar3/updater.json @@ -1,8 +1,8 @@ { - "last_update": "10-12-2022", + "last_update": "24-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "mylar3", "source": "github", "upstream_repo": "linuxserver/docker-mylar3", - "upstream_version": "0.7.0" + "upstream_version": "0.7.1" } diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md index 90cfadab5..cc66d578d 100644 --- a/nextcloud/CHANGELOG.md +++ b/nextcloud/CHANGELOG.md @@ -1,3 +1,71 @@ +### 26.0.0-17 (11-04-2023) +- Minor bugs fixed +- Automatic app updates +### 26.0.0-16 (11-04-2023) +- Minor bugs fixed +### 26.0.0-15 (11-04-2023) +- Minor bugs fixed +### 26.0.0-14 (11-04-2023) +- Minor bugs fixed +- Implement check_data_directory_permissions for data folders in mounted drives + +### 26.0.0-12 (02-04-2023) +- Minor bugs fixed +- ⚠ WARNING : please read warning on previous versions before updating +- Prevent downgrades, and instead reinstall the correct version +- Improve PUID/PGID code setting, and avoid minor issues + +### 26.0.0-9_updater (01-04-2023) + +- Minor bugs fixed +- ⚠ WARNING : PLEASE BACKUP NEXTCLOUD & MARIADB ADDONS BEFORE UPDATING ! +- ⚠ WARNING : Enables by default updater at addon start; you can disable it with the option "disable_updates" +- Improved updater code +- Autocorrection of permission errors in data directory + +### 26.0.0-4 (26-03-2023) + +- Minor bugs fixed +- Fix : solve AGAIN spam of healthcheck in logs + +### 26.0.0-3 (26-03-2023) + +- Minor bugs fixed +- Fix : bug in launcher script status detector if data is in a mounted directory + +### 26.0.0-2 (26-03-2023) + +- Minor bugs fixed +- Fix : connection with desktop client https://github.com/alexbelgium/hassio-addons/issues/771 +- Improve : status check code https://github.com/alexbelgium/hassio-addons/issues/768 +- Fix : reinstallation code https://github.com/alexbelgium/hassio-addons/issues/764 + +## 26.0.0 (24-03-2023) + +- Update to latest version from linuxserver/docker-nextcloud +- auto_update boolean option : automatically updates the nextcloud instance with the container version + +### 25.0.5-14 (23-03-2023) + +- Minor bugs fixed +- Revert version number to align with container + +### 25.0.4-11 (22-03-2023) + +- Minor bugs fixed +- Implemented safety check that reinstalls nextcloud if issue detected https://github.com/alexbelgium/hassio-addons/issues/764 +- Implemented healthcheck +- Redirect crond errors to addon logs https://github.com/alexbelgium/hassio-addons/issues/752 +- Improve elasticsearch integration +- Links nginx & php logs with addon logs +- Optimized nginx code to remove server error messages +- Allows calling directly occ instead of needing full path +- Corrected elastisearch server definition and test + +## 25.0.4 (25-02-2023) + +- Update to latest version from linuxserver/docker-nextcloud + ## 25.0.3 (12-02-2023) - WARNING! : this is a major code update. Make sure to have a full update of /config, /share and your nextcloud addon before updating. I take no responsibility for lost data! diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index f0e399fae..f616ca198 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -17,7 +17,7 @@ ARG BUILD_FROM ARG BUILD_VERSION ARG BUILD_ARCH -ARG BUILD_UPSTREAM="25.0.3" +ARG BUILD_UPSTREAM="26.0.0" FROM ${BUILD_FROM}${BUILD_UPSTREAM} ################## @@ -31,7 +31,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Specific modifications ARG CONFIGLOCATION="/share/nextcloud" -# hadolint ignore=SC2015 +# hadolint ignore=SC2015,SC2086 RUN \ # Change default data location for file in $(grep -Esril "/data" /etc /defaults); do sed -Ei "s=(/data)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done && \ @@ -40,7 +40,19 @@ RUN \ sed -i \ -e 's/upload_max_fileize=1024M/upload_max_fileize=10240M/g' \ -e 's/post_max_size=1024M/post_max_size=10240M/g' \ - /etc/php*/php.ini || true + /etc/php*/php.ini || true && \ + \ + # Change location of executable + sed -i "s|/config|/data/config|g" /usr/bin/occ && \ + sed -i "s|/config|/data/config|g" /usr/bin/updater.phar && \ + \ + # Change location of log + sed -i "s|s6-setuidgid abc php -f /config/www/nextcloud/cron.php|(s6-setuidgid abc php -f /config/www/nextcloud/cron.php) \&>/proc/1/fd/1|g" /etc/crontabs/root && \ + \ + # Check bundled version and store it in /nextcloudversion + mkdir -p /tmp2 && tar xf /app/nextcloud.tar.bz2 -C /tmp2 --strip-components=1 && \ + sed -n "s|.*\OC_VersionString = '*\(.*[^ ]\) *';.*|\1|p" /tmp2/version.php > /nextcloudversion && \ + rm -r /tmp2 # Global LSIO modifications ARG CONFIGLOCATION="/data/config" @@ -67,12 +79,6 @@ RUN \ # Replace lsiown if not found && if [ ! -f /usr/bin/lsiown ]; then for file in $(grep -sril "lsiown" /etc); do sed -i "s|lsiown|chown|g" $file; done; fi -# Correct modifications -ARG CONFIGLOCATION="/www/nextcloud/config" -# hadolint ignore=SC2015, SC2013, SC2086 -RUN \ - for file in $(grep -Esril "/www/nextcloud/data/config" /etc /defaults); do sed -Ei "s=(/www/nextcloud/data/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done - ################## # 3 Install apps # ################## @@ -86,7 +92,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -114,11 +120,16 @@ VOLUME ["/share", "/ssl", "/data", "/media"] # 4 Entrypoint # ################ -#RUN chmod 777 /entrypoint.sh -#WORKDIR / -#ENTRYPOINT [ "/usr/bin/env" ] -#CMD [ "/entrypoint.sh" ] -#SHELL ["/bin/bash", "-o", "pipefail", "-c"] +# Correct modifications +ARG CONFIGLOCATION="/www/nextcloud/config" +# hadolint ignore=SC2015, SC2013, SC2086, SC2016 +RUN \ + for file in $(grep -Esril "/www/nextcloud/data/config" /etc /defaults); do sed -Ei "s=(/www/nextcloud/data/config)+(/| |$|\"|\')=$CONFIGLOCATION\2=g" $file; done && \ + \ + # Correct nginx files + sed -i "/Strict-Transport-Security/d" /defaults/nginx/site-confs/default.conf.sample && \ + sed -i '1h;1!H;$!d;g;s/\(.*\)}/\1/' /defaults/nginx/site-confs/default.conf.sample && \ + cat /defaults/nginx_addition >> /defaults/nginx/site-confs/default.conf.sample ############ # 5 Labels # @@ -149,3 +160,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="80" \ + HEALTH_URL="/robots.txt" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 diff --git a/nextcloud/README.md b/nextcloud/README.md index 74741ba61..7d0cd6c90 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,4 +1,6 @@ ## ⚠ Open Request : [✨ [REQUEST] Nextcloud - Enable antivirus (opened 2023-01-25)](https://github.com/alexbelgium/hassio-addons/issues/669) by [@amaciuc](https://github.com/amaciuc) + + # Home assistant add-on: Nextcloud [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -17,8 +19,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/nextcloud/stats.png) ## About @@ -28,15 +31,14 @@ This addon is based on the [docker image](https://github.com/linuxserver/docker- ## Configuration - ### Custom scripts Scripts with .sh ending located in /config/addons_config/nextcloud will be executed at boot - ### Addon options ```yaml +disable_updates : prevent automatic nextcloud updating along addon additional_apps: vim,nextcloud #specify additional apk files to install ; separated by commas PGID/PUID: 1000 #allows setting user. trusted_domains: your-domain.com #allows to select the trusted domains. Domains not in this lis will be removed, except for the first one used in the initial configuration. @@ -54,20 +56,22 @@ cifspassword: "password" # optional, smb password, same for all smb shares) Webui can be found at `:port`. - ### Use mariadb as the main database (Thanks @amaciuc) If you notice the following warning at your first `webui` running: + ```bash Performance warning You chose SQLite as database. SQLite should only be used for minimal and development instances. For production we recommend a different database backend. If you use clients for file syncing, the use of SQLite is highly discouraged. ``` + and you want to overcome this, follow the below steps: - 1. Install `mariadb` add-on, configure it with some random infos and start it. It is important to start it successfully in order to be seen by `nextcloud` in the network. - 2. Install `nextcloud` add-on (or restart it if you have already installed), watch the logs until you will notice the following `warning`: + ```bash WARNING: MariaDB addon was found! It can't be configured automatically due to the way Nextcloud works, but you can configure it manually when running the web UI for the first time using those values : Database user : service diff --git a/nextcloud/config.json b/nextcloud/config.json index 015e1165e..f8c53fdc2 100644 --- a/nextcloud/config.json +++ b/nextcloud/config.json @@ -4,7 +4,6 @@ "amd64", "armv7" ], - "boot": "manual", "codenotary": "alexandrep.github@gmail.com", "description": "Nextcloud for Home Assistant", "devices": [ @@ -43,7 +42,8 @@ "/dev/nvme2" ], "environment": { - "NEXTCLOUD_PATH": "/data/config/www/nextcloud" + "NEXTCLOUD_PATH": "/data/config/www/nextcloud", + "SKIP_DATA_DIRECTORY_PERMISSION_CHECK": "yes" }, "hassio_api": true, "image": "ghcr.io/alexbelgium/nextcloud_ocr-{arch}", @@ -93,6 +93,7 @@ "certfile": "str", "cifspassword": "str?", "cifsusername": "str?", + "disable_updates": "bool?", "elasticsearch_server": "str?", "keyfile": "str", "localdisks": "str?", @@ -106,6 +107,6 @@ "slug": "nextcloud_ocr", "uart": true, "url": "https://github.com/alexbelgium/hassio-addons/tree/master/nextcloud", - "version": "25.0.3-3", + "version": "26.0.0-17", "webui": "https://[HOST]:[PORT:443]" } diff --git a/nextcloud/rootfs/defaults/nginx_addition b/nextcloud/rootfs/defaults/nginx_addition new file mode 100644 index 000000000..b5cf94ba0 --- /dev/null +++ b/nextcloud/rootfs/defaults/nginx_addition @@ -0,0 +1,26 @@ +add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;"; + +location = /.well-known/host-meta { +return 301 $scheme://$http_hostpublic.php?service=host-meta; +} + +location = /.well-known/host-meta.json { +return 301 $scheme://$http_host/public.php?service=host-meta-json; +} + +location = /.well-known/carddav { +return 301 $scheme://$http_host/remote.php/dav; +} + +location = /.well-known/caldav { +return 301 $scheme://$http_host/remote.php/dav; +} + +location = /.well-known/webfinger{ +return 301 $scheme://$http_host/index.php/.well-known/webfinger; +} + +location = /.well-known/nodeinfo{ +return 301 $scheme://$http_host/index.php/.well-known/nodeinfo; +} +} diff --git a/nextcloud/rootfs/etc/cont-init.d/01-folders.sh b/nextcloud/rootfs/etc/cont-init.d/01-folders.sh index f8fa4db22..e06ddd986 100755 --- a/nextcloud/rootfs/etc/cont-init.d/01-folders.sh +++ b/nextcloud/rootfs/etc/cont-init.d/01-folders.sh @@ -1,14 +1,50 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash -PUID=$(bashio::config "PUID") -PGID=$(bashio::config "PGID") -datadirectory=$(bashio::config 'data_directory') +if bashio::config.has_value "PUID" && bashio::config.has_value "PGID"; then + PUID="$(bashio::config "PUID")" + PGID="$(bashio::config "PGID")" + bashio::log.green "Setting user to $PUID:$PGID" + id -u abc &>/dev/null || usermod -o -u "$PUID" abc || true + id -g abc &>/dev/null || groupmod -o -g "$PGID" abc || true +fi -bashio::log.info "Checking permissions" +echo "Updating permissions..." +echo "... Config directory : /data" mkdir -p /data/config +chmod 755 -R /data/config +chown -R "$PUID:$PGID" "/data/config" + +# Check current version +if [ -f /data/config/www/nextcloud/config/config.php ]; then + datadirectory="$(sed -n "s|.*datadirectory.*' => '*\(.*[^ ]\) *',.*|\1|p" /data/config/www/nextcloud/config/config.php)" + echo "... Data directory detected : $datadirectory" +else + datadirectory=/share/nextcloud + echo "Nextcloud is not installed yet, the default data directory is : $datadirectory. You can change it during nextcloud installation." +fi + +# Is the directory valid +if [[ "$datadirectory" == *"/mnt/"* ]] && [ ! -f "$datadirectory"/index.html ]; then + bashio::log.fatal "Data directory does not seem to be valid. Is your drive connected? Stopping to avoid corrupting the data directory." + bashio::addon.stop +fi + mkdir -p "$datadirectory" chmod 755 -R "$datadirectory" -chmod 755 -R /data/config chown -R "$PUID:$PGID" "$datadirectory" -chown -R "$PUID:$PGID" "/data/config" + +###################### +# Modify config.json # +###################### + +for files in /defaults/config.php /data/config/www/nextcloud/config/config.php; do + if [ -f "$files" ]; then + sed -i "/check_data_directory_permissions/d" "$files" + sed -i "/datadirectory/a 'check_data_directory_permissions' => false," "$files" + fi +done +sudo -u abc php /data/config/www/nextcloud/occ config:system:set check_data_directory_permissions --value=false --type=bool || echo "Please install nextcloud first" + +echo "...done" +echo " " diff --git a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh new file mode 100755 index 000000000..31593e5dc --- /dev/null +++ b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh @@ -0,0 +1,141 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash + +#################################### +# Clean nginx files at each reboot # +#################################### + +echo "Cleaning files" +for var in /data/config/nginx /data/config/crontabs /data/config/logs; do + if [ -d "$var" ]; then rm -r "$var"; fi +done + +###################################### +# Make links between logs and docker # +###################################### + +echo "Setting logs" +for var in /data/config/log/nginx/error.log /data/config/log/nginx/access.log /data/config/log/php/error.log; do + # Make sure directory exists + mkdir -p "$(dirname "$var")" + # Clean files + if [ -f "$var" ]; then rm -r "$var"; fi + # Create symlink + ln -sf /proc/1/fd/1 "$var" +done + +################ +# CHECK STATUS # +################ + +# Clean remnant files +if [ -f /notinstalled ]; then + rm /notinstalled +fi + +# Specify launcher +LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ" + +# Check current version +if [ -f /data/config/www/nextcloud/version.php ]; then + CURRENTVERSION="$(sed -n "s|.*\OC_VersionString = '*\(.*[^ ]\) *';.*|\1|p" /data/config/www/nextcloud/version.php)" +else + CURRENTVERSION="Not found" +fi + +echo " " + +# If not installed, or files not available +if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]] || [ ! -f /data/config/www/nextcloud/version.php ]; then + bashio::log.green "--------------------------------------------------------------------------------------------------------------" + bashio::log.yellow "Nextcloud not installed, please wait for addon startup, login Webui, install Nextcloud, then restart the addon" + bashio::log.green "--------------------------------------------------------------------------------------------------------------" + bashio::log.green " " + touch /notinstalled + exit 0 + # Is there missing files +elif [[ $($LAUNCHER -V 2>&1) == *"Composer autoloader not found"* ]] || [[ $($LAUNCHER -V 2>&1) == *"No such file"* ]] ; then + bashio::log.red "--------------------------------------------------" + bashio::log.red " Missing files detected, Nextcloud will reinstall " + bashio::log.red "--------------------------------------------------" + touch /reinstall + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair-share-owner" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:mode --off" + # Everything is fine +elif [[ $($LAUNCHER -V 2>&1) =~ ^"Nextcloud "[0-9].* ]]; then + # Log + bashio::log.green "----------------------------------------" + bashio::log.green " Nextcloud $CURRENTVERSION is installed " + bashio::log.green "----------------------------------------" + # Tentative to downgrade +elif [[ $($LAUNCHER -V 2>&1) == *"Downgrading"* ]]; then + # Get currently installed version + version="$($LAUNCHER -V 2>&1)" + version="${version% to *}" + version="${version#*from }" + until [ "$(echo "$version" | awk -F. '{ print NF - 1 }')" -le "2" ]; do + version="${version%\.*}" + done + # Inform + bashio::log.red "-----------------------------------------------------------------------------------------------------" + bashio::log.red " Error : a downgrade was detected. This is not possible. The current version $version will reinstall " + bashio::log.red "-----------------------------------------------------------------------------------------------------" + # Reinstall current version + CURRENTVERSION="$version" + touch /reinstall +else + bashio::log.red "-------------------------------------------------" + bashio::log.red " Unknown error detected, auto-repair will launch " + bashio::log.red "-------------------------------------------------" + bashio::log.red "Error message:" + bashio::log.red "$($LAUNCHER -V 2>&1)" + bashio::log.red "------------------------------------------------------------------" + bashio::exit.nok + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair-share-owner" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:mode --off" +fi + +echo " " + +###################### +# REINSTALL IF ISSUE # +###################### + +# Reinstall if needed +if [ -f /reinstall ]; then + rm /reinstall + bashio::log.red "... issue with installation detected, reinstallation will proceed" + + # Check container version + CONTAINERVERSION="$(cat /nextcloudversion)" + + # Downloader function + function nextcloud_download { + mkdir -p /app + if [ -f /app/nextcloud.tar.bz2 ]; then rm /app/nextcloud.tar.bz2; fi + curl -s -o /app/nextcloud.tar.bz2 -L "https://download.nextcloud.com/server/releases/$1.tar.bz2" + } + + # Redownload nextcloud if wrong version + if [[ ! "$CURRENTVERSION" == "$CONTAINERVERSION" ]]; then + bashio::log.red "... version installed is : $CURRENTVERSION and version bundled is : $CONTAINERVERSION, need to redownload files" + bashio::log.green "... download nextcloud version" + nextcloud_download "nextcloud-${CURRENTVERSION}" || (bashio::log.fatal "Your version doesn't exist... Please restore backup or fully uninstall addon" && exit 1) + fi + + # Reinstall + bashio::log.green "... reinstall ongoing, please wait" + if [ -f /data/config/www/nextcloud/index.php ]; then rm /data/config/www/nextcloud/index.php; fi && \ + # INSTALL + /./etc/s6-overlay/s6-rc.d/init-nextcloud-config/run + # RESET PERMISSIONS + /./etc/cont-init.d/01-folders.sh + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair-share-owner" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:mode --off" +fi diff --git a/nextcloud/rootfs/etc/cont-init.d/02-mariadb_discovery.sh b/nextcloud/rootfs/etc/cont-init.d/02-mariadb_discovery.sh index 7559fcd1d..445e98fbc 100755 --- a/nextcloud/rootfs/etc/cont-init.d/02-mariadb_discovery.sh +++ b/nextcloud/rootfs/etc/cont-init.d/02-mariadb_discovery.sh @@ -2,11 +2,14 @@ # shellcheck shell=bash if bashio::services.available 'mysql'; then - bashio::log.warning "MariaDB addon was found! It can't be configured automatically due to the way Nextcloud works, but you can configure it manually when running the web UI for the first time using those values :" - bashio::log.blue "Database user : $(bashio::services "mysql" "username")" + + bashio::log.green "---" + bashio::log.yellow "MariaDB addon was found! It can't be configured automatically due to the way Nextcloud works, but you can configure it manually when running the web UI for the first time using those values :" + bashio::log.blue "Database user : $(bashio::services "mysql" "username")" bashio::log.blue "Database user : $(bashio::services "mysql" "username")" bashio::log.blue "Database password : $(bashio::services "mysql" "password")" bashio::log.blue "Database name : nextcloud" bashio::log.blue "Host-name : $(bashio::services "mysql" "host"):$(bashio::services "mysql" "port")" + bashio::log.green "---" # Clean if needed for var in dbtype dbname dbuser dbhost; do diff --git a/nextcloud/rootfs/etc/cont-init.d/30-ssl.sh b/nextcloud/rootfs/etc/cont-init.d/30-ssl.sh index 681716587..9c76a590b 100755 --- a/nextcloud/rootfs/etc/cont-init.d/30-ssl.sh +++ b/nextcloud/rootfs/etc/cont-init.d/30-ssl.sh @@ -3,18 +3,22 @@ if bashio::config.true 'use_own_certs'; then - bashio::log.info "Using referenced ssl certificates..." + bashio::log.green "Using referenced ssl certificates" CERTFILE=$(bashio::config 'certfile') KEYFILE=$(bashio::config 'keyfile') + # Validate ssl + bashio::config.require.ssl + #Check if files exist echo "... checking if referenced files exist" [ ! -f /ssl/"$CERTFILE" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$CERTFILE not found" && bashio::exit.nok [ ! -f /ssl/"$KEYFILE" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$KEYFILE not found" && bashio::exit.nok - [[ -f /config/keys/cert.key ]] && rm /config/keys/cert.key - [[ -f /config/keys/cert.crt ]] && rm /config/keys/cert.crt - cp /ssl/"$CERTFILE" /config/keys/cert.crt - cp /ssl/"$CERTFILE" /config/keys/cert.key + [[ -f /data/config/keys/cert.key ]] && rm /data/config/keys/cert.key + [[ -f /data/config/keys/cert.crt ]] && rm /data/config/keys/cert.crt + cp /ssl/"$CERTFILE" /data/config/keys/cert.crt + cp /ssl/"$KEYFILE" /data/config/keys/cert.key + echo "... done" fi diff --git a/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh b/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh new file mode 100755 index 000000000..9d29fe192 --- /dev/null +++ b/nextcloud/rootfs/etc/cont-init.d/98-upgrade.sh @@ -0,0 +1,41 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash + +# Only execute if installed +if [ -f /notinstalled ]; then exit 0; fi + +# Check current version +if [ -f /data/config/www/nextcloud/version.php ]; then + CURRENTVERSION="$(sed -n "s|.*\OC_VersionString = '*\(.*[^ ]\) *';.*|\1|p" /data/config/www/nextcloud/version.php)" +else + CURRENTVERSION="Not found" +fi + +# Check container version +CONTAINERVERSION="$(cat /nextcloudversion)" + +# Inform if new version available +function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; } + +# Updater code +if ! bashio::config.true "disable_updates"; then + bashio::log.green "Auto_updater set, checking for updates" + # Install new version + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/updater/updater.phar --no-interaction" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ app:update --all" + # Install additional versions + while [[ $(occ update:check 2>&1) == *"update available"* ]]; do + bashio::log.yellow "-----------------------------------------------------------------------" + bashio::log.yellow " new version available, updating. Please do not turn off your addon! " + bashio::log.yellow "-----------------------------------------------------------------------" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/updater/updater.phar --no-interaction" + sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade" + done + # Reset permissions + /./etc/cont-init.d/01-folders.sh +elif bashio::config.true "disable_updates" && [ "$(version "$CONTAINERVERSION")" -gt "$(version "$CURRENTVERSION")" ]; then + bashio::log.yellow " " + bashio::log.yellow "New version available : $CONTAINERVERSION" + bashio::log.yellow "...auto_updater not set in addon options, please update from nextcloud settings" +fi diff --git a/nextcloud/rootfs/etc/cont-init.d/99-add_packages.sh b/nextcloud/rootfs/etc/cont-init.d/99-add_packages.sh index 8c4db5a3b..66909d2ba 100755 --- a/nextcloud/rootfs/etc/cont-init.d/99-add_packages.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-add_packages.sh @@ -1,6 +1,9 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash +# Only execute if installed +if [ -f /notinstalled ]; then exit 0; fi + # Install specific packages if [ ! -d /data/config/www/nextcloud/apps/pdfannotate ]; then CURRENT="$PWD" @@ -27,7 +30,7 @@ if bashio::config.has_value 'additional_apps'; then APP="${element#${BASH_REMATCH[1]}}" bashio::log.green "... $APP" # shellcheck disable=SC2015,SC2086 - apk add --no-cache $APP || bashio::log.red "... not successful, please check $APP package name" + apk add --no-cache $APP >/dev/null || bashio::log.red "... not successful, please check $APP package name" fi done fi diff --git a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh index 6e149cde6..87cb6b090 100755 --- a/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-elasticsearch.sh @@ -2,78 +2,63 @@ # shellcheck shell=bash # shellcheck disable=SC2086 -LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ" || bashio::log.info "/data/config/www/nextcloud/occ not found" -if ! bashio::fs.file_exists '/data/config/www/nextcloud/occ'; then - LAUNCHER=$(find / -name "occ" -print -quit) -fi || bashio::log.info "occ not found" +# Only execute if installed +if [ -f /notinstalled ]; then exit 0; fi -# Make sure there is an Nextcloud installation -if [[ $($LAUNCHER -V) == *"not installed"* ]]; then - bashio::log.warning "It seems there is no Nextcloud server installed. Please restart the addon after initialization of the user." - exit 0 -fi +# Specify launcher +PUID=$(bashio::config "PUID") +PGID=$(bashio::config "PGID") +LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ" -############ -# BASED ON # -################################################################################# -# https://raw.githubusercontent.com/nextcloud/vm/master/apps/fulltextsearch.sh # -# T&M Hansson IT AB © - 2021, https://www.hanssonit.se/ # -# SwITNet Ltd © - 2021, https://switnet.net/ # -################################################################################# +if $LAUNCHER fulltextsearch:test &>/dev/null; then + echo "Full Text Search is already working" -if bashio::config.true 'Full_Text_Search'; then - # shellcheck disable=SC1073,SC1072,SC1009 - if [ $LAUNCHER fulltextsearch:index &>/dev/null ]; then - echo "Full Text Search is already working" - break 2 - fi + ############ + # BASED ON # + ################################################################################# + # https://raw.githubusercontent.com/nextcloud/vm/master/apps/fulltextsearch.sh # + # T&M Hansson IT AB © - 2021, https://www.hanssonit.se/ # + # SwITNet Ltd © - 2021, https://switnet.net/ # + ################################################################################# - echo "Installing Full Text Search" - # Reset Full Text Search to be able to index again, and also remove the app to be able to install it again - occ fulltextsearch:reset &>/dev/null || true - APPS=(fulltextsearch fulltextsearch_elasticsearch files_fulltextsearch) - for app in "${APPS[@]}"; do - # If app exists, remove it - [ -n $($LAUNCHER app:getpath $app) ] && $LAUNCHER app:remove $app &>/dev/null - done + if bashio::config.true 'Full_Text_Search'; then - # Get Full Text Search app for nextcloud - for app in "${APPS[@]}"; do - echo "... installing apps : $app" - $LAUNCHER app:install $app >/dev/null - $LAUNCHER app:enable $app >/dev/null - done - chown -R abc:abc $NEXTCLOUD_PATH/apps + # Get Full Text Search app for nextcloud + echo "Installing Full Text Search" + for app in "${APPS[@]}"; do + echo "... installing apps : $app" + $LAUNCHER app:install $app >/dev/null + $LAUNCHER app:enable $app >/dev/null + done + chown -R "$PUID":"$PGID" $NEXTCLOUD_PATH/apps - if bashio::config.has_value 'elasticsearch_server'; then - HOST=$(bashio::config 'elasticsearch_server') + if bashio::config.has_value 'elasticsearch_server'; then + HOST=$(bashio::config 'elasticsearch_server') + else + bashio::log.warning 'Please define elasticsearch server url in addon options. Default value of http://db21ed7f-elasticsearch:9200 will be used' + HOST=http://db21ed7f-elasticsearch:9200 + fi + + # Final setup + echo "... settings apps" + $LAUNCHER fulltextsearch_elasticsearch:configure "{\"elastic_host\":\"$HOST\"}" &>/dev/null + $LAUNCHER fulltextsearch_elasticsearch:configure "{\"elastic_index\":\"my_index\"}" &>/dev/null + $LAUNCHER fulltextsearch_elasticsearch:configure "{\"analyzer_tokenizer\":\"standard\"}" &>/dev/null + $LAUNCHER fulltextsearch:configure '{"search_platform":"OCA\\FullTextSearch_Elasticsearch\\Platform\\ElasticSearchPlatform"}' &>/dev/null || true + $LAUNCHER files_fulltextsearch:configure "{\"files_pdf\":\"1\",\"files_office\":\"1\"}" &>/dev/null || true + + # Is server detected + # Wait further for cache for index to work + echo "Waiting for a few seconds before indexing starts..." + sleep 5s + if $LAUNCHER fulltextsearch:test &>/dev/null; then + bashio::log.info "Full Text Search was successfully installed using elasticsearch server $HOST!" + + else + + bashio::log.warning "Elasticsearch can't connect. Please manually define its server in the options" + fi else - bashio::log.warning 'Please define elasticsearch server url in addon options with the format "ip:port" such as "192.168.178.1:9200"' - HOST=$(bashio::network.ipv4_address) - HOST="${HOST%/*}:9200" + echo "Full_Text_Search option not set" fi - - # Final setup - echo "... settings apps" - #occ fulltextsearch:configure '{"search_platform":"ElasticSearchPlatform"}' - $LAUNCHER fulltextsearch_elasticsearch:configure "{\"elastic_host\":\"http://$HOST:9200\"}" &>/dev/null - $LAUNCHER fulltextsearch_elasticsearch:configure "{\"elastic_index\":\"my_index\"}" &>/dev/null - $LAUNCHER fulltextsearch_elasticsearch:configure "{\"analyzer_tokenizer\":\"standard\"}" &>/dev/null - $LAUNCHER fulltextsearch:configure '{"search_platform":"OCA\\FullTextSearch_Elasticsearch\\Platform\\ElasticSearchPlatform"}' &>/dev/null || true - $LAUNCHER files_fulltextsearch:configure "{\"files_pdf\":\"1\",\"files_office\":\"1\"}" &>/dev/null || true - - # Is server detected - # if [ curl $HOST ] &>/dev/null; then - # Wait further for cache for index to work - echo "Waiting for a few seconds before indexing starts..." - sleep 10s - if $LAUNCHER fulltextsearch:index &>/dev/null; then - bashio::log.info "Full Text Search was successfully installed using elasticsearch server $HOST!" - - else - - bashio::log.warning "Elasticsearch can't connect. Please manually define its server in the options" - fi -else - echo "Full_Text_Search option not set" fi diff --git a/nextcloud/rootfs/etc/cont-init.d/99-ocr.sh b/nextcloud/rootfs/etc/cont-init.d/99-ocr.sh index be9ef37e7..d984beafe 100755 --- a/nextcloud/rootfs/etc/cont-init.d/99-ocr.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-ocr.sh @@ -1,16 +1,8 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash -LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ" || bashio::log.info "/data/config/www/nextcloud/occ not found" -if ! bashio::fs.file_exists '/data/config/www/nextcloud/occ'; then - LAUNCHER=$(find / -name "occ" -print -quit) -fi || bashio::log.info "occ not found" - -# Make sure there is an Nextcloud installation -if [[ $($LAUNCHER -V) == *"not installed"* ]]; then - bashio::log.warning "It seems there is no Nextcloud server installed. Please restart the addon after initialization of the user." - exit 0 -fi +# Only execute if installed +if [ -f /notinstalled ]; then exit 0; fi # Install OCR if requested if [ "$(bashio::config 'OCR')" = "true" ]; then @@ -23,7 +15,7 @@ if [ "$(bashio::config 'OCR')" = "true" ]; then occ app:enable files_fulltextsearch_tesseract &>/dev/null || true echo "Installing OCR" - apk add --quite --no-cache ocrmypdf + apk add --quiet --no-cache ocrmypdf apk add --quiet --no-cache tesseract-ocr || apk add --quiet --no-cache tesseract-ocr@community # Install additional language if requested if bashio::config.has_value 'OCRLANG'; then diff --git a/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh b/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh index 41826993d..37c488d05 100755 --- a/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh +++ b/nextcloud/rootfs/etc/cont-init.d/99-trusted_domains.sh @@ -1,16 +1,12 @@ #!/usr/bin/with-contenv bashio # shellcheck shell=bash -LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ" || bashio::log.info "/data/config/www/nextcloud/occ not found" -if ! bashio::fs.file_exists '/data/config/www/nextcloud/occ'; then - LAUNCHER=$(find / -name "occ" -print -quit) -fi || bashio::log.info "occ not found" +# Only execute if installed +if [ -f /notinstalled ]; then exit 0; fi -# Make sure there is an Nextcloud installation -if [[ $($LAUNCHER -V) == *"not installed"* ]]; then - bashio::log.warning "It seems there is no Nextcloud server installed. Please restart the addon after initialization of the user." - exit 0 -fi +# Specify launcher + +LAUNCHER="sudo -u abc php /data/config/www/nextcloud/occ" #################### # Initialization # diff --git a/nextcloud/rootfs/etc/services.d/cron/run b/nextcloud/rootfs/etc/services.d/cron/run index a1b27f4a7..557c8fd39 100644 --- a/nextcloud/rootfs/etc/services.d/cron/run +++ b/nextcloud/rootfs/etc/services.d/cron/run @@ -1,3 +1,4 @@ #!/usr/bin/with-contenv bash -/usr/sbin/crond -f -S -l 0 -c /etc/crontabs +# log errors in addon logs in foreground +/usr/sbin/crond -f -L /cron.log -c /etc/crontabs diff --git a/nextcloud/stats.png b/nextcloud/stats.png new file mode 100644 index 000000000..fa14cb78e Binary files /dev/null and b/nextcloud/stats.png differ diff --git a/nextcloud/translations/en.yaml b/nextcloud/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/nextcloud/translations/en.yaml +++ b/nextcloud/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/nextcloud/updater.json b/nextcloud/updater.json index 22f0d65f9..572e8ba45 100644 --- a/nextcloud/updater.json +++ b/nextcloud/updater.json @@ -1,8 +1,8 @@ { - "last_update": "20-10-2022", + "last_update": "24-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "nextcloud", "source": "github", "upstream_repo": "linuxserver/docker-nextcloud", - "upstream_version": "25.0.3" + "upstream_version": "26.0.0" } diff --git a/nzbget/Dockerfile b/nzbget/Dockerfile index 110cf9c39..83d709c2b 100644 --- a/nzbget/Dockerfile +++ b/nzbget/Dockerfile @@ -65,7 +65,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -125,3 +125,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/nzbget/README.md b/nzbget/README.md index b00398f89..63b1797fe 100644 --- a/nzbget/README.md +++ b/nzbget/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/nzbget/stats.png) ## About diff --git a/nzbget/stats.png b/nzbget/stats.png new file mode 100644 index 000000000..87d74963d Binary files /dev/null and b/nzbget/stats.png differ diff --git a/nzbget/translations/en.yaml b/nzbget/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/nzbget/translations/en.yaml +++ b/nzbget/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/omada/CHANGELOG.md b/omada/CHANGELOG.md index 91ac3f42b..7b751ab12 100644 --- a/omada/CHANGELOG.md +++ b/omada/CHANGELOG.md @@ -1,4 +1,25 @@ +## 5.9-chromium-amd64-2023-04-06 (2023-04-06) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-31 (2023-03-31) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-29 (2023-03-29) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-24 (2023-03-24) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-18 (2023-03-18) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-10 (2023-03-10) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-03 (2023-03-03) +- Update to latest version from mbentley/omada-controller + ## 5.8-chromium-amd64-2023-02-17 (2023-02-17) - Update to latest version from mbentley/omada-controller diff --git a/omada/Dockerfile b/omada/Dockerfile index 76b88199e..21f9266dc 100644 --- a/omada/Dockerfile +++ b/omada/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.8-chromium-amd64-2023-02-17" +ARG BUILD_UPSTREAM="5.9-chromium-amd64-2023-04-06" FROM ${BUILD_FROM} ################## @@ -107,3 +107,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/omada/README.md b/omada/README.md index ae5c507c6..564f207b0 100644 --- a/omada/README.md +++ b/omada/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/omada/stats.png) ## About diff --git a/omada/config.json b/omada/config.json index 27b8f505b..a23d847f7 100644 --- a/omada/config.json +++ b/omada/config.json @@ -45,6 +45,6 @@ }, "slug": "omada", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.8-chromium-amd64-2023-02-17", + "version": "5.9-chromium-amd64-2023-04-06", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada/stats.png b/omada/stats.png new file mode 100644 index 000000000..d19d1bac2 Binary files /dev/null and b/omada/stats.png differ diff --git a/omada/translations/en.yaml b/omada/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/omada/translations/en.yaml +++ b/omada/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/omada/updater.json b/omada/updater.json index 3ccd41f0f..653562b9f 100644 --- a/omada/updater.json +++ b/omada/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2023-02-17", + "last_update": "2023-04-06", "repository": "alexbelgium/hassio-addons", "slug": "omada", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.8-chromium-amd64-2023-02-17" + "upstream_version": "5.9-chromium-amd64-2023-04-06" } diff --git a/omada_v3/CHANGELOG.md b/omada_v3/CHANGELOG.md index 91ac3f42b..7b751ab12 100644 --- a/omada_v3/CHANGELOG.md +++ b/omada_v3/CHANGELOG.md @@ -1,4 +1,25 @@ +## 5.9-chromium-amd64-2023-04-06 (2023-04-06) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-31 (2023-03-31) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-29 (2023-03-29) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-24 (2023-03-24) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-18 (2023-03-18) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-10 (2023-03-10) +- Update to latest version from mbentley/omada-controller + +## 5.9-chromium-amd64-2023-03-03 (2023-03-03) +- Update to latest version from mbentley/omada-controller + ## 5.8-chromium-amd64-2023-02-17 (2023-02-17) - Update to latest version from mbentley/omada-controller diff --git a/omada_v3/Dockerfile b/omada_v3/Dockerfile index d1f12926e..58dc4e7b5 100644 --- a/omada_v3/Dockerfile +++ b/omada_v3/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="5.8-chromium-amd64-2023-02-17" +ARG BUILD_UPSTREAM="5.9-chromium-amd64-2023-04-06" FROM ${BUILD_FROM} ################## @@ -108,3 +108,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/omada_v3/README.md b/omada_v3/README.md index ae5c507c6..477d86d99 100644 --- a/omada_v3/README.md +++ b/omada_v3/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/omada_v3/stats.png) ## About diff --git a/omada_v3/config.json b/omada_v3/config.json index 589b60777..7460bba1f 100644 --- a/omada_v3/config.json +++ b/omada_v3/config.json @@ -45,6 +45,6 @@ }, "slug": "omada_v3", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "5.8-chromium-amd64-2023-02-17", + "version": "5.9-chromium-amd64-2023-04-06", "webui": "[PROTO:ssl]://[HOST]:[PORT:8088]" } diff --git a/omada_v3/stats.png b/omada_v3/stats.png new file mode 100644 index 000000000..6741e68a9 Binary files /dev/null and b/omada_v3/stats.png differ diff --git a/omada_v3/translations/en.yaml b/omada_v3/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/omada_v3/translations/en.yaml +++ b/omada_v3/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/omada_v3/updater.json b/omada_v3/updater.json index c886f3ef4..3613c3bdf 100644 --- a/omada_v3/updater.json +++ b/omada_v3/updater.json @@ -1,9 +1,9 @@ { "dockerhub_by_date": true, - "last_update": "2023-02-17", + "last_update": "2023-04-06", "repository": "alexbelgium/hassio-addons", "slug": "omada_v3", "source": "dockerhub", "upstream_repo": "mbentley/omada-controller", - "upstream_version": "5.8-chromium-amd64-2023-02-17" + "upstream_version": "5.9-chromium-amd64-2023-04-06" } diff --git a/ombi/CHANGELOG.md b/ombi/CHANGELOG.md index d7a2ded75..3739f852a 100644 --- a/ombi/CHANGELOG.md +++ b/ombi/CHANGELOG.md @@ -1,3 +1,6 @@ + +## 4.35.10 (04-03-2023) +- Update to latest version from linuxserver/docker-ombi - WARNING : update to supervisor 2022.11 before installing ## 4.22.5 (06-08-2022) diff --git a/ombi/Dockerfile b/ombi/Dockerfile index 3fd60b8e8..1d814ada6 100644 --- a/ombi/Dockerfile +++ b/ombi/Dockerfile @@ -126,3 +126,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/ombi/README.md b/ombi/README.md index 789567623..60355bcab 100644 --- a/ombi/README.md +++ b/ombi/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/ombi/stats.png) ## About diff --git a/ombi/config.json b/ombi/config.json index 75410aa8b..b7c3fb0e5 100644 --- a/ombi/config.json +++ b/ombi/config.json @@ -28,6 +28,6 @@ }, "slug": "ombi", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/ombi", - "version": "4.22.5-bugfix", + "version": "4.35.10", "webui": "[PROTO:ssl]://[HOST]:[PORT:3579]" } diff --git a/ombi/stats.png b/ombi/stats.png new file mode 100644 index 000000000..1fdb32ad8 Binary files /dev/null and b/ombi/stats.png differ diff --git a/ombi/translations/en.yaml b/ombi/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/ombi/translations/en.yaml +++ b/ombi/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/ombi/updater.json b/ombi/updater.json index 06aaeb717..57593b35b 100644 --- a/ombi/updater.json +++ b/ombi/updater.json @@ -1,8 +1,8 @@ { - "last_update": "06-08-2022", + "last_update": "04-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "ombi", "source": "github", "upstream_repo": "linuxserver/docker-ombi", - "upstream_version": "4.22.5" + "upstream_version": "4.35.10" } diff --git a/organizr/Dockerfile b/organizr/Dockerfile index aaa95609d..5276e4773 100644 --- a/organizr/Dockerfile +++ b/organizr/Dockerfile @@ -120,3 +120,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/organizr/README.md b/organizr/README.md index d8149c697..f10631639 100644 --- a/organizr/README.md +++ b/organizr/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/organizr/stats.png) ## About diff --git a/organizr/stats.png b/organizr/stats.png new file mode 100644 index 000000000..a2858c9b1 Binary files /dev/null and b/organizr/stats.png differ diff --git a/organizr/translations/en.yaml b/organizr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/organizr/translations/en.yaml +++ b/organizr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/overseerr/Dockerfile b/overseerr/Dockerfile index 8424f582e..e17f8e685 100644 --- a/overseerr/Dockerfile +++ b/overseerr/Dockerfile @@ -66,7 +66,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -126,3 +126,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/overseerr/README.md b/overseerr/README.md index 459efbd30..f621b83d9 100644 --- a/overseerr/README.md +++ b/overseerr/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/overseerr/stats.png) ## About diff --git a/overseerr/stats.png b/overseerr/stats.png new file mode 100644 index 000000000..22af0c49e Binary files /dev/null and b/overseerr/stats.png differ diff --git a/overseerr/translations/en.yaml b/overseerr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/overseerr/translations/en.yaml +++ b/overseerr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/paperless_ngx/Dockerfile b/paperless_ngx/Dockerfile index 6ffb251e6..04a19b508 100644 --- a/paperless_ngx/Dockerfile +++ b/paperless_ngx/Dockerfile @@ -41,7 +41,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh 90-config_yaml.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-config_yaml.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -102,3 +102,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/paperless_ngx/README.md b/paperless_ngx/README.md index be84cf26d..214933416 100644 --- a/paperless_ngx/README.md +++ b/paperless_ngx/README.md @@ -1,3 +1,4 @@ +## ⚠ Open Request : [✨ [REQUEST] Paperless NGX add Tika and Gotenborg to process emails (eml files) (opened 2023-02-05)](https://github.com/alexbelgium/hassio-addons/issues/693) by [@NODeeJay](https://github.com/NODeeJay) # Home assistant add-on: Paperless NGX [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -14,8 +15,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/paperless_ngx/stats.png) ## About diff --git a/paperless_ngx/rootfs/entrypoint.sh b/paperless_ngx/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/paperless_ngx/rootfs/entrypoint.sh +++ b/paperless_ngx/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh b/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh index 3285092bc..e2dc0cae1 100755 --- a/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh +++ b/paperless_ngx/rootfs/etc/cont-init.d/31-nginx.sh @@ -2,6 +2,8 @@ # shellcheck shell=bash if bashio::config.true 'ssl'; then + # Validate ssl + bashio::config.require.ssl # Adapt nginx template certfile=$(bashio::config 'certfile') @@ -9,11 +11,6 @@ if bashio::config.true 'ssl'; then sed -i "s#%%certfile%%#${certfile}#g" /etc/nginx/servers/direct.conf sed -i "s#%%keyfile%%#${keyfile}#g" /etc/nginx/servers/direct.conf - # Check if files exist - echo "... checking if referenced certificates exist" - [ ! -f /ssl/"$certfile" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$certfile not found" && bashio::exit.nok - [ ! -f /ssl/"$keyfile" ] && bashio::log.fatal "... use_own_certs is true but certificate /ssl/$keyfile not found" && bashio::exit.nok - # Configure URL if bashio::config.has_value "PAPERLESS_URL"; then bashio::log.warning "Ssl enabled, your site will be available at $(bashio::config "PAPERLESS_URL"). Don't forget to enable the https alternative port in the addon options." diff --git a/paperless_ngx/stats.png b/paperless_ngx/stats.png new file mode 100644 index 000000000..3aab5dc66 Binary files /dev/null and b/paperless_ngx/stats.png differ diff --git a/paperless_ngx/translations/en.yaml b/paperless_ngx/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/paperless_ngx/translations/en.yaml +++ b/paperless_ngx/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 13b9b89b3..fcfa3036a 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -72,7 +72,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -136,3 +136,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/papermerge/README.md b/papermerge/README.md index b15964f0b..0ca027414 100644 --- a/papermerge/README.md +++ b/papermerge/README.md @@ -1,4 +1,5 @@ ## ⚠ Open Request : [✨ [REQUEST] Switch to papermerge:papermerge (opened 2023-02-19)](https://github.com/alexbelgium/hassio-addons/issues/720) by [@kolossboss](https://github.com/kolossboss) + # Home assistant add-on: Papermerge [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +16,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/papermerge/stats.png) ## About diff --git a/papermerge/stats.png b/papermerge/stats.png new file mode 100644 index 000000000..452416589 Binary files /dev/null and b/papermerge/stats.png differ diff --git a/papermerge/translations/en.yaml b/papermerge/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/papermerge/translations/en.yaml +++ b/papermerge/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/photoprism/CHANGELOG.md b/photoprism/CHANGELOG.md index e6a7f5cdd..9799f4043 100644 --- a/photoprism/CHANGELOG.md +++ b/photoprism/CHANGELOG.md @@ -1,3 +1,4 @@ +- Implemented healthcheck - Add message if ingress disabled ## Preview (27-01-2023) diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index dcb610a03..e779d7d6a 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -53,7 +53,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 90-config_yaml.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 90-config_yaml.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -118,3 +118,16 @@ LABEL \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} \ traefik.http.middlewares.test-compress.compress=false + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD photoprism status || exit 1 diff --git a/photoprism/README.md b/photoprism/README.md index 4a6188439..e44ac99ea 100644 --- a/photoprism/README.md +++ b/photoprism/README.md @@ -16,8 +16,9 @@ MINIMUM CONFIG REQUIRED : 2 cores and 4 GB of memory _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/photoprism/stats.png) ## About diff --git a/photoprism/icon.png b/photoprism/icon.png index 605ad1df0..006fec28c 100644 Binary files a/photoprism/icon.png and b/photoprism/icon.png differ diff --git a/photoprism/logo.png b/photoprism/logo.png index 605ad1df0..006fec28c 100644 Binary files a/photoprism/logo.png and b/photoprism/logo.png differ diff --git a/photoprism/rootfs/entrypoint.sh b/photoprism/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/photoprism/rootfs/entrypoint.sh +++ b/photoprism/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/photoprism/rootfs/run.sh b/photoprism/rootfs/run.sh index 7f399b516..080411a5e 100755 --- a/photoprism/rootfs/run.sh +++ b/photoprism/rootfs/run.sh @@ -6,7 +6,7 @@ # SCRIPTS # ########### -for SCRIPTS in "/00-banner.sh" "/92-local_mounts.sh" "/92-smb_mounts.sh"; do +for SCRIPTS in "/00-banner.sh" "/00-local_mounts.sh" "/00-smb_mounts.sh"; do echo $SCRIPTS chown "$(id -u)":"$(id -g)" "$SCRIPTS" chmod a+x $SCRIPTS diff --git a/photoprism/stats.png b/photoprism/stats.png new file mode 100644 index 000000000..e1e27c608 Binary files /dev/null and b/photoprism/stats.png differ diff --git a/photoprism/translations/en.yaml b/photoprism/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/photoprism/translations/en.yaml +++ b/photoprism/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/piwigo/CHANGELOG.md b/piwigo/CHANGELOG.md index cd5815cdf..d4e9d0548 100644 --- a/piwigo/CHANGELOG.md +++ b/piwigo/CHANGELOG.md @@ -1,3 +1,6 @@ + +## 13.6.0 (25-02-2023) +- Update to latest version from linuxserver/docker-piwigo - Realign to upstream folders ## 13.5.0 (28-01-2023) diff --git a/piwigo/Dockerfile b/piwigo/Dockerfile index 29b00cc30..d39c4276a 100644 --- a/piwigo/Dockerfile +++ b/piwigo/Dockerfile @@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 # Global LSIO modifications -ARG CONFIGLOCATION="/config" +ARG CONFIGLOCATION="/config/addons_config/piwigo" # hadolint ignore=SC2015, SC2013, SC2086 RUN \ # Avoid custom-init.d duplications @@ -65,7 +65,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -93,6 +93,11 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get # 4 Entrypoint # ################ +# hadolint ignore=SC2013 +RUN \ + for file in $(grep -Esril "/local/config/addons_config/piwigo" /etc /defaults); do sed -i "s=/local/config/addons_config/piwigo=/local/config=g" "$file"; done + + #RUN chmod 777 /entrypoint.sh #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] @@ -128,3 +133,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/piwigo/README.md b/piwigo/README.md index afb7c6cee..4f04ef485 100644 --- a/piwigo/README.md +++ b/piwigo/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/piwigo/stats.png) ## About diff --git a/piwigo/config.json b/piwigo/config.json index d1ea4dd86..2e43f60f0 100644 --- a/piwigo/config.json +++ b/piwigo/config.json @@ -42,11 +42,12 @@ "/dev/nvme2" ], "environment": { - "PWG_LOCAL_DIR": "/data" + "PWG_LOCAL_DIR": "/config/addons_config/piwigo" }, "image": "ghcr.io/alexbelgium/piwigo-{arch}", "init": false, "map": [ + "config:rw", "media:rw", "share:rw", "ssl" @@ -78,6 +79,6 @@ "slug": "piwigo", "stage": "experimental", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "13.5.0-7", + "version": "13.6.0-2", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" } diff --git a/piwigo/stats.png b/piwigo/stats.png new file mode 100644 index 000000000..409392cdb Binary files /dev/null and b/piwigo/stats.png differ diff --git a/piwigo/translations/en.yaml b/piwigo/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/piwigo/translations/en.yaml +++ b/piwigo/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/piwigo/updater.json b/piwigo/updater.json index 0ce6fbdb0..c26653d4d 100644 --- a/piwigo/updater.json +++ b/piwigo/updater.json @@ -1,8 +1,8 @@ { - "last_update": "28-01-2023", + "last_update": "25-02-2023", "repository": "alexbelgium/hassio-addons", "slug": "piwigo", "source": "github", "upstream_repo": "linuxserver/docker-piwigo", - "upstream_version": "13.5.0" + "upstream_version": "13.6.0" } diff --git a/plex/CHANGELOG.md b/plex/CHANGELOG.md index 9a492f279..18555b76d 100644 --- a/plex/CHANGELOG.md +++ b/plex/CHANGELOG.md @@ -1,3 +1,25 @@ +### 1.31.3.6868-28fc46b27-ls160-2 (10-04-2023) +- Minor bugs fixed +- Fix issue with smb + +## 1.31.3.6868-28fc46b27-ls160 (08-04-2023) +- Update to latest version from linuxserver/docker-plex + +## 1.31.3.6868-28fc46b27-ls159 (31-03-2023) +- Update to latest version from linuxserver/docker-plex + +## 1.31.2.6810-a607d384f-ls157 (18-03-2023) +- Update to latest version from linuxserver/docker-plex +- Implement healthcheck + +## 1.31.1.6782-77dfff442-ls156 (11-03-2023) +- Update to latest version from linuxserver/docker-plex + +## 1.31.1.6733-bc0674160-ls154 (04-03-2023) +- Update to latest version from linuxserver/docker-plex + +## 1.31.0.6654-02189b09f-ls153 (25-02-2023) +- Update to latest version from linuxserver/docker-plex ## 1.31.0.6654-02189b09f-ls152 (19-02-2023) - Update to latest version from linuxserver/docker-plex diff --git a/plex/Dockerfile b/plex/Dockerfile index 87b0121a5..92edd0c4f 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -75,7 +75,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -138,3 +138,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="32400" \ + HEALTH_URL="/identity" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || curl --fail http://127.0.0.1:443 || exit 1 diff --git a/plex/README.md b/plex/README.md index 487c10bc9..86c1edafa 100644 --- a/plex/README.md +++ b/plex/README.md @@ -1,5 +1,7 @@ ## ⚠ Open Request : [✨ [REQUEST] PlexTraktSync (opened 2022-12-16)](https://github.com/alexbelgium/hassio-addons/issues/604) by [@cronner](https://github.com/cronner) ## ⚠ Open Request : [✨ [REQUEST] Plex year wrapped (like spotify) (opened 2022-12-25)](https://github.com/alexbelgium/hassio-addons/issues/613) by [@bruvv](https://github.com/bruvv) + + # Home assistant add-on: plex [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -16,8 +18,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/plex/stats.png) ## About diff --git a/plex/config.json b/plex/config.json index fd7d2fa9c..2027dba34 100644 --- a/plex/config.json +++ b/plex/config.json @@ -114,7 +114,7 @@ }, "slug": "plex_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex", - "version": "1.31.0.6654-02189b09f-ls152-2", + "version": "1.31.3.6868-28fc46b27-ls160-2", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:32400]/web" } diff --git a/plex/stats.png b/plex/stats.png new file mode 100644 index 000000000..506a900b6 Binary files /dev/null and b/plex/stats.png differ diff --git a/plex/translations/en.yaml b/plex/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/plex/translations/en.yaml +++ b/plex/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/plex/updater.json b/plex/updater.json index 43fee8466..509096abc 100644 --- a/plex/updater.json +++ b/plex/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "plex", "source": "github", "upstream_repo": "linuxserver/docker-plex", - "upstream_version": "1.31.0.6654-02189b09f-ls152" + "upstream_version": "1.31.3.6868-28fc46b27-ls160" } diff --git a/plex_meta_manager/CHANGELOG.md b/plex_meta_manager/CHANGELOG.md index 1b69d2496..f2ed57adf 100644 --- a/plex_meta_manager/CHANGELOG.md +++ b/plex_meta_manager/CHANGELOG.md @@ -1,4 +1,25 @@ +## v1.18.3-ls55 (08-04-2023) +- Update to latest version from linuxserver/docker-plex-meta-manager + +## v1.18.3-ls53 (31-03-2023) +- Update to latest version from linuxserver/docker-plex-meta-manager + +## v1.18.3-ls52 (24-03-2023) +- Update to latest version from linuxserver/docker-plex-meta-manager + +## v1.18.3-ls51 (18-03-2023) +- Update to latest version from linuxserver/docker-plex-meta-manager + +## v1.18.3-ls50 (11-03-2023) +- Update to latest version from linuxserver/docker-plex-meta-manager + +## v1.18.3-ls48 (04-03-2023) +- Update to latest version from linuxserver/docker-plex-meta-manager + +## v1.18.3-ls47 (25-02-2023) +- Update to latest version from linuxserver/docker-plex-meta-manager + ## v1.18.3-ls46 (19-02-2023) - Update to latest version from linuxserver/docker-plex-meta-manager diff --git a/plex_meta_manager/Dockerfile b/plex_meta_manager/Dockerfile index 09d35d332..0d00ee5fb 100644 --- a/plex_meta_manager/Dockerfile +++ b/plex_meta_manager/Dockerfile @@ -134,3 +134,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/plex_meta_manager/README.md b/plex_meta_manager/README.md index d45bd9534..025195088 100644 --- a/plex_meta_manager/README.md +++ b/plex_meta_manager/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/plex_meta_manager/stats.png) ## About diff --git a/plex_meta_manager/config.json b/plex_meta_manager/config.json index e76f6ae1c..4318c93ee 100644 --- a/plex_meta_manager/config.json +++ b/plex_meta_manager/config.json @@ -34,5 +34,5 @@ }, "slug": "plex-meta-manager", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/plex_meta_manager", - "version": "v1.18.3-ls46" + "version": "v1.18.3-ls55" } diff --git a/plex_meta_manager/stats.png b/plex_meta_manager/stats.png new file mode 100644 index 000000000..71e13e44c Binary files /dev/null and b/plex_meta_manager/stats.png differ diff --git a/plex_meta_manager/translations/en.yaml b/plex_meta_manager/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/plex_meta_manager/translations/en.yaml +++ b/plex_meta_manager/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/plex_meta_manager/updater.json b/plex_meta_manager/updater.json index 350805189..3610bff67 100644 --- a/plex_meta_manager/updater.json +++ b/plex_meta_manager/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "plex_meta_manager", "source": "github", "upstream_repo": "linuxserver/docker-plex-meta-manager", - "upstream_version": "v1.18.3-ls46" + "upstream_version": "v1.18.3-ls55" } diff --git a/portainer/CHANGELOG.md b/portainer/CHANGELOG.md index 3dd523ef9..38e4f4b3b 100644 --- a/portainer/CHANGELOG.md +++ b/portainer/CHANGELOG.md @@ -1,48 +1,82 @@ +- Feat : addition of Micro Editor to all addons + +### 2.17.1-9 (11-03-2023) + +- Minor bugs solved +- Revert : disable healthcheck (caused unhealthy status) + +### 2.17.1-8 (11-03-2023) + +- Minor bugs solved +- Improve healthcheck with /api/status + +### 2.17.1-6 (11-03-2023) + +- Implemented healthcheck +- Rollback implementation of s6-rc.d from 2.17.1-4 to 2.17.1-2 due to reported issues with addon entities reporting + +## 2.17.1 (25-02-2023) + +- Update to latest version from portainer/portainer ## 2.17.0 (11-02-2023) + - Update to latest version from portainer/portainer - WARNING : update to supervisor 2022.11 before installing ## 2.16.2 (22-11-2022) + - Update to latest version from portainer/portainer ## 2.16.1 (11-11-2022) + - Update to latest version from portainer/portainer ## 2.16.0 (01-11-2022) + - Update to latest version from portainer/portainer ## 2.15.1 (17-09-2022) + - Update to latest version from portainer/portainer ## 2.15.0 (09-09-2022) + - Update to latest version from portainer/portainer ## 2.14.2 (28-07-2022) + - Update to latest version from portainer/portainer ## 2.14.1 (14-07-2022) + - Update to latest version from portainer/portainer ## 2.14.0 (30-06-2022) + - Update to latest version from portainer/portainer ## 2.13.1 (12-05-2022) + - BREAKING CHANGE : database is reset and password reset to homeassistant (new portainer stronger password requirement) - Update to latest version from portainer/portainer ## 2.13.0 (10-05-2022) + - Update to latest version from portainer/portainer - Add codenotary sign - Reduce backup size (thanks @lmagyar) ## 2.11.1 (10-02-2022) + - Update to latest version from portainer/portaine@ ## 2.11.0 (08-02-2022) + - Update to latest version from portainer/portainer ## 2.11.1 (08-02-2022) + - Update to latest version from portainer/portainer - New standardized logic for Dockerfile build and packages installation - Improve architecture detection diff --git a/portainer/DOCS.md b/portainer/DOCS.md index 1c97e2ab0..e295675b7 100644 --- a/portainer/DOCS.md +++ b/portainer/DOCS.md @@ -1,145 +1,34 @@ -# Home Assistant Community Add-on: Portainer +Portainer can be used to execute custom commands in a docker container. It is an open-source lightweight management UI which allows you to easily manage a Docker host(s) or Docker swarm clusters. -Portainer is an open-source lightweight management UI which allows you to -easily manage a Docker host(s) or Docker swarm clusters. +# Quick start +- Add my repository using this link +[![Add repository on my Home Assistant][repository-badge]][repository-url] +- Install the portainer addon from my repo +- In the configuration panel of the addon, you can change the password +- In the main page of the addon, disable "Protection mode", then start the addon +- Login (default name is `admin`, default password is `homeassistant`) +- Click on `Primary` in the environement (at the center of the page) +- Click on `Containers` in the left menu bar +- Increase the number of items per page to see all your addons +- Click on the symbol `>_` next to the name of your selected addon to open the console page +- Either change the username, or more usually just click connect +- Type your commands, you have full access to the terminal of this specific container (this does not affect other parts of your HA system) -It has never been so easy to manage Docker. Portainer provides a detailed -overview of Docker and allows you to manage containers, images, networks and -volumes. +# Impact on your system +- There is no impact of installing, or running portainer +- Installing manually a custom container will modify your HA status to an unsupported/unhealthy state. You will be blocked from upgrading Home Assistant and upgrading any Add-ons you may have. Stopping this custom container will reset the normal status -## WARNING +# Tips and tricks -The Portainer add-on is really powerful and gives you access to virtually -your whole system. While this add-on is created and maintained with care and -with security in mind, in the wrong or inexperienced hands, -it could damage your system. +## Reset database +Just change the password in your addon options and the database will be reset -## Installation +## Timeout of 60s +The addon includes a very long timeout. However, if you use another layer of proxy such as the addon nginx proxy manager, it will default to a timeout of 60s. You'll have to adapt the proxy layer to increase timeout. More details here : https://github.com/portainer/portainer/issues/2953#issuecomment-1235795256 -To install this add-on, you'll first need to go to your profile and turn on -"Advanced Mode", once that is done go back to Home Assistant add-ons and search -for "Portainer" and install it as you would any other add-on. +## Further reference +- Here is a full guide on using it : https://codeopolis.com/posts/beginners-guide-to-portainer/ +- Old page on the HA community forum about portainer : https://community.home-assistant.io/t/home-assistant-community-add-on-portainer -To be able to use this add-on, you'll need to disable protection mode on this -add-on. Without it, the add-on is unable to access Docker. - -1. Search for the "Portainer" add-on in the Supervisor add-on store and - install it. -1. Set the "Protection mode" switch to off. -1. Start the "Portainer" add-on. -1. Check the logs of the "Portainer" add-on to see if everything went well. - -## Configuration - -**Note**: _Remember to restart the add-on when the configuration is changed._ - -Example add-on configuration: - -```yaml -log_level: info -agent_secret: password -``` - -**Note**: _This is just an example, don't copy and paste it! Create your own!_ - -### Option: `log_level` - -The `log_level` option controls the level of log output by the addon and can -be changed to be more or less verbose, which might be useful when you are -dealing with an unknown issue. Possible values are: - -- `trace`: Show every detail, like all called internal functions. -- `debug`: Shows detailed debug information. -- `info`: Normal (usually) interesting events. -- `warning`: Exceptional occurrences that are not errors. -- `error`: Runtime errors that do not require immediate action. -- `fatal`: Something went terribly wrong. Add-on becomes unusable. - -Please note that each level automatically includes log messages from a -more severe level, e.g., `debug` also shows `info` messages. By default, -the `log_level` is set to `info`, which is the recommended setting unless -you are troubleshooting. - -### Option: `agent_secret` - -An option to set a shared agent secret. Must also be set in the remote agent -as an Environment variable. - -## Known issues and limitations - -By default all Home Assistant managed containers are hidden from Portainer. -This is recommended since fooling around with Home Assistant managed containers -can easily lead to a broken system. - -Access to these containers can be gained by going into Portainer -> -Settings -> Hidden containers. Then delete the listed hidden labels -(io.hass.type labels). **Only do this if you know what you're doing!** - -## Changelog & Releases - -This repository keeps a change log using [GitHub's releases][releases] -functionality. - -Releases are based on [Semantic Versioning][semver], and use the format -of `MAJOR.MINOR.PATCH`. In a nutshell, the version will be incremented -based on the following: - -- `MAJOR`: Incompatible or major changes. -- `MINOR`: Backwards-compatible new features and enhancements. -- `PATCH`: Backwards-compatible bugfixes and package updates. - -## Support - -Got questions? - -You have several options to get them answered: - -- The [Home Assistant Community Add-ons Discord chat server][discord] for add-on - support and feature requests. -- The [Home Assistant Discord chat server][discord-ha] for general Home - Assistant discussions and questions. -- The Home Assistant [Community Forum][forum]. -- Join the [Reddit subreddit][reddit] in [/r/homeassistant][reddit] - -You could also [open an issue here][issue] GitHub. - -## Authors & contributors - -The original setup of this repository is by [Franck Nijhof][frenck]. - -For a full list of all authors and contributors, -check [the contributor's page][contributors]. - -## License - -MIT License - -Copyright (c) 2018-2021 Franck Nijhof - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -[contributors]: https://github.com/hassio-addons/addon-portainer/graphs/contributors -[discord-ha]: https://discord.gg/c5DvZ4e -[discord]: https://discord.me/hassioaddons -[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-portainer/68836?u=frenck -[frenck]: https://github.com/frenck -[issue]: https://github.com/hassio-addons/addon-portainer/issues -[reddit]: https://reddit.com/r/homeassistant -[releases]: https://github.com/hassio-addons/addon-portainer/releases -[semver]: http://semver.org/spec/v2.0.0.htm +[repository-badge]: https://img.shields.io/badge/Add%20repository%20to%20my-Home%20Assistant-41BDF5?logo=home-assistant&style=for-the-badge +[repository-url]: https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Falexbelgium%2Fhassio-addons diff --git a/portainer/Dockerfile b/portainer/Dockerfile index a799bb34f..e754a8ba9 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -30,7 +30,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Setup base -ARG BUILD_UPSTREAM="2.17.0" +ARG BUILD_UPSTREAM="2.17.1" # spellcheck disable=SC2015 # hadolint ignore=SC2015 @@ -48,10 +48,7 @@ RUN \ \ && curl -f -L -s \ "https://github.com/portainer/portainer/releases/download/${BUILD_UPSTREAM}/portainer-${BUILD_UPSTREAM}-linux-${ARCH}.tar.gz" \ - | tar zxvf - -C /opt/ || printf '%s\n' "${BUILD_UPSTREAM}" > /PORTFILE - -# Remove banner -RUN sed -i 's|(0,B\.jsxs)(B\.Fragment,{children:\[(0,B\.jsxs)("button",{type:"button",className:"border-0 bg-warning-5 text-warning-9 w-full py-2 font-semibold flex justify-center items-center gap-3",onClick:function(){t(e?"portainer-upgrade-admin":"portainer-upgrade-non-admin",{category:"portainer",metadata:d}),o(!0)},children:\[n\&\&(0,B\.jsx)(B\.Fragment,{children:"Upgrade to Business Edition"}),(0,B\.jsx)(Js\.Z,{className:"text-lg lucide"})\]}),s\&\&(0,B\.jsx)(kg,{onDismiss:function(){return o(!1)}})\]})|null|g' /opt/portainer/public/main.238cdfbf7e0dc1135a28.js + | tar zxvf - -C /opt/ ################## # 3 Install apps # @@ -128,3 +125,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="9000" \ + HEALTH_URL="/api/system/status" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/portainer/README.md b/portainer/README.md index 94d295901..0e6b6520a 100644 --- a/portainer/README.md +++ b/portainer/README.md @@ -1,4 +1,5 @@ ## ⚠ Open Request : [✨ [REQUEST] Portainer Agent (opened 2022-11-19)](https://github.com/alexbelgium/hassio-addons/issues/565) by [@rikardronnkvist](https://github.com/rikardronnkvist) + # Home assistant add-on: Portainer [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -18,8 +19,9 @@ Implemented changes : update to latest versions ; ingress ; ssl ; password setti _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/portainer/stats.png) ## About diff --git a/portainer/build.json b/portainer/build.json index 8c917867d..e07abdbd6 100644 --- a/portainer/build.json +++ b/portainer/build.json @@ -1,8 +1,8 @@ { "build_from": { - "aarch64": "ghcr.io/hassio-addons/base/aarch64:stable", - "amd64": "ghcr.io/hassio-addons/base/amd64:stable", - "armv7": "ghcr.io/hassio-addons/base/armv7:stable" + "aarch64": "ghcr.io/hassio-addons/base/aarch64:11.1.0", + "amd64": "ghcr.io/hassio-addons/base/amd64:11.1.0", + "armv7": "ghcr.io/hassio-addons/base/armv7:11.1.0" }, "codenotary": { "signer": "alexandrep.github@gmail.com" diff --git a/portainer/config.json b/portainer/config.json index 79bda8294..9a0c0f9c7 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -45,5 +45,5 @@ }, "slug": "portainer", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.17.0" + "version": "2.17.1-9" } diff --git a/portainer/stats.png b/portainer/stats.png new file mode 100644 index 000000000..aebc09e61 Binary files /dev/null and b/portainer/stats.png differ diff --git a/portainer/translations/en.yaml b/portainer/translations/en.yaml index e5b8cd982..3bc50208e 100644 --- a/portainer/translations/en.yaml +++ b/portainer/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation diff --git a/portainer/updater.json b/portainer/updater.json index 784fae770..8c7f1626f 100644 --- a/portainer/updater.json +++ b/portainer/updater.json @@ -1,9 +1,9 @@ { "github_havingasset": "true", - "last_update": "11-02-2023", + "last_update": "25-02-2023", "repository": "alexbelgium/hassio-addons", "slug": "portainer", "source": "github", "upstream_repo": "portainer/portainer", - "upstream_version": "2.17.0" + "upstream_version": "2.17.1" } diff --git a/prowlarr/CHANGELOG.md b/prowlarr/CHANGELOG.md index 6d3ab8cc0..8fcb57785 100644 --- a/prowlarr/CHANGELOG.md +++ b/prowlarr/CHANGELOG.md @@ -1,4 +1,31 @@ +## nightly-1.3.3.3047-ls572 (08-04-2023) +- Update to latest version from linuxserver/docker-prowlarr + +## nightly-1.3.2.2987-ls570 (01-04-2023) +- Update to latest version from linuxserver/docker-prowlarr + +## nightly-1.3.2.2987-ls569 (31-03-2023) +- Update to latest version from linuxserver/docker-prowlarr + +## develop-1.3.2.2984-ls96 (25-03-2023) +- Update to latest version from linuxserver/docker-prowlarr + +## nightly-1.3.2.2964-ls567 (24-03-2023) +- Update to latest version from linuxserver/docker-prowlarr + +## nightly-1.3.2.2943-ls566 (18-03-2023) +- Update to latest version from linuxserver/docker-prowlarr + +## nightly-1.3.2.2892-ls566 (11-03-2023) +- Update to latest version from linuxserver/docker-prowlarr + +## nightly-1.3.2.2863-ls566 (04-03-2023) +- Update to latest version from linuxserver/docker-prowlarr + +## nightly-1.3.1.2772-ls565 (25-02-2023) +- Update to latest version from linuxserver/docker-prowlarr + ## nightly-1.2.2.2669-ls563 (19-02-2023) - Update to latest version from linuxserver/docker-prowlarr diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 3ff275bdd..dfd57584b 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -65,7 +65,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -129,3 +129,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/prowlarr/README.md b/prowlarr/README.md index 4a0bce4c4..d299d43a9 100644 --- a/prowlarr/README.md +++ b/prowlarr/README.md @@ -1,4 +1,3 @@ - # Home assistant add-on: Prowlarr [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/prowlarr/stats.png) ## About diff --git a/prowlarr/config.json b/prowlarr/config.json index d4f765b4e..7f6acae12 100644 --- a/prowlarr/config.json +++ b/prowlarr/config.json @@ -91,6 +91,6 @@ }, "slug": "prowlarr", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "nightly-1.2.2.2669-ls563-2", + "version": "nightly-1.3.3.3047-ls572", "webui": "[PROTO:ssl]://[HOST]:[PORT:9696]" } diff --git a/prowlarr/stats.png b/prowlarr/stats.png new file mode 100644 index 000000000..f5ad133e8 Binary files /dev/null and b/prowlarr/stats.png differ diff --git a/prowlarr/translations/en.yaml b/prowlarr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/prowlarr/translations/en.yaml +++ b/prowlarr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/prowlarr/updater.json b/prowlarr/updater.json index 5396bc90a..e5f1cf61b 100644 --- a/prowlarr/updater.json +++ b/prowlarr/updater.json @@ -1,10 +1,10 @@ { "github_beta": "true", "github_fulltag": "true", - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "prowlarr", "source": "github", "upstream_repo": "linuxserver/docker-prowlarr", - "upstream_version": "nightly-1.2.2.2669-ls563" + "upstream_version": "nightly-1.3.3.3047-ls572" } diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index ac4bfd0c6..77a6665ad 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,3 +1,26 @@ +### 4.5.2-2 (19-03-2023) +- Minor bugs fixed +- Align exec code with upstream + +## 4.5.2 (18-03-2023) +- Update to latest version from linuxserver/docker-qbittorrent +- Correct downloads folder +### 4.5.2-r0-ls250-2 (13-03-2023) +- Minor bug fixes +- Try solving sed error message #755 +### 4.5.2-r0-ls250-2 (11-03-2023) +- Bug updates +- Add lsio branding +- Implement healthcheck + +## 4.5.2-r0-ls250 (11-03-2023) +- Update to latest version from linuxserver/docker-qbittorrent + +## 4.5.2-r0-ls249 (04-03-2023) +- Update to latest version from linuxserver/docker-qbittorrent + +## 4.5.1-r1-ls246 (25-02-2023) +- Update to latest version from linuxserver/docker-qbittorrent ## 4.5.1-r1-ls245 (19-02-2023) - Update to latest version from linuxserver/docker-qbittorrent diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index e143dd057..b59929a37 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="4.5.1-r1-ls245" +ARG BUILD_UPSTREAM="4.5.2" FROM ${BUILD_FROM}-$BUILD_UPSTREAM ################## @@ -41,6 +41,7 @@ ENV \ XDG_DATA_HOME="/config/addons_config" # Image specific modifications +# hadolint ignore=DL4006 RUN \ # Set download folder to /share sed -i 's|/downloads/|/share/qBittorrent/|g' /defaults/qBittorrent.conf \ @@ -48,7 +49,12 @@ RUN \ # Remove fixed folders, allows connection to webUI && sed '11,13d' /defaults/qBittorrent.conf \ && echo 'WebUI\HostHeaderValidation=false' >> /defaults/qBittorrent.conf \ - && echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf + && echo 'WebUI\LocalHostAuth=false' >> /defaults/qBittorrent.conf \ + \ + # Add vuetorrent + && curl -f -s -S -O -J -L "$(curl -f -s https://api.github.com/repos/WDaan/VueTorrent/releases | grep -o "http.*vuetorrent.zip" | head -1)" >/dev/null \ + && unzip -o vuetorrent.zip -d / >/dev/null \ + && rm vuetorrent.zip >/dev/null # Global LSIO modifications ARG CONFIGLOCATION="/config/addons_config/qBittorrent" @@ -82,7 +88,7 @@ RUN \ COPY rootfs/ / # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh 90-dns_set.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-dns_set.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -152,3 +158,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD pgrep qbittorrent || exit 1 \ No newline at end of file diff --git a/qbittorrent/README.md b/qbittorrent/README.md index 5e01ccfde..77782ce82 100644 --- a/qbittorrent/README.md +++ b/qbittorrent/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/qbittorrent/stats.png) ## About @@ -128,11 +129,11 @@ Wait a couple minutes and restart addon, it could be a temporary unavailability ### Local mount with invalid argument (@antonio1475) -> [cont-init.d] 92-local_mounts.sh: executing... +> [cont-init.d] 00-local_mounts.sh: executing... > Local Disks mounting... > mount: mounting /dev/sda1 on /mnt/sda1 failed: Invalid argument > [19:19:44] FATAL: Unable to mount local drives! Please check the name. -> [cont-init.d] 92-local_mounts.sh: exited 0. +> [cont-init.d] 00-local_mounts.sh: exited 0. Try to mount by putting the partition label in the "localdisks" options instead of the hardware name diff --git a/qbittorrent/config.json b/qbittorrent/config.json index fbfdf97d1..23f6d6b97 100644 --- a/qbittorrent/config.json +++ b/qbittorrent/config.json @@ -117,5 +117,5 @@ }, "slug": "qbittorrent", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.5.1-r1-ls245-2" + "version": "4.5.2-2" } diff --git a/qbittorrent/rootfs/etc/cont-init.d/30-nginx.sh b/qbittorrent/rootfs/etc/cont-init.d/30-nginx.sh index 3c69586b1..033336202 100755 --- a/qbittorrent/rootfs/etc/cont-init.d/30-nginx.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/30-nginx.sh @@ -29,16 +29,3 @@ sed -i "s|{{ .protocol }}|${qbittorrent_protocol}|g" /etc/nginx/servers/ingress. sed -i "s|{{ .certfile }}|$(bashio::config 'certfile')|g" /etc/nginx/servers/ingress.conf sed -i "s|{{ .keyfile }}|$(bashio::config 'keyfile')|g" /etc/nginx/servers/ingress.conf sed -i "s|{{ .ssl }}|$(bashio::config 'ssl')|g" /etc/nginx/servers/ingress.conf - -###################### -# VUETORRENT INSTALL # -###################### - -[ "$DEBUG" = "debug" ] && echo "Before curl" -curl -f -s -S -O -J -L "$(curl -f -s https://api.github.com/repos/WDaan/VueTorrent/releases | grep -o "http.*vuetorrent.zip" | head -1)" >/dev/null - -[ "$DEBUG" = "debug" ] && echo "Before unzip" -unzip -o vuetorrent.zip -d / >/dev/null - -[ "$DEBUG" = "debug" ] && echo "Before rm" -rm vuetorrent.zip >/dev/null diff --git a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh index 80b66a581..dc09079d9 100755 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -15,7 +15,7 @@ if [ ! -f "$CONFIG_LOCATION"/qBittorrent.conf ]; then fi cd "$CONFIG_LOCATION"/ || true -LINE=$(sed -n '/Preferences/=' qBittorrent.conf) +LINE=$(sed -n '/\[Preferences\]/=' qBittorrent.conf) || bashio::exit.nok "qBittorrent.conf not valid" LINE=$((LINE + 1)) # Remove unused folders @@ -41,16 +41,16 @@ if bashio::config.has_value 'SavePath'; then # Set variable DOWNLOADS=$(bashio::config 'SavePath') + DOWNLOADS=${DOWNLOADS:-/share/downloads} # Default if not set # Replace save path - CURRENTSAVEPATH=$(sed -n '/Downloads\\\SavePath/p' qBittorrent.conf) - sed -i "s|${CURRENTSAVEPATH#*=}|$DOWNLOADS|g" qBittorrent.conf || \ - sed -i "${LINE}a Downloads\\\SavePath=$DOWNLOADS" qBittorrent.conf + sed -i -e "/SavePath/d" \ + -e "/\[Preferences\]/a Downloads\\\SavePath=$DOWNLOADS" \ + -e "/\[AutoRun\]/a Downloads\\\DefaultSavePath=$DOWNLOADS" \ + -e "/\[Preferences\]/a Downloads\\\DefaultSavePath=$DOWNLOADS" \ + -e "/\[BitTorrent\]/a Downloads\\\DefaultSavePath=$DOWNLOADS" \ + -e "/\[BitTorrent\]/a Session\\\DefaultSavePath=$DOWNLOADS" qBittorrent.conf - # Replace session save path - CURRENTSAVEPATH=$(sed -n '/Session\\\DefaultSavePath/p' qBittorrent.conf) - sed -i "s|${CURRENTSAVEPATH#*=}|$DOWNLOADS|g" qBittorrent.conf || \ - sed -i "2a Session\\\DefaultSavePath=$DOWNLOADS" qBittorrent.conf # Info bashio::log.info "Downloads can be found in $DOWNLOADS" @@ -64,16 +64,16 @@ chown -R abc:abc "$DOWNLOADS" || bashio::log.fatal "Error, please check default # Avoid bugs # ############## -sed -i '/CSRFProtection/d' qBittorrent.conf -sed -i '/ClickjackingProtection/d' qBittorrent.conf -sed -i '/HostHeaderValidation/d' qBittorrent.conf -sed -i '/WebUI\Address/d' qBittorrent.conf +sed -i -e '/CSRFProtection/d' \ + -e '/ClickjackingProtection/d' \ + -e '/HostHeaderValidation/d' \ + -e '/WebUI\Address/d' \ + -e "$LINE i\WebUI\\\CSRFProtection=false" \ + -e "$LINE i\WebUI\\\ClickjackingProtection=false" \ + -e "$LINE i\WebUI\\\HostHeaderValidation=false" \ + -e "$LINE i\WebUI\\\Address=*" qBittorrent.conf #sed -i '/WebUI\ReverseProxySupportEnabled/d' qBittorrent.conf -sed -i "$LINE i\WebUI\\\CSRFProtection=false" qBittorrent.conf -sed -i "$LINE i\WebUI\\\ClickjackingProtection=false" qBittorrent.conf #sed -i "$LINE i\WebUI\\\ReverseProxySupportEnabled=true" qBittorrent.conf -sed -i "$LINE i\WebUI\\\HostHeaderValidation=false" qBittorrent.conf -sed -i "$LINE i\WebUI\\\Address=*" qBittorrent.conf ################ # Correct Port # diff --git a/qbittorrent/rootfs/etc/openvpn/up-qbittorrent.sh b/qbittorrent/rootfs/etc/openvpn/up-qbittorrent.sh index 1d1741621..c8260d71d 100755 --- a/qbittorrent/rootfs/etc/openvpn/up-qbittorrent.sh +++ b/qbittorrent/rootfs/etc/openvpn/up-qbittorrent.sh @@ -3,5 +3,6 @@ WEBUI_PORT=${WEBUI_PORT:-8080} -s6-notifyoncheck -d -n 12 -c "nc -z 127.0.0.1 ${WEBUI_PORT}" \ +exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \ s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" diff --git a/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/init-adduser/branding b/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/init-adduser/branding new file mode 100644 index 000000000..07273c0fd --- /dev/null +++ b/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/init-adduser/branding @@ -0,0 +1,11 @@ +#============================# +# ALEXBELGIUM'S ADDONS # +#============================# + _.------. + _.-` ('>.-`"""-. + '.--'` _'` _ .--.) + -' '-.-';` ` + ' - _.' ``'--. + '---` .-'""` + /` +#=== Home Assistant Addon ===# diff --git a/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run b/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run index 6485b61d4..67764b50a 100644 --- a/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run +++ b/qbittorrent/rootfs/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run @@ -11,10 +11,12 @@ if bashio::config.true 'openvpn_enabled'; then exec /usr/sbin/openvpn --config /etc/openvpn/config.ovpn --script-security 2 --up /etc/openvpn/up.sh --down /etc/openvpn/down.sh else if bashio::config.true 'silent'; then - s6-notifyoncheck -d -n 12 -c "nc -z 127.0.0.1 ${WEBUI_PORT}" \ - s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" >/dev/null + exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \ + s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" >/dev/null else - s6-notifyoncheck -d -n 12 -c "nc -z 127.0.0.1 ${WEBUI_PORT}" \ - s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" - fi + exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \ + s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" + fi fi diff --git a/qbittorrent/stats.png b/qbittorrent/stats.png new file mode 100644 index 000000000..29195c4a3 Binary files /dev/null and b/qbittorrent/stats.png differ diff --git a/qbittorrent/translations/en.yaml b/qbittorrent/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/qbittorrent/translations/en.yaml +++ b/qbittorrent/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/qbittorrent/updater.json b/qbittorrent/updater.json index 851927754..2b477371f 100644 --- a/qbittorrent/updater.json +++ b/qbittorrent/updater.json @@ -1,9 +1,9 @@ { - "github_fulltag": "true", - "last_update": "19-02-2023", + "github_fulltag": "false", + "last_update": "18-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "qbittorrent", "source": "github", "upstream_repo": "linuxserver/docker-qbittorrent", - "upstream_version": "4.5.1-r1-ls245" + "upstream_version": "4.5.2" } diff --git a/radarr/CHANGELOG.md b/radarr/CHANGELOG.md index aa402dffb..8b3120701 100644 --- a/radarr/CHANGELOG.md +++ b/radarr/CHANGELOG.md @@ -1,3 +1,7 @@ +### 4.3.2.6857-21 (17-03-2023) +- Minor bugs fixed +- Solve signalr error https://github.com/alexbelgium/hassio-addons/issues/757 +- Implemented healthcheck - Add ingress_disabled option - Ingress addition - BaseUrl definition to "radarr" diff --git a/radarr/Dockerfile b/radarr/Dockerfile index e2317348a..43cc6a866 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -65,7 +65,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -130,3 +130,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="7878" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/radarr/README.md b/radarr/README.md index 857395eaf..938dd2b1e 100644 --- a/radarr/README.md +++ b/radarr/README.md @@ -1,4 +1,4 @@ -## ⚠ Open Request : [✨ [REQUEST] AutoBrr (companion to Radarr an Sonarr) (opened 2022-11-29)](https://github.com/alexbelgium/hassio-addons/issues/581) by [@hacshacdgacs](https://github.com/hacshacdgacs) + # Home assistant add-on: Radarr [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +15,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/radarr/stats.png) ## About diff --git a/radarr/config.json b/radarr/config.json index 72d63ffff..9f31eb45e 100644 --- a/radarr/config.json +++ b/radarr/config.json @@ -84,5 +84,5 @@ }, "slug": "radarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/radarr", - "version": "4.3.2.6857-20" + "version": "4.3.2.6857-21" } diff --git a/radarr/rootfs/etc/nginx/includes/proxy_params.conf b/radarr/rootfs/etc/nginx/includes/proxy_params.conf index 924ba949e..e3cd0748e 100644 --- a/radarr/rootfs/etc/nginx/includes/proxy_params.conf +++ b/radarr/rootfs/etc/nginx/includes/proxy_params.conf @@ -7,8 +7,8 @@ proxy_max_temp_file_size 0; proxy_hide_header X-Frame-Options; proxy_set_header Accept-Encoding ""; -proxy_set_header Connection $connection_upgrade; -proxy_set_header Upgrade $http_upgrade; +#proxy_set_header Connection $http_connection; +#proxy_set_header Upgrade $http_upgrade; proxy_set_header Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; diff --git a/radarr/rootfs/etc/nginx/servers/ingress.conf b/radarr/rootfs/etc/nginx/servers/ingress.conf index 53900f0c2..82af95e24 100644 --- a/radarr/rootfs/etc/nginx/servers/ingress.conf +++ b/radarr/rootfs/etc/nginx/servers/ingress.conf @@ -1,8 +1,8 @@ server { listen %%interface%%:%%port%% default_server; - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; + #include /etc/nginx/includes/server_params.conf; + #include /etc/nginx/includes/proxy_params.conf; client_max_body_size 0; @@ -13,11 +13,17 @@ server { proxy_read_timeout 30m; proxy_pass http://127.0.0.1:7878; + # Allow signalr + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $http_connection; + #auth_basic off; + + # Correct base_url proxy_set_header Accept-Encoding ""; - # Correct url without port when using https - sub_filter_once off; - sub_filter_types *; - sub_filter /radarr %%ingress_entry%%/radarr; + sub_filter_once off; + sub_filter_types *; + sub_filter /radarr %%ingress_entry%%/radarr; } } diff --git a/radarr/stats.png b/radarr/stats.png new file mode 100644 index 000000000..b45ab5617 Binary files /dev/null and b/radarr/stats.png differ diff --git a/radarr/translations/en.yaml b/radarr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/radarr/translations/en.yaml +++ b/radarr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/readarr/CHANGELOG.md b/readarr/CHANGELOG.md index afe8f1576..8808da8b0 100644 --- a/readarr/CHANGELOG.md +++ b/readarr/CHANGELOG.md @@ -1,4 +1,19 @@ +## develop-0.1.4.1596-ls39 (08-04-2023) +- Update to latest version from linuxserver/docker-readarr + +## develop-0.1.4.1596-ls38 (31-03-2023) +- Update to latest version from linuxserver/docker-readarr + +## nightly-0.1.4.1596-ls167 (24-03-2023) +- Update to latest version from linuxserver/docker-readarr + +## nightly-0.1.4.1596-ls166 (04-03-2023) +- Update to latest version from linuxserver/docker-readarr + +## nightly-0.1.4.1591-ls165 (25-02-2023) +- Update to latest version from linuxserver/docker-readarr + ## nightly-0.1.3.1584-ls163 (19-02-2023) - Update to latest version from linuxserver/docker-readarr diff --git a/readarr/Dockerfile b/readarr/Dockerfile index 842b615ad..4fc93a497 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -66,7 +66,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -126,3 +126,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/readarr/README.md b/readarr/README.md index c9b4570cf..e82dbd8cb 100644 --- a/readarr/README.md +++ b/readarr/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/readarr/stats.png) ## About diff --git a/readarr/config.json b/readarr/config.json index 657f03aec..24abe17ee 100644 --- a/readarr/config.json +++ b/readarr/config.json @@ -84,5 +84,5 @@ }, "slug": "readarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/readarr", - "version": "nightly-0.1.3.1584-ls163-2" + "version": "develop-0.1.4.1596-ls39" } diff --git a/readarr/rootfs/etc/nginx/servers/ingress.conf b/readarr/rootfs/etc/nginx/servers/ingress.conf index cd50054dd..1c31de371 100644 --- a/readarr/rootfs/etc/nginx/servers/ingress.conf +++ b/readarr/rootfs/etc/nginx/servers/ingress.conf @@ -1,8 +1,8 @@ server { listen %%interface%%:%%port%% default_server; - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; + #include /etc/nginx/includes/server_params.conf; + #include /etc/nginx/includes/proxy_params.conf; client_max_body_size 0; @@ -13,11 +13,17 @@ server { proxy_read_timeout 30m; proxy_pass http://127.0.0.1:8787; + # Allow signalr + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $http_connection; + #auth_basic off; + + # Correct base_url proxy_set_header Accept-Encoding ""; - # Correct url without port when using https - sub_filter_once off; - sub_filter_types *; - sub_filter /readarr %%ingress_entry%%/readarr; + sub_filter_once off; + sub_filter_types *; + sub_filter /readarr %%ingress_entry%%/readarr; } } diff --git a/readarr/stats.png b/readarr/stats.png new file mode 100644 index 000000000..91c0aa6dc Binary files /dev/null and b/readarr/stats.png differ diff --git a/readarr/translations/en.yaml b/readarr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/readarr/translations/en.yaml +++ b/readarr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/readarr/updater.json b/readarr/updater.json index 4dd8af618..da6863970 100644 --- a/readarr/updater.json +++ b/readarr/updater.json @@ -1,10 +1,10 @@ { "github_beta": "true", "github_fulltag": "true", - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "readarr", "source": "github", "upstream_repo": "linuxserver/docker-readarr", - "upstream_version": "nightly-0.1.3.1584-ls163" + "upstream_version": "develop-0.1.4.1596-ls39" } diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index f68d1eb91..ed662496f 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -129,3 +129,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/requestrr/README.md b/requestrr/README.md index 16dfab24c..965e9f691 100644 --- a/requestrr/README.md +++ b/requestrr/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/requestrr/stats.png) ## About diff --git a/requestrr/stats.png b/requestrr/stats.png new file mode 100644 index 000000000..c404b48fa Binary files /dev/null and b/requestrr/stats.png differ diff --git a/requestrr/translations/en.yaml b/requestrr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/requestrr/translations/en.yaml +++ b/requestrr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 2547f3bb8..dc1e6181c 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -84,7 +84,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -149,3 +149,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/resiliosync/README.md b/resiliosync/README.md index 72de6bb13..8ebbb3c11 100644 --- a/resiliosync/README.md +++ b/resiliosync/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/resiliosync/stats.png) ## About diff --git a/resiliosync/stats.png b/resiliosync/stats.png new file mode 100644 index 000000000..349773e61 Binary files /dev/null and b/resiliosync/stats.png differ diff --git a/resiliosync/translations/en.yaml b/resiliosync/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/resiliosync/translations/en.yaml +++ b/resiliosync/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/sabnzbd/CHANGELOG.md b/sabnzbd/CHANGELOG.md index 0de1cac7e..cfe4d479c 100644 --- a/sabnzbd/CHANGELOG.md +++ b/sabnzbd/CHANGELOG.md @@ -1,4 +1,28 @@ +## 3.7.2-ls101 (08-04-2023) +- Update to latest version from linuxserver/docker-sabnzbd + +## 3.7.2-ls100 (31-03-2023) +- Update to latest version from linuxserver/docker-sabnzbd + +## 3.7.2-ls99 (25-03-2023) +- Update to latest version from linuxserver/docker-sabnzbd + +## 3.7.2-ls98 (24-03-2023) +- Update to latest version from linuxserver/docker-sabnzbd + +## 3.7.2-ls97 (18-03-2023) +- Update to latest version from linuxserver/docker-sabnzbd + +## 3.7.2-ls95 (11-03-2023) +- Update to latest version from linuxserver/docker-sabnzbd + +## 3.7.2-ls93 (04-03-2023) +- Update to latest version from linuxserver/docker-sabnzbd + +## 3.7.2-ls92 (25-02-2023) +- Update to latest version from linuxserver/docker-sabnzbd + ## 3.7.2-ls91 (19-02-2023) - Update to latest version from linuxserver/docker-sabnzbd diff --git a/sabnzbd/Dockerfile b/sabnzbd/Dockerfile index 13443b0a1..8f4ad1488 100644 --- a/sabnzbd/Dockerfile +++ b/sabnzbd/Dockerfile @@ -65,7 +65,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -125,3 +125,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/sabnzbd/README.md b/sabnzbd/README.md index 05f2ebe04..2067998fc 100644 --- a/sabnzbd/README.md +++ b/sabnzbd/README.md @@ -14,7 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) + +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/sabnzbd/stats.png) ## About diff --git a/sabnzbd/config.json b/sabnzbd/config.json index 060bc40dd..1fa4ee5be 100644 --- a/sabnzbd/config.json +++ b/sabnzbd/config.json @@ -81,6 +81,6 @@ }, "slug": "sabnzbd", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "3.7.2-ls91", + "version": "3.7.2-ls101", "webui": "http://[HOST]:[PORT:8080]" } diff --git a/sabnzbd/stats.png b/sabnzbd/stats.png new file mode 100644 index 000000000..f2f29c5d9 Binary files /dev/null and b/sabnzbd/stats.png differ diff --git a/sabnzbd/translations/en.yaml b/sabnzbd/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/sabnzbd/translations/en.yaml +++ b/sabnzbd/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/sabnzbd/updater.json b/sabnzbd/updater.json index b130a833b..2e2d79d86 100644 --- a/sabnzbd/updater.json +++ b/sabnzbd/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "sabnzbd", "source": "github", "upstream_repo": "linuxserver/docker-sabnzbd", - "upstream_version": "3.7.2-ls91" + "upstream_version": "3.7.2-ls101" } diff --git a/scrutiny/CHANGELOG.md b/scrutiny/CHANGELOG.md index ba1354d71..6c855dbd2 100644 --- a/scrutiny/CHANGELOG.md +++ b/scrutiny/CHANGELOG.md @@ -1,5 +1,10 @@ +## v0.7.0 (08-04-2023) +- Update to latest version from analogj/scrutiny +- Implemented healthcheck + ## v0.6.0 (14-01-2023) + - Update to latest version from analogj/scrutiny - WARNING : update to supervisor 2022.11 before installing - New options SMARTCTL_COMMAND_DEVICE_TYPE & SMARTCTL_MEGARAID_DISK_NUM (@scavara) diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile index cd730f26d..be62754c0 100644 --- a/scrutiny/Dockerfile +++ b/scrutiny/Dockerfile @@ -100,3 +100,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/api/health" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/scrutiny/README.md b/scrutiny/README.md index c08cae2ab..5fe605f17 100644 --- a/scrutiny/README.md +++ b/scrutiny/README.md @@ -1,4 +1,3 @@ - # Home assistant add-on: Scrutiny [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/scrutiny/stats.png) ## About @@ -42,9 +42,9 @@ It automatically mounts all local drives. Enable full access only if you are encountering issues. SMART access should work without full access in all other scenarios. ```yaml -Updates : Hourly, Daily, Weekly -TZ : timezone -Mode : Collector+WebUI or Collector only +Updates: Hourly, Daily, Weekly +TZ: timezone +Mode: Collector+WebUI or Collector only ``` ## Installation @@ -70,7 +70,7 @@ Integration with HA can be done with the [rest platform](https://www.home-assist Two types of api endpoints are available: - Summary data : http://YOURIP:ADDONPORT/api/summary -- Detailed data : http://YOURIP:ADDONPORT/api/WWN/details +- Detailed data : http://YOURIP:ADDONPORT/api/device/WWN/details For the detailed data, wmn can be found for each hdd within the scrutiny app. For example for me : http://192.168.178.23:8086/api/device/0x50014ee606c14537/details diff --git a/scrutiny/config.json b/scrutiny/config.json index 75b0e02d8..7ab80a038 100644 --- a/scrutiny/config.json +++ b/scrutiny/config.json @@ -85,5 +85,5 @@ "slug": "scrutiny", "udev": true, "url": "https://github.com/AnalogJ/scrutiny", - "version": "v0.6.0-2" + "version": "v0.7.0" } diff --git a/scrutiny/rootfs/etc/cont-init.d/01-configuration.sh b/scrutiny/rootfs/etc/cont-init.d/01-configuration.sh index 191fb2f50..148a33880 100755 --- a/scrutiny/rootfs/etc/cont-init.d/01-configuration.sh +++ b/scrutiny/rootfs/etc/cont-init.d/01-configuration.sh @@ -45,15 +45,15 @@ bashio::log.info "$FREQUENCY updates" case "$FREQUENCY" in "Hourly") - sed -i "1a export COLLECTOR_CRON_SCHEDULE=\"0 * * * *\"" /etc/cont-init.d/50-cron-config + sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"0 * * * *\"" /etc/cont-init.d/50-cron-config ;; "Daily") - sed -i "1a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * *\"" /etc/cont-init.d/50-cron-config + sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * *\"" /etc/cont-init.d/50-cron-config ;; "Weekly") - sed -i "1a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * 0\"" /etc/cont-init.d/50-cron-config + sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * 0\"" /etc/cont-init.d/50-cron-config ;; esac diff --git a/scrutiny/stats.png b/scrutiny/stats.png new file mode 100644 index 000000000..21c462778 Binary files /dev/null and b/scrutiny/stats.png differ diff --git a/scrutiny/translations/en.yaml b/scrutiny/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/scrutiny/translations/en.yaml +++ b/scrutiny/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/scrutiny/updater.json b/scrutiny/updater.json index 6f650dd78..651a80f7a 100644 --- a/scrutiny/updater.json +++ b/scrutiny/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "14-01-2023", + "last_update": "08-04-2023", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "scrutiny", "source": "github", "upstream_repo": "analogj/scrutiny", - "upstream_version": "v0.6.0" + "upstream_version": "v0.7.0" } diff --git a/scrutiny_fa/CHANGELOG.md b/scrutiny_fa/CHANGELOG.md index 8ff2919b9..faa3ebb7e 100644 --- a/scrutiny_fa/CHANGELOG.md +++ b/scrutiny_fa/CHANGELOG.md @@ -1,11 +1,17 @@ +## v0.7.0 (08-04-2023) +- Update to latest version from analogj/scrutiny +- Implemented healthcheck + ## v0.6.0 (14-01-2023) + - Update to latest version from analogj/scrutiny - WARNING : update to supervisor 2022.11 before installing - New options SMARTCTL_COMMAND_DEVICE_TYPE & SMARTCTL_MEGARAID_DISK_NUM (@scavara) - New option "Mode" : Collector+WebUI or Collector only ## v0.5.0 (26-08-2022) + - Update to latest version from analogj/scrutiny - BACKUP BEFORE UPDATE : major version change diff --git a/scrutiny_fa/Dockerfile b/scrutiny_fa/Dockerfile index cd730f26d..be62754c0 100644 --- a/scrutiny_fa/Dockerfile +++ b/scrutiny_fa/Dockerfile @@ -100,3 +100,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8080" \ + HEALTH_URL="/api/health" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/scrutiny_fa/README.md b/scrutiny_fa/README.md index 1085b7526..0f3fcd7f0 100644 --- a/scrutiny_fa/README.md +++ b/scrutiny_fa/README.md @@ -1,4 +1,3 @@ - # Home assistant add-on: Scrutiny [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/scrutiny_fa/stats.png) ## About @@ -42,8 +42,8 @@ It automatically mounts all local drives. Enable full access only if you are encountering issues. SMART access should work without full access in all other scenarios. ```yaml -Updates : Hourly, Daily, Weekly -TZ : timezone +Updates: Hourly, Daily, Weekly +TZ: timezone ``` ## Installation @@ -69,7 +69,7 @@ Integration with HA can be done with the [rest platform](https://www.home-assist Two types of api endpoints are available: - Summary data : http://YOURIP:ADDONPORT/api/summary -- Detailed data : http://YOURIP:ADDONPORT/api/WWN/details +- Detailed data : http://YOURIP:ADDONPORT/api/device/WWN/details For the detailed data, wmn can be found for each hdd within the scrutiny app. For example for me : http://192.168.178.23:8086/api/device/0x50014ee606c14537/details diff --git a/scrutiny_fa/config.json b/scrutiny_fa/config.json index ea3deb0c3..4604cd759 100644 --- a/scrutiny_fa/config.json +++ b/scrutiny_fa/config.json @@ -48,5 +48,5 @@ "slug": "scrutiny_fa", "udev": true, "url": "https://github.com/AnalogJ/scrutiny", - "version": "v0.6.0" + "version": "v0.7.0" } diff --git a/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh b/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh index 21449bde4..0bd9baca1 100755 --- a/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh +++ b/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh @@ -51,15 +51,15 @@ bashio::log.info "$FREQUENCY updates" case "$FREQUENCY" in "Hourly") - sed -i "1a export COLLECTOR_CRON_SCHEDULE=\"0 * * * *\"" /etc/cont-init.d/50-cron-config + sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"0 * * * *\"" /etc/cont-init.d/50-cron-config ;; "Daily") - sed -i "1a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * *\"" /etc/cont-init.d/50-cron-config + sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * *\"" /etc/cont-init.d/50-cron-config ;; "Weekly") - sed -i "1a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * 0\"" /etc/cont-init.d/50-cron-config + sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * 0\"" /etc/cont-init.d/50-cron-config ;; esac diff --git a/scrutiny_fa/stats.png b/scrutiny_fa/stats.png new file mode 100644 index 000000000..80caa918f Binary files /dev/null and b/scrutiny_fa/stats.png differ diff --git a/scrutiny_fa/translations/en.yaml b/scrutiny_fa/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/scrutiny_fa/translations/en.yaml +++ b/scrutiny_fa/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/scrutiny_fa/updater.json b/scrutiny_fa/updater.json index 92800c53b..9108892cf 100644 --- a/scrutiny_fa/updater.json +++ b/scrutiny_fa/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "14-01-2023", + "last_update": "08-04-2023", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "scrutiny_fa", "source": "github", "upstream_repo": "analogj/scrutiny", - "upstream_version": "v0.6.0" + "upstream_version": "v0.7.0" } diff --git a/seafile/CHANGELOG.md b/seafile/CHANGELOG.md index 68aa5bb48..5fb9c54a8 100644 --- a/seafile/CHANGELOG.md +++ b/seafile/CHANGELOG.md @@ -1,4 +1,7 @@ +## 10.0.0 (24-03-2023) +- Update to latest version from franchetti/seafile-arm + ## 9.0.10 (28-01-2023) - Update to latest version from franchetti/seafile-arm - Allow setting server url diff --git a/seafile/Dockerfile b/seafile/Dockerfile index 86d286452..838d2af73 100644 --- a/seafile/Dockerfile +++ b/seafile/Dockerfile @@ -45,7 +45,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-config_yaml.sh 00-global_var.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 90-config_yaml.sh 00-global_var.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -104,3 +104,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/seafile/README.md b/seafile/README.md index 883090aeb..3f6d8eba6 100644 --- a/seafile/README.md +++ b/seafile/README.md @@ -1,4 +1,3 @@ -## ⚠ Open Issue : [🐛 [Seafile] localdisk mount, does not work (opened 2023-02-14)](https://github.com/alexbelgium/hassio-addons/issues/710) by [@cokeman0](https://github.com/cokeman0) # Home assistant add-on: seafile [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/seafile/stats.png) ## About @@ -52,6 +52,8 @@ Configurations can be done through the app webUI, except for the following optio Default name : me@example.com Default password : a_very_secret_password +If you store your database on a mounted drive, make sure to also host your sqlite database there : otherwise if there is an issue with the mount you'll lose your whole database (thanks @cokeman0) + ```yaml PGID: user GPID: user diff --git a/seafile/config.json b/seafile/config.json index f78121643..54931e3b9 100644 --- a/seafile/config.json +++ b/seafile/config.json @@ -117,6 +117,6 @@ ], "slug": "seafile", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/seafile", - "version": "9.0.10-2", + "version": "10.0.0", "webui": "http://[HOST]:[PORT:8000]" } diff --git a/seafile/rootfs/entrypoint.sh b/seafile/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/seafile/rootfs/entrypoint.sh +++ b/seafile/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/seafile/stats.png b/seafile/stats.png new file mode 100644 index 000000000..deb6c7e75 Binary files /dev/null and b/seafile/stats.png differ diff --git a/seafile/translations/en.yaml b/seafile/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/seafile/translations/en.yaml +++ b/seafile/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/seafile/updater.json b/seafile/updater.json index e25766ae5..833c858d6 100644 --- a/seafile/updater.json +++ b/seafile/updater.json @@ -1,10 +1,10 @@ { "github_fulltag": "true", - "last_update": "28-01-2023", + "last_update": "24-03-2023", "paused": false, "repository": "alexbelgium/hassio-addons", "slug": "seafile", "source": "dockerhub", "upstream_repo": "franchetti/seafile-arm", - "upstream_version": "9.0.10" + "upstream_version": "10.0.0" } diff --git a/sonarr/CHANGELOG.md b/sonarr/CHANGELOG.md index 22cd8b94d..06b68d213 100644 --- a/sonarr/CHANGELOG.md +++ b/sonarr/CHANGELOG.md @@ -1,3 +1,13 @@ +### 3.0.10.1567-2 (19-03-2023) +- Minor bugs fixed +- Corrected ingress bug https://github.com/alexbelgium/hassio-addons/issues/758 + +## 3.0.10.1567 (18-03-2023) +- Update to latest version from linuxserver/docker-sonarr +- Implemented healthcheck + +## 3.0.10.1566 (11-03-2023) +- Update to latest version from linuxserver/docker-sonarr - Add ingress_disabled option - Ingress addition - BaseUrl definition to "sonarr" diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index faac3b5a1..42438ec4d 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="3.0.9.1549" +ARG BUILD_UPSTREAM="3.0.10.1567" FROM ${BUILD_FROM} ################## @@ -66,7 +66,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 90-disable_ingress.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -130,3 +130,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8989" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/sonarr/README.md b/sonarr/README.md index 6626fee78..f107136aa 100644 --- a/sonarr/README.md +++ b/sonarr/README.md @@ -1,4 +1,4 @@ -## ⚠ Open Request : [✨ [REQUEST] AutoBrr (companion to Radarr an Sonarr) (opened 2022-11-29)](https://github.com/alexbelgium/hassio-addons/issues/581) by [@hacshacdgacs](https://github.com/hacshacdgacs) + # Home assistant add-on: Sonarr [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +15,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/sonarr/stats.png) ## About diff --git a/sonarr/config.json b/sonarr/config.json index 424cd596e..32aedc222 100644 --- a/sonarr/config.json +++ b/sonarr/config.json @@ -84,5 +84,5 @@ }, "slug": "sonarr_nas", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/sonarr", - "version": "3.0.9.1549-12" + "version": "3.0.10.1567-2" } diff --git a/sonarr/rootfs/etc/nginx/servers/ingress.conf b/sonarr/rootfs/etc/nginx/servers/ingress.conf index caf481a01..c94fb293e 100644 --- a/sonarr/rootfs/etc/nginx/servers/ingress.conf +++ b/sonarr/rootfs/etc/nginx/servers/ingress.conf @@ -1,8 +1,8 @@ server { listen %%interface%%:%%port%% default_server; - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; + #include /etc/nginx/includes/server_params.conf; + #include /etc/nginx/includes/proxy_params.conf; client_max_body_size 0; @@ -13,11 +13,17 @@ server { proxy_read_timeout 30m; proxy_pass http://127.0.0.1:8989; + # Allow signalr + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $http_connection; + #auth_basic off; + + # Correct base_url proxy_set_header Accept-Encoding ""; - # Correct url without port when using https - sub_filter_once off; - sub_filter_types *; - sub_filter /sonarr %%ingress_entry%%/sonarr; + sub_filter_once off; + sub_filter_types *; + sub_filter /sonarr %%ingress_entry%%/sonarr; } } diff --git a/sonarr/stats.png b/sonarr/stats.png new file mode 100644 index 000000000..32cd4045e Binary files /dev/null and b/sonarr/stats.png differ diff --git a/sonarr/translations/en.yaml b/sonarr/translations/en.yaml index 1efab343e..f138d549f 100644 --- a/sonarr/translations/en.yaml +++ b/sonarr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/sonarr/updater.json b/sonarr/updater.json index 11aaa94a3..5fd345e50 100644 --- a/sonarr/updater.json +++ b/sonarr/updater.json @@ -1,8 +1,8 @@ { - "last_update": "09-08-2022", + "last_update": "18-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "sonarr", "source": "github", "upstream_repo": "linuxserver/docker-sonarr", - "upstream_version": "3.0.9.1549" + "upstream_version": "3.0.10.1567" } diff --git a/sponsorblockcast/CHANGELOG.md b/sponsorblockcast/CHANGELOG.md new file mode 100644 index 000000000..b00b87335 --- /dev/null +++ b/sponsorblockcast/CHANGELOG.md @@ -0,0 +1,5 @@ +### 1.00 (14-03-2023) +- Minor bugs fixed +## 1.0 + +- Initial build diff --git a/sponsorblockcast/Dockerfile b/sponsorblockcast/Dockerfile new file mode 100644 index 000000000..9f1b3901c --- /dev/null +++ b/sponsorblockcast/Dockerfile @@ -0,0 +1,104 @@ +#============================# +# ALEXBELGIUM'S DOCKERFILE # +#============================# +# _.------. +# _.-` ('>.-`"""-. +# '.--'` _'` _ .--.) +# -' '-.-';` ` +# ' - _.' ``'--. +# '---` .-'""` +# /` +#=== Home Assistant Addon ===# + +################# +# 1 Build Image # +################# + +ARG BUILD_FROM +FROM $BUILD_FROM +VOLUME [ "/data" ] + +################## +# 2 Modify Image # +################## + +################## +# 3 Install apps # +################## + +# Add rootfs +COPY rootfs/ / + +# Corrects permissions for s6 v3 +RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ + if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ + if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi + +# Modules +ARG MODULES="00-banner.sh 01-custom_script.sh" + +# Automatic modules download +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ + && mkdir -p /etc/cont-init.d \ + && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ + && chmod -R 755 /etc/cont-init.d + +# Manual apps +ENV PACKAGES="" + +# Automatic apps & bashio +# hadolint ignore=SC2015 +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ + && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ + && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ + && chmod 777 /automatic_packages.sh \ + && eval /./automatic_packages.sh "${PACKAGES:-}" \ + && rm /automatic_packages.sh + +################ +# 4 Entrypoint # +################ + +# Entrypoint logic +RUN chmod 777 /entrypoint.sh +#WORKDIR / +ENTRYPOINT [ "/usr/bin/env" ] +CMD [ "/entrypoint.sh" ] +# Set shell +SHELL ["/bin/bash", "-o", "pipefail", "-c"] + +############ +# 5 Labels # +############ + +ARG BUILD_ARCH +ARG BUILD_DATE +ARG BUILD_DESCRIPTION +ARG BUILD_NAME +ARG BUILD_REF +ARG BUILD_REPOSITORY +ARG BUILD_VERSION +LABEL \ + io.hass.name="${BUILD_NAME}" \ + io.hass.description="${BUILD_DESCRIPTION}" \ + io.hass.arch="${BUILD_ARCH}" \ + io.hass.type="addon" \ + io.hass.version=${BUILD_VERSION} \ + maintainer="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.title="${BUILD_NAME}" \ + org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ + org.opencontainers.image.vendor="Home Assistant Add-ons" \ + org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.url="https://github.com/alexbelgium" \ + org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ + org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/sponsorblockcast/README.md b/sponsorblockcast/README.md new file mode 100644 index 000000000..dc91759d8 --- /dev/null +++ b/sponsorblockcast/README.md @@ -0,0 +1,53 @@ + +# Home assistant add-on: Sponsorblockcast + +[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) + +![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fsponsorblockcast%2Fconfig.json) +![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fsponsorblockcast%2Fconfig.json) +![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fsponsorblockcast%2Fconfig.json) + +[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade) +[![GitHub Super-Linter](https://github.com/alexbelgium/hassio-addons/workflows/Lint%20Code%20Base/badge.svg)](https://github.com/marketplace/actions/super-linter) +[![Builder](https://github.com/alexbelgium/hassio-addons/workflows/Builder/badge.svg)](https://github.com/alexbelgium/hassio-addons/actions/workflows/builder.yaml) + +[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white + +_Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ + +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) + +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/sponsorblockcast/stats.png) + +## About + +Sponsorblockcast is a POSIX shell script that skips sponsored YouTube content and skippable ads on all local Chromecasts, using the SponsorBlock API. It was inspired by CastBlock but written from scratch to avoid some of its pitfalls (see Differences from CastBlock). + +This app is developed by @nichobi here : https://github.com/nichobi/sponsorblockcast + +Feedback from @diamant-x : +> Special attention that it only works when casting to a chromecast a youtube video. It mostly removes manual interaction, can't magically skip ads when they are forced to be viewed. +> Also, it doesn't seem to work when playing on an android tv through native youtube app, which would be a great addition, or on a smartphone. + +## Configuration + +See https://github.com/nichobi/sponsorblockcast + +## Installation + +The installation of this add-on is pretty straightforward and not different in +comparison to installing any other Hass.io add-on. + +1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance. +1. Install this add-on. +1. Click the `Save` button to store your configuration. +1. Start the add-on. +1. Check the logs of the add-on to see if everything went well. +1. Carefully configure the add-on to your preferences, see the official documentation for for that. + +## Support and issues + +Addon : here +App : https://github.com/nichobi/sponsorblockcast + +[repository]: https://github.com/alexbelgium/hassio-addons diff --git a/sponsorblockcast/apparmor.txt b/sponsorblockcast/apparmor.txt new file mode 100644 index 000000000..7d7a544e0 --- /dev/null +++ b/sponsorblockcast/apparmor.txt @@ -0,0 +1,58 @@ +#include + +profile addon_updater flags=(attach_disconnected,mediate_deleted) { + #include + + # Capabilities + file, + signal, + network udp, + network tcp, + network dgram, + network stream, + network inet, + network inet6, + network netlink raw, + network unix dgram, + + # S6-Overlay + /init ix, + /run/{s6,s6-rc*,service}/** ix, + /package/** ix, + /command/** ix, + /run/{,**} rwk, + /dev/tty rw, + /init rix, + /bin/** ix, + /usr/bin/** ix, + /etc/s6/** rix, + /run/s6/** rwix, + /etc/services.d/** rwix, + /etc/cont-init.d/** rwix, + /etc/cont-finish.d/** rwix, + /run/** rwk, + /dev/fuse mrwkl, + /dev/sda1 mrwkl, + /dev/sdb1 mrwkl, + /dev/nvme0 mrwkl, + /dev/nvme1 mrwkl, + /dev/mmcblk0p1 mrwkl, + + # bashio + /usr/lib/bashio/** ix, + /tmp/** rw, + + # Access to Options.json and other files within your addon + /data/** rw, + + # Start new profile for service + /usr/bin/myprogram cx, + + profile usr/bin/myprogram flags=(attach_disconnected,mediate_deleted) { + #include + + # Receive signals from S6-Overlay + signal receive, + } +} + diff --git a/sponsorblockcast/build.json b/sponsorblockcast/build.json new file mode 100644 index 000000000..4248b7c03 --- /dev/null +++ b/sponsorblockcast/build.json @@ -0,0 +1,10 @@ +{ + "build_from": { + "aarch64": "ghcr.io/nichobi/sponsorblockcast:latest", + "amd64": "ghcr.io/nichobi/sponsorblockcast:latest", + "armv7": "ghcr.io/nichobi/sponsorblockcast:latest" + }, + "codenotary": { + "signer": "alexandrep.github@gmail.com" + } +} diff --git a/sponsorblockcast/config.json b/sponsorblockcast/config.json new file mode 100644 index 000000000..2b9d44325 --- /dev/null +++ b/sponsorblockcast/config.json @@ -0,0 +1,30 @@ +{ + "arch": [ + "aarch64", + "amd64", + "armv7" + ], + "codenotary": "alexandrep.github@gmail.com", + "description": "skips sponsored YouTube content on all local Chromecasts", + "environment": { + "SBCDIR": "/tmp/sponsorblockcast" + }, + "host_network": true, + "image": "ghcr.io/alexbelgium/sponsorblockcast-{arch}", + "init": false, + "name": "Sponsorblockcast", + "options": { + "SBCCATEGORIES": "sponsor", + "SBCPOLLINTERVAL": "1", + "SBCSCANINTERVAL": "300" + }, + "schema": { + "SBCCATEGORIES": "str", + "SBCPOLLINTERVAL": "int", + "SBCSCANINTERVAL": "int", + "SBCYOUTUBEAPIKEY": "str?" + }, + "slug": "sponsorblockcast", + "url": "https://github.com/alexbelgium/hassio-addons/tree/master/sponsorblockcast", + "version": "1.0" +} diff --git a/sponsorblockcast/icon.png b/sponsorblockcast/icon.png new file mode 100644 index 000000000..483d3cd9b Binary files /dev/null and b/sponsorblockcast/icon.png differ diff --git a/sponsorblockcast/logo.png b/sponsorblockcast/logo.png new file mode 100644 index 000000000..483d3cd9b Binary files /dev/null and b/sponsorblockcast/logo.png differ diff --git a/sponsorblockcast/rootfs/entrypoint.sh b/sponsorblockcast/rootfs/entrypoint.sh new file mode 100755 index 000000000..68c3fec4d --- /dev/null +++ b/sponsorblockcast/rootfs/entrypoint.sh @@ -0,0 +1,16 @@ +#!/bin/bash +echo "Starting..." + +#################### +# Starting scripts # +#################### + +for SCRIPTS in /etc/cont-init.d/*; do + [ -e "$SCRIPTS" ] || continue + echo "$SCRIPTS: executing" + chown "$(id -u)":"$(id -g)" "$SCRIPTS" + chmod a+x "$SCRIPTS" + # Change shebang if no s6 supervision + sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" + /."$SCRIPTS" || echo "$SCRIPTS: exiting $?" +done diff --git a/sponsorblockcast/rootfs/etc/cont-init.d/99-run.sh b/sponsorblockcast/rootfs/etc/cont-init.d/99-run.sh new file mode 100755 index 000000000..e9d8f96ab --- /dev/null +++ b/sponsorblockcast/rootfs/etc/cont-init.d/99-run.sh @@ -0,0 +1,16 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash + +# make directory +mkdir -p /tmp/sponsorblockcast + +# Export options as env variables +for var in SBCPOLLINTERVAL SBCSCANINTERVAL SBCCATEGORIES SBCYOUTUBEAPIKEY; do + if bashio::config.has_value "$var"; then + export "$var"="$(bashio::config "$var")" + fi +done + +# Starting app +bashio::log.info "Starting app" +/./usr/bin/sponsorblockcast &>/proc/1/fd/1 diff --git a/sponsorblockcast/stats.png b/sponsorblockcast/stats.png new file mode 100644 index 000000000..ddbbae2c1 Binary files /dev/null and b/sponsorblockcast/stats.png differ diff --git a/sponsorblockcast/translations/en.yaml b/sponsorblockcast/translations/en.yaml new file mode 100644 index 000000000..f5df557fd --- /dev/null +++ b/sponsorblockcast/translations/en.yaml @@ -0,0 +1,662 @@ +--- +configuration: + additional_apps: + name: additional_apps + description: Additional apps to install at boot + allow_ipv6: + name: allow_ipv6 + description: Enables ipv6 in the addon + ALLOW_SIGNUP: + name: ALLOW_SIGNUP + description: See upstream app documentation + ALLOWED_HOSTS: + name: ALLOWED_HOSTS + description: See upstream app documentation + APP_BASE_URL: + name: APP_BASE_URL + description: See upstream app documentation + APP_KEY: + name: APP_KEY + description: See upstream app documentation + APP_NAME: + name: APP_NAME + description: See upstream app documentation + append_myip: + name: append_myip + description: See upstream app documentation + auto_restart: + name: auto_restart + description: See upstream app documentation + BACKUP_PATH: + name: BACKUP_PATH + description: See upstream app documentation + base_folder: + name: base_folder + description: See upstream app documentation + BASE_URL: + name: BASE_URL + description: See upstream app documentation + base_url_portless: + name: base_url_portless + description: See upstream app documentation + certfile: + name: certfile + description: "fullchain.pem #ssl certificate, must be located in /ssl" + checkip_command: + name: checkip_command + description: See upstream app documentation + checkip_path: + name: checkip_path + description: See upstream app documentation + checkip_server: + name: checkip_server + description: See upstream app documentation + checkip_ssl: + name: checkip_ssl + description: See upstream app documentation + cifsdomain: + name: cifsdomain + description: Allow setting the domain for the smb share + cifspassword: + name: cifspassword + description: Your password to access your SMB share, same for all smb shares + cifsusername: + name: cifsusername + description: Your username to access your SMB share, same for all smb shares + claim: + name: claim + description: See upstream app documentation + CLI_ARGS: + name: CLI_ARGS + description: See upstream app documentation + COLLECTOR_API_ENDPOINT: + name: COLLECTOR_API_ENDPOINT + description: See upstream app documentation + COLLECTOR_HOST_ID: + name: COLLECTOR_HOST_ID + description: See upstream app documentation + CONFIG_LOCATION: + name: CONFIG_LOCATION + description: See upstream app documentation + CUSTOM_OPTIONS: + name: CUSTOM_OPTIONS + description: See upstream app documentation + custom_provider: + name: custom_provider + description: See upstream app documentation + customUI: + name: customUI + description: selection from list # alternative webUI can be set here + data_directory: + name: data_directory + description: See upstream app documentation + data_location: + name: data_location + description: Where do you want your data stored + database: + name: database + description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui + DB_CLIENT: + name: DB_CLIENT + description: See upstream app documentation + DB_CONNECTION: + name: DB_CONNECTION + description: See upstream app documentation + DB_DATABASE: + name: DB_DATABASE + description: See upstream app documentation + DB_DATABASE_NAME: + name: DB_DATABASE_NAME + description: If using external postgresql + DB_HOST: + name: DB_HOST + description: See upstream app documentation + DB_HOSTNAME: + name: DB_HOSTNAME + description: If using external database + DB_PASSWORD: + name: DB_PASSWORD + description: If using external database + DB_PORT: + name: DB_PORT + description: If using external database + DB_TYPE: + name: DB_TYPE + description: See upstream app documentation + DB_USERNAME: + name: DB_USERNAME + description: If using external database + ddns_path: + name: ddns_path + description: See upstream app documentation + ddns_server: + name: ddns_server + description: See upstream app documentation + DEBUG: + name: DEBUG + description: See upstream app documentation + DISABLE_MACHINE_LEARNING: + name: DISABLE_MACHINE_LEARNING + description: See upstream app documentation + DNS_server: + name: DNS_server + description: See upstream app documentation + DOCKER_MODS: + name: DOCKER_MODS + description: See upstream app documentation + DOMAIN: + name: DOMAIN + description: See upstream app documentation + download_dir: + name: download_dir + description: See upstream app documentation + downloads_location: + name: downloads_location + description: See upstream app documentation + DROPBOX_TOKEN: + name: DROPBOX_TOKEN + description: See upstream app documentation + edge_repositories: + name: edge_repositories + description: See upstream app documentation + elasticsearch_server: + name: elasticsearch_server + description: See upstream app documentation + expose_collector: + name: expose_collector + description: See upstream app documentation + EXTENSIONS: + name: EXTENSIONS + description: See upstream app documentation + extraction_path: + name: extraction_path + description: See upstream app documentation + fake_address: + name: fake_address + description: See upstream app documentation + FG_LOG_LEVEL: + name: FG_LOG_LEVEL + description: See upstream app documentation + FG_PLUGINS: + name: FG_PLUGINS + description: See upstream app documentation + FIREFLY_III_ACCESS_TOKEN: + name: FIREFLY_III_ACCESS_TOKEN + description: See upstream app documentation + FIREFLY_III_CLIENT_ID: + name: FIREFLY_III_CLIENT_ID + description: See upstream app documentation + FIREFLY_III_URL: + name: FIREFLY_III_URL + description: See upstream app documentation + forced_update: + name: forced_update + description: See upstream app documentation + Full_Text_Search: + name: Full_Text_Search + description: See upstream app documentation + gitapi: + name: gitapi + description: See upstream app documentation + gitmail: + name: gitmail + description: See upstream app documentation + gitpass: + name: gitpass + description: See upstream app documentation + gituser: + name: gituser + description: See upstream app documentation + graphic_drivers: + name: graphic_drivers + description: See upstream app documentation + hostname: + name: hostname + description: See upstream app documentation + HTTPS_ONLY: + name: HTTPS_ONLY + description: See upstream app documentation + iface: + name: iface + description: See upstream app documentation + Images_location: + name: Images_location + description: See upstream app documentation + imaphost: + name: imaphost + description: See upstream app documentation + imappassword: + name: imappassword + description: See upstream app documentation + imapusername: + name: imapusername + description: See upstream app documentation + import_dir: + name: import_dir + description: See upstream app documentation + IMPORT_PATH: + name: IMPORT_PATH + description: See upstream app documentation + incomplete_dir: + name: incomplete_dir + description: See upstream app documentation + ingress_disabled: + name: ingress_disabled + description: See upstream app documentation + ingress_user: + name: ingress_user + description: See upstream app documentation + INTERFACE_NAME: + name: INTERFACE_NAME + description: See upstream app documentation + iterations: + name: iterations + description: See upstream app documentation + JWT_SECRET: + name: JWT_SECRET + description: Used to sign the authentication keys for user login + KEYBOARD: + name: KEYBOARD + description: See upstream app documentation + keyfile: + name: keyfile + description: privkey.pem #sslkeyfile, must be located in /ssl + LOCAL_NETWORK: + name: LOCAL_NETWORK + description: See upstream app documentation + localdisks: + name: localdisks + description: Physical name of the partition (ex. sda1) or the share (ex. SharedFiles) to mount separated by commas (ex. sda1,sdb1,MYNAS) + log_level: + name: log_level + description: See upstream app documentation + MAILER_AUTH_PASSWORD: + name: MAILER_AUTH_PASSWORD + description: See upstream app documentation + MAILER_AUTH_USER: + name: MAILER_AUTH_USER + description: See upstream app documentation + MAILER_ENABLED: + name: MAILER_ENABLED + description: See upstream app documentation + OPENVPN_PROVIDER: + name: OPENVPN_PROVIDER + description: See upstream app documentation + OPENVPN_USERNAME: + name: OPENVPN_USERNAME + description: See upstream app documentation + ORIGINALS_PATH: + name: ORIGINALS_PATH + description: See upstream app documentation + PAPERLESS_OCR_MODE: + name: PAPERLESS_OCR_MODE + description: See upstream app documentation + PAPERLESS_URL: + name: PAPERLESS_URL + description: See upstream app documentation + pass: + name: pass + description: See upstream app documentation + password: + name: password + description: See upstream app documentation + period: + name: period + description: See upstream app documentation + PGID: + name: PGID + description: The user group ID, as described in https://docs.linuxserver.io/general/understanding-puid-and-pgid + PMM_CONFIG: + name: PMM_CONFIG + description: See upstream app documentation + PMM_NO_MISSING: + name: PMM_NO_MISSING + description: See upstream app documentation + PMM_RUN: + name: PMM_RUN + description: See upstream app documentation + PMM_TEST: + name: PMM_TEST + description: See upstream app documentation + PMM_TIME: + name: PMM_TIME + description: See upstream app documentation + POSTGRES_DATABASE: + name: POSTGRES_DATABASE + description: See upstream app documentation + POSTGRES_DB: + name: POSTGRES_DB + description: See upstream app documentation + POSTGRES_HOST: + name: POSTGRES_HOST + description: See upstream app documentation + POSTGRES_PASSWORD: + name: POSTGRES_PASSWORD + description: See upstream app documentation + POSTGRES_PORT: + name: POSTGRES_PORT + description: See upstream app documentation + POSTGRES_USER: + name: POSTGRES_USER + description: See upstream app documentation + provider: + name: provider + description: See upstream app documentation + providers: + name: providers + description: See upstream app documentation + proxied: + name: proxied + description: See upstream app documentation + PUID: + name: PUID + description: The user group ID, as described in https://docs.linuxserver.io/general/understanding-puid-and-pgid + remote_mysql_database: + name: remote_mysql_database + description: See upstream app documentation + remote_mysql_host: + name: remote_mysql_host + description: See upstream app documentation + remote_mysql_password: + name: remote_mysql_password + description: See upstream app documentation + remote_mysql_port: + name: remote_mysql_port + description: See upstream app documentation + remote_mysql_username: + name: remote_mysql_username + description: See upstream app documentation + repository: + name: repository + description: See upstream app documentation + request_size_limit: + name: request_size_limit + description: See upstream app documentation + ROOT_URL: + name: ROOT_URL + description: See upstream app documentation + ROUTER_IP: + name: ROUTER_IP + description: See upstream app documentation + rpi_video_drivers: + name: rpi_video_drivers + description: See upstream app documentation + run_duration: + name: run_duration + description: 12h #for how long should the addon run. Must be formatted as number + time unit (ex : 5s, or 2m, or 12h, or 5d...) + SavePath: + name: SavePath + description: See upstream app documentation + SEAFILE_ADMIN_EMAIL: + name: SEAFILE_ADMIN_EMAIL + description: See upstream app documentation + SEAFILE_ADMIN_PASSWORD: + name: SEAFILE_ADMIN_PASSWORD + description: See upstream app documentation + SECRET_KEY: + name: SECRET_KEY + description: See upstream app documentation + secret_token: + name: secret_token + description: See upstream app documentation + secure_ssl: + name: secure_ssl + description: See upstream app documentation + silent: + name: silent + description: "true #suppresses debug messages" + SMARTCTL_COMMAND_DEVICE_TYPE: + name: SMARTCTL_COMMAND_DEVICE_TYPE + description: See upstream app documentation + SMARTCTL_MEGARAID_DISK_NUM: + name: SMARTCTL_MEGARAID_DISK_NUM + description: See upstream app documentation + smbv1: + name: smbv1 + description: See upstream app documentation + SPECTRE_APP_ID: + name: SPECTRE_APP_ID + description: See upstream app documentation + SPECTRE_SECRET: + name: SPECTRE_SECRET + description: See upstream app documentation + ssl: + name: ssl + description: true/false. enables ssl. Need certfile and keyfile filled' + storage_dir: + name: storage_dir + description: See upstream app documentation + STORAGE_PATH: + name: STORAGE_PATH + description: See upstream app documentation + theme: + name: theme + description: See upstream app documentation + TRANSMISSION_DOWNLOAD_DIR: + name: TRANSMISSION_DOWNLOAD_DIR + description: See upstream app documentation + TRANSMISSION_HOME: + name: TRANSMISSION_HOME + description: See upstream app documentation + TRANSMISSION_INCOMPLETE_DIR: + name: TRANSMISSION_INCOMPLETE_DIR + description: See upstream app documentation + TRANSMISSION_V3_UPDATE: + name: TRANSMISSION_V3_UPDATE + description: See upstream app documentation + TRANSMISSION_WATCH_DIR: + name: TRANSMISSION_WATCH_DIR + description: See upstream app documentation + TRANSMISSION_WEB_UI: + name: TRANSMISSION_WEB_UI + description: See upstream app documentation + trusted_domains: + name: trusted_domains + description: See upstream app documentation + trusted_headers: + name: trusted_headers + description: See upstream app documentation + ttl: + name: ttl + description: See upstream app documentation + TZ: + name: TZ + description: The timezone, as described in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones + ui_path: + name: ui_path + description: See upstream app documentation + Updates: + name: Updates + description: See upstream app documentation + UPLOAD_NSFW: + name: UPLOAD_NSFW + description: See upstream app documentation + URL: + name: URL + description: See upstream app documentation + use_own_certs: + name: use_own_certs + description: See upstream app documentation + user: + name: user + description: See upstream app documentation + user_agent: + name: user_agent + description: See upstream app documentation + username: + name: username + description: See upstream app documentation + verbose: + name: verbose + description: See upstream app documentation + verify_address: + name: verify_address + description: See upstream app documentation + watch_dir: + name: watch_dir + description: See upstream app documentation + watch_path: + name: watch_path + description: See upstream app documentation + WebuiPass: + name: WebuiPass + description: See upstream app documentation + whitelist: + name: whitelist + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' + WHOOGLE_ALT_IG: + name: WHOOGLE_ALT_IG + description: See upstream app documentation + WHOOGLE_ALT_MD: + name: WHOOGLE_ALT_MD + description: See upstream app documentation + WHOOGLE_ALT_RD: + name: WHOOGLE_ALT_RD + description: See upstream app documentation + WHOOGLE_ALT_TL: + name: WHOOGLE_ALT_TL + description: See upstream app documentation + WHOOGLE_ALT_TW: + name: WHOOGLE_ALT_TW + description: See upstream app documentation + WHOOGLE_ALT_YT: + name: WHOOGLE_ALT_YT + description: See upstream app documentation + WHOOGLE_AUTOCOMPLETE: + name: WHOOGLE_AUTOCOMPLETE + description: See upstream app documentation + WHOOGLE_CONFIG_ALTS: + name: WHOOGLE_CONFIG_ALTS + description: See upstream app documentation + WHOOGLE_CONFIG_BLOCK: + name: WHOOGLE_CONFIG_BLOCK + description: See upstream app documentation + WHOOGLE_CONFIG_COUNTRY: + name: WHOOGLE_CONFIG_COUNTRY + description: See upstream app documentation + WHOOGLE_CONFIG_DISABLE: + name: WHOOGLE_CONFIG_DISABLE + description: See upstream app documentation + WHOOGLE_CONFIG_GET_ONLY: + name: WHOOGLE_CONFIG_GET_ONLY + description: See upstream app documentation + WHOOGLE_CONFIG_LANGUAGE: + name: WHOOGLE_CONFIG_LANGUAGE + description: See upstream app documentation + WHOOGLE_CONFIG_NEAR: + name: WHOOGLE_CONFIG_NEAR + description: See upstream app documentation + WHOOGLE_CONFIG_NEW_TAB: + name: WHOOGLE_CONFIG_NEW_TAB + description: See upstream app documentation + WHOOGLE_CONFIG_SAFE: + name: WHOOGLE_CONFIG_SAFE + description: See upstream app documentation + WHOOGLE_CONFIG_SEARCH_LANGUAGE: + name: WHOOGLE_CONFIG_SEARCH_LANGUAGE + description: See upstream app documentation + WHOOGLE_CONFIG_THEME: + name: WHOOGLE_CONFIG_THEME + description: See upstream app documentation + WHOOGLE_CONFIG_URL: + name: WHOOGLE_CONFIG_URL + description: See upstream app documentation + WHOOGLE_CONFIG_VIEW_IMAGE: + name: WHOOGLE_CONFIG_VIEW_IMAGE + description: See upstream app documentation + WHOOGLE_CSP: + name: WHOOGLE_CSP + description: See upstream app documentation + WHOOGLE_MINIMAL: + name: WHOOGLE_MINIMAL + description: See upstream app documentation + WHOOGLE_PASS: + name: WHOOGLE_PASS + description: See upstream app documentation + WHOOGLE_PROXY_LOC: + name: WHOOGLE_PROXY_LOC + description: See upstream app documentation + WHOOGLE_PROXY_PASS: + name: WHOOGLE_PROXY_PASS + description: See upstream app documentation + WHOOGLE_PROXY_TYPE: + name: WHOOGLE_PROXY_TYPE + description: See upstream app documentation + WHOOGLE_PROXY_USER: + name: WHOOGLE_PROXY_USER + description: See upstream app documentation + WHOOGLE_RESULTS_PER_PAGE: + name: WHOOGLE_RESULTS_PER_PAGE + description: See upstream app documentation + WHOOGLE_USER: + name: WHOOGLE_USER + description: See upstream app documentation + wildcard: + name: wildcard + description: See upstream app documentation" + MAILER_HOST: + name: MAILER_HOST + description: See upstream app documentation + MAILER_NOREPLY_EMAIL: + name: MAILER_NOREPLY_EMAIL + description: See upstream app documentation + MAILER_NOREPLY_NAME: + name: MAILER_NOREPLY_NAME + description: See upstream app documentation + MAILER_PORT: + name: MAILER_PORT + description: See upstream app documentation + MAILER_SECURITY: + name: MAILER_SECURITY + description: See upstream app documentation + maxmem: + name: maxmem + description: See upstream app documentation + Mode: + name: Mode + description: See upstream app documentation + mqtt_autodiscover: + name: mqtt_autodiscover + description: See upstream app documentation + networkdisks: + name: networkdisks + description: list of smb servers to mount, separated by commas (//xxx.xx.xx.xx/share) + NoAuth: + name: NoAuth + description: See upstream app documentation + NORDIGEN_ID: + name: NORDIGEN_ID + description: See upstream app documentation + NORDIGEN_KEY: + name: NORDIGEN_KEY + description: See upstream app documentation + OAUTHLIB_RELAX_TOKEN_SCOPE: + name: OAUTHLIB_RELAX_TOKEN_SCOPE + description: See upstream app documentation + OCR: + name: OCR + description: See upstream app documentation + ocrlang: + name: ocrlang + description: See upstream app documentation + openvpn_alt_mode: + name: openvpn_alt_mode + description: bind at container level and not app level + openvpn_config: + name: openvpn_config + description: for example ""config.ovpn"" # name of the file located in /config/openvpn + OPENVPN_CUSTOM_PROVIDER: + name: OPENVPN_CUSTOM_PROVIDER + description: See upstream app documentation + OPENVPN_CUSTOM_PROVIDER_OVPN_LOCATION: + name: OPENVPN_CUSTOM_PROVIDER_OVPN_LOCATION + description: See upstream app documentation + openvpn_enabled: + name: openvpn_enabled + description: See upstream app documentation + OPENVPN_PASSWORD: + name: OPENVPN_PASSWORD + description: See upstream app documentation diff --git a/spotweb/CHANGELOG.md b/spotweb/CHANGELOG.md index 8527d4ecb..633c24ba2 100644 --- a/spotweb/CHANGELOG.md +++ b/spotweb/CHANGELOG.md @@ -1,3 +1,4 @@ +- Enable external port by default (9999) ## 1.5.4 (07-01-2023) - Update to latest version from spotweb/spotweb diff --git a/spotweb/README.md b/spotweb/README.md index ebffd31b4..1ca5dc4b1 100644 --- a/spotweb/README.md +++ b/spotweb/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/spotweb/stats.png) ## About diff --git a/spotweb/config.json b/spotweb/config.json index 6234d6a0b..65042ba79 100644 --- a/spotweb/config.json +++ b/spotweb/config.json @@ -24,7 +24,7 @@ "panel_icon": "mdi:chart-timeline", "panel_title": "Spotweb", "ports": { - "80/tcp": null + "80/tcp": 9999 }, "ports_description": { "80/tcp": "Not required for Ingress" @@ -45,5 +45,5 @@ ], "slug": "spotweb", "url": "https://github.com/alexbelgium/hassio-addons/spotweb", - "version": "1.5.4-7" + "version": "1.5.4-8" } diff --git a/spotweb/stats.png b/spotweb/stats.png new file mode 100644 index 000000000..180be049b Binary files /dev/null and b/spotweb/stats.png differ diff --git a/spotweb/translations/en.yaml b/spotweb/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/spotweb/translations/en.yaml +++ b/spotweb/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/stats.png b/stats.png deleted file mode 100644 index 683aa9066..000000000 Binary files a/stats.png and /dev/null differ diff --git a/stats_addons.png b/stats_addons.png deleted file mode 100644 index 735dd2a42..000000000 Binary files a/stats_addons.png and /dev/null differ diff --git a/tandoor_recipes/CHANGELOG.md b/tandoor_recipes/CHANGELOG.md index 6f8ceed58..fa36a972e 100644 --- a/tandoor_recipes/CHANGELOG.md +++ b/tandoor_recipes/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.4.8 (18-03-2023) +- Update to latest version from TandoorRecipes/recipes + ## 1.4.7 (19-02-2023) - Update to latest version from TandoorRecipes/recipes diff --git a/tandoor_recipes/Dockerfile b/tandoor_recipes/Dockerfile index 76c8c38e0..37bae5bc8 100644 --- a/tandoor_recipes/Dockerfile +++ b/tandoor_recipes/Dockerfile @@ -99,3 +99,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/tandoor_recipes/README.md b/tandoor_recipes/README.md index 35e214a95..a33c75395 100644 --- a/tandoor_recipes/README.md +++ b/tandoor_recipes/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/tandoor_recipes/stats.png) ## About diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index 1871ce857..9ee573f1d 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -46,5 +46,5 @@ ], "slug": "tandoor_recipes", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.4.7" + "version": "1.4.8" } diff --git a/tandoor_recipes/rootfs/entrypoint.sh b/tandoor_recipes/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/tandoor_recipes/rootfs/entrypoint.sh +++ b/tandoor_recipes/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/tandoor_recipes/stats.png b/tandoor_recipes/stats.png new file mode 100644 index 000000000..3f6d6a879 Binary files /dev/null and b/tandoor_recipes/stats.png differ diff --git a/tandoor_recipes/translations/en.yaml b/tandoor_recipes/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/tandoor_recipes/translations/en.yaml +++ b/tandoor_recipes/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/tandoor_recipes/updater.json b/tandoor_recipes/updater.json index 313500fa0..e4be35fe9 100644 --- a/tandoor_recipes/updater.json +++ b/tandoor_recipes/updater.json @@ -1,8 +1,8 @@ { - "last_update": "19-02-2023", + "last_update": "18-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "tandoor_recipes", "source": "github", "upstream_repo": "TandoorRecipes/recipes", - "upstream_version": "1.4.7" + "upstream_version": "1.4.8" } diff --git a/tdarr/CHANGELOG.md b/tdarr/CHANGELOG.md index 16b2c13e5..56c97f612 100644 --- a/tdarr/CHANGELOG.md +++ b/tdarr/CHANGELOG.md @@ -1,4 +1,8 @@ +## 2.00.20.1 (08-04-2023) +- Update to latest version from haveagitgat/tdarr +- Implement healthcheck + ## 2.00.19.1 (19-02-2023) - Update to latest version from haveagitgat/tdarr - WARNING : update to supervisor 2022.11 before installing diff --git a/tdarr/Dockerfile b/tdarr/Dockerfile index f3b3d1d4a..49f51e437 100644 --- a/tdarr/Dockerfile +++ b/tdarr/Dockerfile @@ -40,7 +40,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -95,3 +95,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="8265" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 \ No newline at end of file diff --git a/tdarr/README.md b/tdarr/README.md index 396e04d96..8f317a2ea 100644 --- a/tdarr/README.md +++ b/tdarr/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/tdarr/stats.png) ## About diff --git a/tdarr/config.json b/tdarr/config.json index 29015b2e0..45e3604ba 100644 --- a/tdarr/config.json +++ b/tdarr/config.json @@ -64,6 +64,7 @@ }, "host_dbus": true, "image": "ghcr.io/alexbelgium/tdarr-{arch}", + "init": false, "map": [ "media:rw", "config:rw", @@ -100,7 +101,7 @@ }, "slug": "tdarr", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.00.19.1", + "version": "2.00.20.1", "video": true, "webui": "[PROTO:ssl]://[HOST]:[PORT:8265]" } diff --git a/tdarr/stats.png b/tdarr/stats.png new file mode 100644 index 000000000..27d3aadd3 Binary files /dev/null and b/tdarr/stats.png differ diff --git a/tdarr/translations/en.yaml b/tdarr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/tdarr/translations/en.yaml +++ b/tdarr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/tdarr/updater.json b/tdarr/updater.json index 8e9537712..da33b7776 100644 --- a/tdarr/updater.json +++ b/tdarr/updater.json @@ -1,8 +1,8 @@ { - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "tdarr", "source": "dockerhub", "upstream_repo": "haveagitgat/tdarr", - "upstream_version": "2.00.19.1" + "upstream_version": "2.00.20.1" } diff --git a/teamspeak/Dockerfile b/teamspeak/Dockerfile index 8d31e38f2..5fa300d15 100644 --- a/teamspeak/Dockerfile +++ b/teamspeak/Dockerfile @@ -107,3 +107,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/teamspeak/README.md b/teamspeak/README.md index eac9fef1c..57b42e4ce 100644 --- a/teamspeak/README.md +++ b/teamspeak/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/teamspeak/stats.png) ## About diff --git a/teamspeak/config.json b/teamspeak/config.json index 91fb165b3..175d04684 100644 --- a/teamspeak/config.json +++ b/teamspeak/config.json @@ -8,7 +8,6 @@ "description": "voice communication for online gaming, education and training", "environment": { "DIST_UPDATE": "0", - "GUID": "503", "INIFILE": "1", "PGID": "503", "PUID": "503", diff --git a/teamspeak/stats.png b/teamspeak/stats.png new file mode 100644 index 000000000..d6230984f Binary files /dev/null and b/teamspeak/stats.png differ diff --git a/teamspeak/translations/en.yaml b/teamspeak/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/teamspeak/translations/en.yaml +++ b/teamspeak/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/transmission/CHANGELOG.md b/transmission/CHANGELOG.md index 1166dd283..176bd2900 100644 --- a/transmission/CHANGELOG.md +++ b/transmission/CHANGELOG.md @@ -1,59 +1,102 @@ +## 4.0.2-r4-ls166 (08-04-2023) +- Update to latest version from linuxserver/docker-transmission + +## 4.0.2-r3-ls165 (31-03-2023) +- Update to latest version from linuxserver/docker-transmission + +## 4.0.2-r2-ls162 (24-03-2023) +- Update to latest version from linuxserver/docker-transmission + +## 4.0.2-r2-ls161 (18-03-2023) +- Update to latest version from linuxserver/docker-transmission + +## 4.0.1-r0-ls159 (11-03-2023) +- Update to latest version from linuxserver/docker-transmission +- Implemented healthcheck + +## 4.0.1-r0-ls158 (04-03-2023) + +- Update to latest version from linuxserver/docker-transmission + +## 4.0.1-r0-ls156 (25-02-2023) + +- Update to latest version from linuxserver/docker-transmission + ## 4.0.0-r6-ls155 (19-02-2023) + - Update to latest version from linuxserver/docker-transmission ## 4.0.0-r0-ls152 (11-02-2023) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r8-ls150 (28-01-2023) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r8-ls149 (21-01-2023) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r8-ls148 (14-01-2023) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r8-ls147 (07-01-2023) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r6-ls146 (25-12-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r6-ls145 (10-12-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r6-ls144 (01-12-2022) + - Update to latest version from linuxserver/docker-transmission - WARNING : update to supervisor 2022.11 before installing ## 3.00-r6-ls143 (19-11-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r6-ls142 (14-11-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r6-ls141 (11-11-2022) + - Update to latest version from linuxserver/docker-transmission - New alternative webui : transmissionic ## 3.00-r6-ls140 (05-11-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r5-ls138 (29-10-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r5-ls137 (30-09-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r5-ls136 (24-09-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r5-ls135 (09-09-2022) + - Update to latest version from linuxserver/docker-transmission ## 3.00-r5-ls134 (26-08-2022) + - Update to latest version from linuxserver/docker-transmission + ## 3.00-r5-ls133 (13-08-2022) - Update to latest version from linuxserver/docker-transmission diff --git a/transmission/Dockerfile b/transmission/Dockerfile index d40bc5d9f..cff1978e6 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -75,7 +75,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-dns_set.sh 92-local_mounts.sh 92-smb_mounts.sh " +ARG MODULES="00-banner.sh 01-custom_script.sh 90-dns_set.sh 00-local_mounts.sh 00-smb_mounts.sh " # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -136,3 +136,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="9091" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/transmission/README.md b/transmission/README.md index b14e80350..159faf1ec 100644 --- a/transmission/README.md +++ b/transmission/README.md @@ -1,4 +1,5 @@ ## ⚠ Open Request : [✨ [REQUEST] Transmission add Tailmission Web UI (opened 2023-02-19)](https://github.com/alexbelgium/hassio-addons/issues/719) by [@DarkoMir](https://github.com/DarkoMir) + # Home assistant add-on: Transmission [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +16,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/transmission/stats.png) ## About diff --git a/transmission/config.json b/transmission/config.json index 103086e7a..c7fd0d32c 100644 --- a/transmission/config.json +++ b/transmission/config.json @@ -95,5 +95,5 @@ }, "slug": "transmission_ls", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.0.0-r6-ls155-3" + "version": "4.0.2-r4-ls166" } diff --git a/transmission/stats.png b/transmission/stats.png new file mode 100644 index 000000000..e42863019 Binary files /dev/null and b/transmission/stats.png differ diff --git a/transmission/translations/en.yaml b/transmission/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/transmission/translations/en.yaml +++ b/transmission/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/transmission/updater.json b/transmission/updater.json index d006c6b99..fa9e82414 100644 --- a/transmission/updater.json +++ b/transmission/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "transmission", "source": "github", "upstream_repo": "linuxserver/docker-transmission", - "upstream_version": "4.0.0-r6-ls155" + "upstream_version": "4.0.2-r4-ls166" } diff --git a/transmission_openvpn/CHANGELOG.md b/transmission_openvpn/CHANGELOG.md index a54b9e4bb..53e7c76b8 100644 --- a/transmission_openvpn/CHANGELOG.md +++ b/transmission_openvpn/CHANGELOG.md @@ -1,3 +1,4 @@ +- Implemented healthcheck - Mullvad fix @Blogshot - WARNING : update to supervisor 2022.11 before installing diff --git a/transmission_openvpn/Dockerfile b/transmission_openvpn/Dockerfile index 91929faf7..3f95a3870 100644 --- a/transmission_openvpn/Dockerfile +++ b/transmission_openvpn/Dockerfile @@ -70,7 +70,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-dns_set.sh 92-local_mounts.sh 92-smb_mounts.sh " +ARG MODULES="00-banner.sh 01-custom_script.sh 90-dns_set.sh 00-local_mounts.sh 00-smb_mounts.sh " # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -129,3 +129,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD /etc/scripts/healthcheck.sh &>/dev/null || exit 1 diff --git a/transmission_openvpn/README.md b/transmission_openvpn/README.md index dec596745..88b978866 100644 --- a/transmission_openvpn/README.md +++ b/transmission_openvpn/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/transmission_openvpn/stats.png) ## About diff --git a/transmission_openvpn/rootfs/entrypoint.sh b/transmission_openvpn/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/transmission_openvpn/rootfs/entrypoint.sh +++ b/transmission_openvpn/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/transmission_openvpn/stats.png b/transmission_openvpn/stats.png new file mode 100644 index 000000000..268029fa0 Binary files /dev/null and b/transmission_openvpn/stats.png differ diff --git a/transmission_openvpn/translations/en.yaml b/transmission_openvpn/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/transmission_openvpn/translations/en.yaml +++ b/transmission_openvpn/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 2061c7ab0..411e18662 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -75,7 +75,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -139,3 +139,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/ubooquity/README.md b/ubooquity/README.md index 2fc62d6d8..eb61e5305 100644 --- a/ubooquity/README.md +++ b/ubooquity/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/ubooquity/stats.png) ## About diff --git a/ubooquity/stats.png b/ubooquity/stats.png new file mode 100644 index 000000000..e69de29bb diff --git a/ubooquity/translations/en.yaml b/ubooquity/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/ubooquity/translations/en.yaml +++ b/ubooquity/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/unpackerr/CHANGELOG.md b/unpackerr/CHANGELOG.md index 2f4c5565e..547bf7eef 100644 --- a/unpackerr/CHANGELOG.md +++ b/unpackerr/CHANGELOG.md @@ -1,8 +1,8 @@ -## testing-0.11.1-2023-02-11 (2023-02-11) +## testing-5465f08-525-linux-arm64-2023-03-29 (2023-03-29) - Update to latest version from hotio/unpackerr -## - () +## testing-958c97f-514-linux-arm64-2023-02-10 (2023-02-10) - Update to latest version from hotio/unpackerr ## release-a17d885-2023-01-16 (2023-01-16) diff --git a/unpackerr/Dockerfile b/unpackerr/Dockerfile index ade47f8b7..921a789d5 100644 --- a/unpackerr/Dockerfile +++ b/unpackerr/Dockerfile @@ -59,7 +59,7 @@ RUN \ COPY rootfs/ / # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -119,3 +119,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/unpackerr/README.md b/unpackerr/README.md index f4e021d39..c3e6094c3 100644 --- a/unpackerr/README.md +++ b/unpackerr/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/unpackerr/stats.png) ## About @@ -48,6 +49,7 @@ Create a file named "unpackerr.conf" in /config. In /config/unpackerr.conf you can set all variables according to this list of environment variables : https://github.com/davidnewhall/unpackerr Folders must be customized in the conf file with the lines : + ```yaml [[folder]] ## Windows paths must use two backslashes: "C:\\Some\\Folder\\To\\Watch" @@ -60,10 +62,4 @@ extract_path = "/share/downloads_unpacked" Create an issue on github -## Illustration - ---- - -![illustration](https://wiki.servarr.com/assets/unpackerr/hist_1_history.png) - [repository]: https://github.com/alexbelgium/hassio-addons diff --git a/unpackerr/config.json b/unpackerr/config.json index 313e40241..5b6f9dbfb 100644 --- a/unpackerr/config.json +++ b/unpackerr/config.json @@ -85,5 +85,5 @@ }, "slug": "unpackerr", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "testing-0.11.1-2023-02-11" + "version": "testing-5465f08-525-linux-arm64-2023-03-29" } diff --git a/unpackerr/stats.png b/unpackerr/stats.png new file mode 100644 index 000000000..e6e188730 Binary files /dev/null and b/unpackerr/stats.png differ diff --git a/unpackerr/translations/en.yaml b/unpackerr/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/unpackerr/translations/en.yaml +++ b/unpackerr/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/unpackerr/updater.json b/unpackerr/updater.json index 805bfd2e6..442f78d12 100644 --- a/unpackerr/updater.json +++ b/unpackerr/updater.json @@ -1,13 +1,10 @@ { "dockerhub_by_date": true, - "dockerhub_list_size": 2, "fulltag": true, - "github_beta": "true", - "github_tagfilter": "release", - "last_update": "2023-02-11", + "last_update": "2023-03-29", "repository": "alexbelgium/hassio-addons", "slug": "unpackerr", "source": "dockerhub", "upstream_repo": "hotio/unpackerr", - "upstream_version": "testing-0.11.1-2023-02-11" + "upstream_version": "testing-5465f08-525-linux-arm64-2023-03-29" } diff --git a/webtop_kde/CHANGELOG.md b/webtop_kde/CHANGELOG.md index f3bad99f6..f0bfbdce0 100644 --- a/webtop_kde/CHANGELOG.md +++ b/webtop_kde/CHANGELOG.md @@ -1,4 +1,22 @@ +## 4.16-r0-ls95 (08-04-2023) +- Update to latest version from linuxserver/docker-webtop + +## 4.16-r0-ls93 (31-03-2023) +- Update to latest version from linuxserver/docker-webtop + +## 4.16-r0-ls92 (24-03-2023) +- Update to latest version from linuxserver/docker-webtop + +## 4.16-r0-ls91 (18-03-2023) +- Update to latest version from linuxserver/docker-webtop + +## 4.16-r0-ls90 (11-03-2023) +- Update to latest version from linuxserver/docker-webtop + +## 4.16-r0-ls89 (25-02-2023) +- Update to latest version from linuxserver/docker-webtop + ## 4.16-r0-ls88 (19-02-2023) - Update to latest version from linuxserver/docker-webtop diff --git a/webtop_kde/Dockerfile b/webtop_kde/Dockerfile index 348b1f9f4..033cc6c5d 100644 --- a/webtop_kde/Dockerfile +++ b/webtop_kde/Dockerfile @@ -78,7 +78,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 92-local_mounts.sh 92-smb_mounts.sh 90-dns_set.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-dns_set.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -139,3 +139,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/webtop_kde/README.md b/webtop_kde/README.md index 9b1596079..a2c61beea 100644 --- a/webtop_kde/README.md +++ b/webtop_kde/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/webtop_kde/stats.png) ## About diff --git a/webtop_kde/config.json b/webtop_kde/config.json index 56032d328..19b94274e 100644 --- a/webtop_kde/config.json +++ b/webtop_kde/config.json @@ -112,6 +112,6 @@ "slug": "webtop-kde", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "4.16-r0-ls88-2", + "version": "4.16-r0-ls95", "video": true } diff --git a/webtop_kde/stats.png b/webtop_kde/stats.png new file mode 100644 index 000000000..ba98869ff Binary files /dev/null and b/webtop_kde/stats.png differ diff --git a/webtop_kde/translations/en.yaml b/webtop_kde/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/webtop_kde/translations/en.yaml +++ b/webtop_kde/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/webtop_kde/updater.json b/webtop_kde/updater.json index b6fab0862..d6a1344f2 100644 --- a/webtop_kde/updater.json +++ b/webtop_kde/updater.json @@ -1,9 +1,9 @@ { "github_fulltag": "true", - "last_update": "19-02-2023", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "webtop_kde", "source": "github", "upstream_repo": "linuxserver/docker-webtop", - "upstream_version": "4.16-r0-ls88" + "upstream_version": "4.16-r0-ls95" } diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index 9d1cd7981..8ec049bbe 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -51,7 +51,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="00-banner.sh 01-custom_script.sh 90-config_yaml.sh 92-local_mounts.sh 92-smb_mounts.sh" +ARG MODULES="00-banner.sh 01-custom_script.sh 90-config_yaml.sh 00-local_mounts.sh 00-smb_mounts.sh" # Automatic modules download RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ @@ -112,3 +112,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/webtrees/README.md b/webtrees/README.md index fbc25d8a0..bb7162427 100644 --- a/webtrees/README.md +++ b/webtrees/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/webtrees/stats.png) ## About diff --git a/webtrees/rootfs/entrypoint.sh b/webtrees/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/webtrees/rootfs/entrypoint.sh +++ b/webtrees/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/webtrees/stats.png b/webtrees/stats.png new file mode 100644 index 000000000..8ae2f4377 Binary files /dev/null and b/webtrees/stats.png differ diff --git a/webtrees/translations/en.yaml b/webtrees/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/webtrees/translations/en.yaml +++ b/webtrees/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/wger/CHANGELOG.md b/wger/CHANGELOG.md index 547906abb..00db46dbf 100644 --- a/wger/CHANGELOG.md +++ b/wger/CHANGELOG.md @@ -1,3 +1,6 @@ +### 2.2-dev-5 (11-03-2023) +- Bug updates +- Implement healthcheck ## 2.2-dev (10-12-2022) - Update to latest version from wger/devel diff --git a/wger/Dockerfile b/wger/Dockerfile index 2f72149c7..b5b3e7f7f 100644 --- a/wger/Dockerfile +++ b/wger/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_VERSION ARG BUILD_FROM -FROM wger/devel:2.1-dev +FROM wger/devel:latest ################## # 2 Modify Image # @@ -104,3 +104,16 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +################# +# 6 Healthcheck # +################# + +ENV HEALTH_PORT="80" \ + HEALTH_URL="" +HEALTHCHECK \ + --interval=5s \ + --retries=5 \ + --start-period=30s \ + --timeout=25s \ + CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1 diff --git a/wger/README.md b/wger/README.md index 3b1c71a59..7ce245a63 100644 --- a/wger/README.md +++ b/wger/README.md @@ -14,7 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://reporoster.com/stars/alexbelgium/hassio-addons)](https://github.com/alexbelgium/hassio-addons/stargazers) +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) + +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/wger/stats.png) ## About diff --git a/wger/config.json b/wger/config.json index 3f7de58db..fa61b914f 100644 --- a/wger/config.json +++ b/wger/config.json @@ -25,8 +25,7 @@ "CONFIG_LOCATION": "str" }, "slug": "wger", - "startup": "services", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.2-dev", + "version": "2.2-dev-5", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]" } diff --git a/wger/rootfs/entrypoint.sh b/wger/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/wger/rootfs/entrypoint.sh +++ b/wger/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/wger/rootfs/etc/cont-init.d/90-run.sh b/wger/rootfs/etc/cont-init.d/90-run.sh index 992a52f1a..9ba1ecaaa 100755 --- a/wger/rootfs/etc/cont-init.d/90-run.sh +++ b/wger/rootfs/etc/cont-init.d/90-run.sh @@ -3,7 +3,6 @@ ############################ # Change database location # ############################ -touch /data/database.sqlite sed -i "s|/home/wger/db/database.sqlite|/data/database.sqlite|g" /home/wger/src/settings.py ##################### diff --git a/wger/stats.png b/wger/stats.png new file mode 100644 index 000000000..aecc63290 Binary files /dev/null and b/wger/stats.png differ diff --git a/wger/translations/en.yaml b/wger/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/wger/translations/en.yaml +++ b/wger/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/whoogle/CHANGELOG.md b/whoogle/CHANGELOG.md index 6dccd96ec..32562d22c 100644 --- a/whoogle/CHANGELOG.md +++ b/whoogle/CHANGELOG.md @@ -1,3 +1,8 @@ +### 0.8.2-2 (09-04-2023) +- Minor bugs fixed + +## 0.8.2 (08-04-2023) +- Update to latest version from benbusby/whoogle-search ## 0.8.1 (25-12-2022) - Update to latest version from benbusby/whoogle-search diff --git a/whoogle/Dockerfile b/whoogle/Dockerfile index 420a08d12..e511108b6 100644 --- a/whoogle/Dockerfile +++ b/whoogle/Dockerfile @@ -101,3 +101,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/whoogle/README.md b/whoogle/README.md index 659423b61..a3709e651 100644 --- a/whoogle/README.md +++ b/whoogle/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/whoogle/stats.png) ## About diff --git a/whoogle/build.json b/whoogle/build.json index fd14af35f..497429763 100644 --- a/whoogle/build.json +++ b/whoogle/build.json @@ -1,8 +1,8 @@ { "build_from": { - "aarch64": "ghcr.io/benbusby/whoogle-search:latest", - "amd64": "ghcr.io/benbusby/whoogle-search:latest", - "armv7": "ghcr.io/benbusby/whoogle-search:latest" + "aarch64": "ghcr.io/benbusby/whoogle-search:0.8.2", + "amd64": "ghcr.io/benbusby/whoogle-search:0.8.2", + "armv7": "ghcr.io/benbusby/whoogle-search:0.8.2" }, "codenotary": { "signer": "alexandrep.github@gmail.com" diff --git a/whoogle/config.json b/whoogle/config.json index 2f4b97441..b394a2a60 100644 --- a/whoogle/config.json +++ b/whoogle/config.json @@ -61,5 +61,5 @@ }, "slug": "whoogle-search", "url": "https://github.com/alexbelgium/hassio-addons/tree/master/whoogle", - "version": "0.8.1" + "version": "0.8.2-2" } diff --git a/whoogle/rootfs/entrypoint.sh b/whoogle/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/whoogle/rootfs/entrypoint.sh +++ b/whoogle/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/whoogle/stats.png b/whoogle/stats.png new file mode 100644 index 000000000..bbd76eb25 Binary files /dev/null and b/whoogle/stats.png differ diff --git a/whoogle/translations/en.yaml b/whoogle/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/whoogle/translations/en.yaml +++ b/whoogle/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/whoogle/updater.json b/whoogle/updater.json index 92361d2d7..c7f7414ad 100644 --- a/whoogle/updater.json +++ b/whoogle/updater.json @@ -1,8 +1,8 @@ { - "last_update": "25-12-2022", + "last_update": "08-04-2023", "repository": "alexbelgium/hassio-addons", "slug": "whoogle", "source": "github", "upstream_repo": "benbusby/whoogle-search", - "upstream_version": "0.8.1" + "upstream_version": "0.8.2" } diff --git a/xteve/Dockerfile b/xteve/Dockerfile index 15848a401..f6182cc2e 100644 --- a/xteve/Dockerfile +++ b/xteve/Dockerfile @@ -106,3 +106,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/xteve/README.md b/xteve/README.md index 50664980d..64e2affbb 100644 --- a/xteve/README.md +++ b/xteve/README.md @@ -14,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/xteve/stats.png) ## About diff --git a/xteve/stats.png b/xteve/stats.png new file mode 100644 index 000000000..04a0a4979 Binary files /dev/null and b/xteve/stats.png differ diff --git a/xteve/translations/en.yaml b/xteve/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/xteve/translations/en.yaml +++ b/xteve/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/zoneminder/CHANGELOG.md b/zoneminder/CHANGELOG.md index 29814cdfe..29e31bc9a 100644 --- a/zoneminder/CHANGELOG.md +++ b/zoneminder/CHANGELOG.md @@ -1,4 +1,7 @@ +## 1.36.33 (04-03-2023) +- Update to latest version from zoneminder-containers/zoneminder-base + ## 1.36.36 (11-02-2023) - Update to latest version from zoneminder-containers/zoneminder-base diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile index 3a1619fb0..515ba9cba 100644 --- a/zoneminder/Dockerfile +++ b/zoneminder/Dockerfile @@ -16,7 +16,7 @@ ARG BUILD_FROM ARG BUILD_VERSION -ARG BUILD_UPSTREAM="1.36.36" +ARG BUILD_UPSTREAM="1.36.33" FROM tritruongtr/zoneminder:latest ################## @@ -107,3 +107,7 @@ LABEL \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.version=${BUILD_VERSION} + +#################### +# 6 HealthcheckNOT # +#################### diff --git a/zoneminder/README.md b/zoneminder/README.md index c72b05eb5..595f13d90 100644 --- a/zoneminder/README.md +++ b/zoneminder/README.md @@ -1,4 +1,3 @@ - # Home assistant add-on: Zoneminder [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) @@ -15,8 +14,9 @@ _Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_ +[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers) -[![Stargazers repo roster for @alexbelgium/hassio-addons](https://git-lister.onrender.com/api/stars/alexbelgium/hassio-addons?limit=30)](https://github.com/alexbelgium/hassio-addons/stargazers) +![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zoneminder/stats.png) ## About diff --git a/zoneminder/config.json b/zoneminder/config.json index 74c7084d8..6cdfbae8d 100644 --- a/zoneminder/config.json +++ b/zoneminder/config.json @@ -37,6 +37,6 @@ ], "slug": "zoneminder", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.36.36", + "version": "1.36.33", "webui": "[PROTO:ssl]://[HOST]:[PORT:80]/zm" } diff --git a/zoneminder/rootfs/entrypoint.sh b/zoneminder/rootfs/entrypoint.sh index 85d8a9212..68c3fec4d 100755 --- a/zoneminder/rootfs/entrypoint.sh +++ b/zoneminder/rootfs/entrypoint.sh @@ -1,17 +1,6 @@ #!/bin/bash echo "Starting..." -############################ -# Backup Dockerfile Script # -############################ - -if [ -f /etc/cont-init.d/00-aaa_dockerfile_backup.sh ]; then - chown "$(id -u)":"$(id -g)" /etc/cont-init.d/00-aaa_dockerfile_backup.sh - chmod +x /etc/cont-init.d/00-aaa_dockerfile_backup.sh - /./etc/cont-init.d/00-aaa_dockerfile_backup.sh - rm /etc/cont-init.d/00-aaa_dockerfile_backup.sh -fi - #################### # Starting scripts # #################### diff --git a/zoneminder/stats.png b/zoneminder/stats.png new file mode 100644 index 000000000..b13029ef5 Binary files /dev/null and b/zoneminder/stats.png differ diff --git a/zoneminder/translations/en.yaml b/zoneminder/translations/en.yaml index e5b8cd982..f5df557fd 100644 --- a/zoneminder/translations/en.yaml +++ b/zoneminder/translations/en.yaml @@ -96,6 +96,9 @@ configuration: database: name: database description: Type of database to use + disable_updates: + name: disable_updates + description: App updates won't be done automatically but must be done with the webui DB_CLIENT: name: DB_CLIENT description: See upstream app documentation @@ -503,7 +506,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' + description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation diff --git a/zoneminder/updater.json b/zoneminder/updater.json index 5114f21c5..231e678a7 100644 --- a/zoneminder/updater.json +++ b/zoneminder/updater.json @@ -1,8 +1,8 @@ { - "last_update": "11-02-2023", + "last_update": "04-03-2023", "repository": "alexbelgium/hassio-addons", "slug": "zoneminder", "source": "github", "upstream_repo": "zoneminder-containers/zoneminder-base", - "upstream_version": "1.36.36" + "upstream_version": "1.36.33" }