Add PADD to the image

[yubiuser]

Add the v6 development version of PADD to the image.

PADD expects the API at port 80, currently FTL still defaults to 8080. Therefore, PADD needs to be started with padd --port 8080

[PromoFaux]

The alias is not much use here, it will need to be in start.sh like the following (tested)

# Add an alias for padd to the root user's bashrc
port="${FTLCONF_webserver_port%%,*}"
echo "alias padd='padd --port ${port:-8080} --secret ${FTLCONF_webserver_api_password}'" > /root/.bashrc

Another reason for it going into start.sh is that the FTLCONF_ variables will be defined by the user at runtime and we don't know them when we build the image

[yubiuser]

Thanks, I FP'd it to the right place.

[edgd1er]

I'm sorry my suggestion was incomplete. I put $ to prevent variable substitution at build time.
the complete line to put in dockerfile is:
echo -e "alias padd='port=\${FTLCONF_webserver_port%%,*} padd --port \${port:-8080} --secret \${FTLCONF_webserver_api_password}'" >>/root/.bashrc

without the redirection to bashrc and placed in start.sh will do also, but bashrc will be rewritten at each container start, erasing possible user aliases and/or bash user defined settings.

[edgd1er]

placed in start.sh will do also, but bashrc will be rewritten at each container start, erasing possible user aliases and/or bash user defined settings.

[PromoFaux]

It needs to be in start.sh because the user-defined FTLCONF_ environment variables will not be defined at build-time, so it need to be applied at run time.

@yubiuser another thought, to ensure we're not munging any user-defined .bashrc (though, one would argue there isn't much of a need to do so in a container such as this) Perhaps we cna do something like:

Dockerfile:

ADD --chmod=0755 https://raw.githubusercontent.com/pi-hole/PADD/PADD_FTLv6/padd.sh /usr/bin/padd

start.sh

port="${FTLCONF_webserver_port%%,*}"
echo "/usr/bin/padd --port ${port:-8080} --secret ${FTLCONF_webserver_api_password}'" > /usr/local/bin/padd
chmod +x /usr/local/bin/padd

[edgd1er]

It needs to be in start.sh because the user-defined FTLCONF_ environment variables will not be defined at build-time, so it need to be applied at run time.

well, it doesn't have to be in start.sh, as bashrc is sourced when session starts, and using $ prevent bash to substitute variable at buildtime. that being said, defining a dynamic alias in start.sh will eventually add the same feature as an alias in bashrc.

[PromoFaux]

using $ prevent bash to substitute variable at buildtime.

Ah OK thanks, when I was tinkering about before it wasn't working - but that could have been for all manner of reasons, to be honest!

[edgd1er]

I've just noticed that the slash before the $ was removed in the reply when publishing the comment, there is may be a misunderstanding : here is a picture of the dockerfile of how it should look:

and the result in the image:

[PromoFaux]

With the addition of pi-hole/PADD#362, the user need only pass in --secret to padd now in order for it to work.

Internally discussed, but as there is no guarantee that the password will be set via FTLCONF_webserver_api_password, (i.e some users prefer not to keep passwords in their compose files etc) it does not seem like a good idea to have an alias for padd inside the image. We can always add a hint in the readme on how users can add an alias themselves if they really need it

@yubiuser -can we have it just in the dockerfile please, no alias - and also if possible please make the padd branch a variable that can be passwed in at build time. (like the other repo branch arguments)

[sonarcloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication