Skip to content

Commit

Permalink
Merge branch 'hassio-addons:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
erwin-willems authored Apr 10, 2024
2 parents 1a22ae6 + c81a8bc commit 7c198ac
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
],
"versioningTemplate": "loose",
"datasourceTemplate": "repology",
"depNameTemplate": "alpine_3_18/{{package}}"
"depNameTemplate": "alpine_3_19/{{package}}"
},
{
"fileMatch": ["/Dockerfile$"],
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2019-2023 Franck Nijhof
Copyright (c) 2019-2024 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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ our [GitHub Repository][repository].

MIT License

Copyright (c) 2019-2023 Franck Nijhof
Copyright (c) 2019-2024 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
Expand Down Expand Up @@ -122,7 +122,7 @@ SOFTWARE.
[i386-shield]: https://img.shields.io/badge/i386-no-red.svg
[issue]: https://github.com/hassio-addons/addon-adguard-home/issues
[license-shield]: https://img.shields.io/github/license/hassio-addons/addon-adguard-home.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg
[patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
[patreon]: https://www.patreon.com/frenck
[project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
Expand Down
2 changes: 1 addition & 1 deletion adguard/.README.j2
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ If you are more interested in stable releases of our add-ons:
[forum]: https://community.home-assistant.io/t/home-assistant-community-add-on-adguard-home/90684?u=frenck
[github-sponsors-shield]: https://frenck.dev/wp-content/uploads/2019/12/github_sponsor.png
[github-sponsors]: https://github.com/sponsors/frenck
[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg
[patreon-shield]: https://frenck.dev/wp-content/uploads/2019/12/patreon.png
[patreon]: https://www.patreon.com/frenck
[project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
Expand Down
2 changes: 1 addition & 1 deletion adguard/DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ check [the contributor's page][contributors].

MIT License

Copyright (c) 2019-2023 Franck Nijhof
Copyright (c) 2019-2024 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
Expand Down
8 changes: 4 additions & 4 deletions adguard/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.3.1
ARG BUILD_FROM=ghcr.io/hassio-addons/base:15.0.7
# hadolint ignore=DL3006
FROM ${BUILD_FROM}

Expand All @@ -8,12 +8,12 @@ ARG BUILD_ARCH=amd64
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# Setup base
ARG ADGUARD_HOME_VERSION="v0.107.40"
ARG ADGUARD_HOME_VERSION="v0.107.48"
# hadolint ignore=DL3003,SC2155
RUN \
apk add --no-cache \
nginx=1.24.0-r7 \
yq=4.33.3-r4 \
nginx=1.24.0-r15 \
yq=4.35.2-r3 \
\
&& if [[ "${BUILD_ARCH}" = "aarch64" ]]; then ARCH="arm64"; fi \
&& if [[ "${BUILD_ARCH}" = "amd64" ]]; then ARCH="amd64"; fi \
Expand Down
6 changes: 3 additions & 3 deletions adguard/build.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
build_from:
aarch64: ghcr.io/hassio-addons/base:14.3.1
amd64: ghcr.io/hassio-addons/base:14.3.1
armv7: ghcr.io/hassio-addons/base:14.3.1
aarch64: ghcr.io/hassio-addons/base:15.0.7
amd64: ghcr.io/hassio-addons/base:15.0.7
armv7: ghcr.io/hassio-addons/base:15.0.7
codenotary:
base_image: [email protected]
signer: [email protected]
1 change: 1 addition & 0 deletions adguard/rootfs/etc/adguard/AdGuardHome.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dns:
port: 53
bootstrap_dns: 1.1.1.1:53
use_private_ptr_resolvers: false

0 comments on commit 7c198ac

Please sign in to comment.