workaround: publish docker image by pushing on development branch - #1905
workaround: publish docker image by pushing on development branch#1905LizenzFass78851 wants to merge 1 commit into
Conversation
yubiuser
left a comment
There was a problem hiding this comment.
Thanks for catching this. It fails, because it tries to add a file to the image that is not part of core's master branch yet.
I'm undecided yet regarding this PR. It will alter how we tag things. Currently, nightly contains development branch of all components and the docker repo. development uses the master branches of the components, but the development branch of this repo.
With this change, development will be like nightly
|
That's a good point - the One pottential workaround until such time as we can release is to add the following patch to this repo's development branch: diff --git a/build.sh b/build.sh
old mode 100755
new mode 100644
diff --git a/src/Dockerfile b/src/Dockerfile
index cb7a061..49375e9 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -90,8 +90,12 @@ RUN cd /etc/.pihole && \
install -Dm755 -d /var/log/pihole && \
install -Dm755 -d /var/lib/logrotate && \
install -Dm755 -t /usr/local/bin pihole && \
- install -Dm644 ./advanced/bash-completion/pihole.bash /etc/bash_completion.d/pihole && \
- install -Dm644 ./advanced/bash-completion/pihole-ftl.bash /etc/bash_completion.d/pihole-FTL && \
+ (if [ -f ./advanced/bash-completion/pihole.bash ]; then \
+ install -Dm644 ./advanced/bash-completion/pihole.bash /etc/bash_completion.d/pihole; \
+ install -Dm644 ./advanced/bash-completion/pihole-ftl.bash /etc/bash_completion.d/pihole-FTL; \
+ else \
+ install -Dm644 ./advanced/bash-completion/pihole /etc/bash_completion.d/pihole; \
+ fi) && \
install -T -m 0755 ./advanced/Templates/pihole-FTL-prestart.sh /opt/pihole/pihole-FTL-prestart.sh && \
install -T -m 0755 ./advanced/Templates/pihole-FTL-poststop.sh /opt/pihole/pihole-FTL-poststop.sh && \
addgroup -S pihole -g ${PIHOLE_GID} && adduser -S pihole -G pihole -u ${PIHOLE_UID} && \ |
Signed-off-by: LizenzFass78851 <82592556+LizenzFass78851@users.noreply.github.com>
|
I applied the patch and removed the change that was intended for the GitHub workflow. |
|
closed, as implementation is continued in pull request #1906 |
Description
This adds the variable
components branchso that ifgithub.ref_nameis recognized asdevelopment, it also pushing the docker image to thedevelopmenttagMotivation and Context
In one of the last workflow runs that was triggered by pushing on the
developmentbranch, an error occurred that was triggered when the Docker image was built and not thedevelopmentbranch of FTL, Web and Core was loaded, but rather the respectivemasterbranch.https://github.com/pi-hole/docker-pi-hole/actions/runs/18255584741/job/51976380837#step:10:399
How Has This Been Tested?
I tested the workflow with deviations in my fork with the changes
Types of changes
Checklist: