Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Bump base image to 13.1.3 #132

Closed
wants to merge 12 commits into from
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) 2021-2022 Franck Nijhof
Copyright (c) 2021-2023 Franck Nijhof
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR has unrelated changes to the base image bump (like this one, but many more).


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 @@ -77,7 +77,7 @@ our [GitHub Repository][repository].

MIT License

Copyright (c) 2021-2022 Franck Nijhof
Copyright (c) 2021-2023 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 @@ -118,7 +118,7 @@ SOFTWARE.
[i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
[issue]: https://github.com/hassio-addons/addon-tailscale/issues
[license-shield]: https://img.shields.io/github/license/hassio-addons/addon-tailscale.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2022.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.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-experimental-yellow.svg
Expand Down
2 changes: 1 addition & 1 deletion tailscale/.README.j2
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ If you are more interested in stable releases of our add-ons:
[forum]: https://community.home-assistant.io/?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/2022.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.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-experimental-yellow.svg
Expand Down
10 changes: 6 additions & 4 deletions tailscale/DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@ however, it is nice to know where you need to go later on.
1. Click the "Install" button to install the add-on.
1. Start the "Tailscale" add-on.
1. Check the logs of the "Tailscale" add-on to see if everything went well.
1. Open the Web UI of the "Tailscale" add-on to complete authentication and
1. Open the **Web UI** of the "Tailscale" add-on to complete authentication and
couple your Home Assistant instance with your Tailscale account.
**Note:** Some browsers don't work with this step. It is recommended to
complete this step on a desktop or laptop computer using the Chrome browser.

**Note:** _Some browsers don't work with this step. It is recommended to
complete this step on a desktop or laptop computer using the Chrome browser._

1. Done!

## Configuration
Expand Down Expand Up @@ -103,7 +105,7 @@ check [the contributor's page][contributors].

MIT License

Copyright (c) 2021-2022 Franck Nijhof
Copyright (c) 2021-2023 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
10 changes: 5 additions & 5 deletions tailscale/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ARG BUILD_ARCH=amd64
RUN \
apk add --no-cache \
ip6tables=1.8.8-r1 \
ipcalc=1.0.1-r0 \
iproute2=5.17.0-r0 \
iptables=1.8.8-r1 \
nginx=1.22.0-r1 \
ip6tables=1.8.8-r2 \
ipcalc=1.0.1-r1 \
iproute2=6.0.0-r1 \
iptables=1.8.8-r2 \
nginx=1.22.1-r0 \
\
&& ln -sf /sbin/xtables-nft-multi /sbin/ip6tables \
&& ln -sf /sbin/xtables-nft-multi /sbin/iptables \
Expand Down
10 changes: 5 additions & 5 deletions tailscale/build.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
build_from:
aarch64: ghcr.io/hassio-addons/base/aarch64:12.0.0
amd64: ghcr.io/hassio-addons/base/amd64:12.0.0
armhf: ghcr.io/hassio-addons/base/armhf:12.0.0
armv7: ghcr.io/hassio-addons/base/armv7:12.0.0
i386: ghcr.io/hassio-addons/base/i386:12.0.0
aarch64: ghcr.io/hassio-addons/base/aarch64:13.1.3
amd64: ghcr.io/hassio-addons/base/amd64:13.1.3
armhf: ghcr.io/hassio-addons/base/armhf:13.1.3
armv7: ghcr.io/hassio-addons/base/armv7:13.1.3
i386: ghcr.io/hassio-addons/base/i386:13.1.3
codenotary:
base_image: [email protected]
signer: [email protected]
4 changes: 2 additions & 2 deletions tailscale/rootfs/etc/services.d/tailscaled/post
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ for address in "${addresses[@]}"; do
done

# Get configured tags
tags=$(bashio::config "tags | join(\",\")" "")
tags=$(bashio::config "tags//[] | join(\",\")" "")

# Wait for socket to be available
while ! bashio::fs.socket_exists "/var/run/tailscale/tailscaled.sock";
Expand All @@ -47,7 +47,7 @@ done
while true;
do
if /opt/tailscale status --json --peers=false --self=false \
| jq --exit-status '.BackendState == "Running" or .BackendState == "NeedsLogin"';
| jq --exit-status '.BackendState == "Running" or .BackendState == "NeedsLogin"' > /dev/null;
then
IFS=","
/opt/tailscale up \
Expand Down
2 changes: 1 addition & 1 deletion tailscale/rootfs/etc/services.d/web/run
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ bashio::log.info 'Starting Tailscale web...'

options+=(web)
# Get random port
options+=(-listen 127.0.0.1:25899)
options+=(--listen 127.0.0.1:25899)

# Run Tailscale
exec /opt/tailscale "${options[@]}"