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

Added tagging logic for debian-base to support both Stretch and Buster build tags. #25

Conversation

lightswitch05
Copy link
Member

@lightswitch05 lightswitch05 commented May 26, 2020

Added tagging logic for debian-base images to support both Stretch and Buster build tags.

  1. These changes were only made to the debian-base image as the downstream docker-pi-hole would be affected if the image were immediately cut over to Buster.
  2. I have no idea how the FTL will be affected from Buster images, so I just didn't touch them. As far as I know, Migrate FTL build to Debian Buster #14 is valid for the FTL images without needing new tagging logic. Someone else needs to figure that out.
  3. Stretch is still the default Debian flavor for the resulting debian-base:lastest image.
  4. Some tag examples:
    • debian-base:latest (on master - stretch for now)
    • debian-base:stretch (on master)
    • debian-base:buster (on master)
    • debian-base:{tag} (branch doesn't matter - stretch for now)
    • debian-base:{tag}-stretch (branch doesn't matter)
    • debian-base:{tag}-buster (branch doesn't matter)
    • debian-base:{branch} (stretch for now)
    • debian-base:{branch}-stretch
    • debian-base:{branch}-buster
  5. After downstream is happy with Buster, Buster can be made the default flavor.

Want to test this?

  • Clone
  • docker-compose build
  • Wait....
  • run DRY_RUN=true ./tag-and-push.sh {docker-compose service name} to see what the resulting tags are, example: DRY_RUN=true ./tag-and-push.sh debian-base-stretch.
  • make tags, switch branches, re-run and see how the tags change.

@lightswitch05
Copy link
Member Author

The way the Debian tags are split out, we could actually add a debian:bullseye-slim variety really easy if you wanted cutting edge

@dschaper dschaper merged commit 52cf7c4 into pi-hole:master May 26, 2020
@lightswitch05
Copy link
Member Author

Woohoo! There is now a buster tag of the Debian base image for use in testing with docker-pihole

https://hub.docker.com/layers/pihole/debian-base/buster/images/sha256-c402108b8a2b5f1bc0ea2e9cb3fee3cf3dd1ee752ebeb39838d17cb6e51c4c69?context=explore

@dschaper
Copy link
Member

Thank you!

@lightswitch05
Copy link
Member Author

Not sure if circle CI is still running? Maybe it should be disabled?

@dschaper
Copy link
Member

There's no checks for it? Might be an automated build from docker hub though

@dschaper
Copy link
Member

I've unfollowed this repo on Circle, it should stop building. It was building master still. There is no autobuild set up for Hub.

Could remove the yaml if it's not needed anymore.

@dschaper
Copy link
Member

Actually, we need CircleCI for ftl builds I believe.

Will PR the removal of only the base images.

@dschaper dschaper mentioned this pull request May 26, 2020
@dschaper
Copy link
Member

Everything can go actually.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants