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

fix arm64 arch. use copy --chmod. reduce number of layers. #1393

Merged
merged 2 commits into from
Jul 23, 2023

Conversation

edgd1er
Copy link
Contributor

@edgd1er edgd1er commented Jul 23, 2023

{Please select 'base: dev' as target branch above! (you can delete this line)}

Description

  • replace chmod in run § with COPY --chmod=0755
  • reduce number of layers (each RUN is a layer)
  • add temporarily binutils to have readelf as sometimes pihole-FTL is not downloaded (html error). I guess this could be removed when the cause wil be identified.
  • arm64 arch could not download as the arch name was wrong as the FTLARCH value
  • Moved ARG/ENV to top of file. (easier to find where to search when changing values)

Motivation and Context

  • pihole-FTL for arm64 was not downloaded.
  • reduce size reducing layers (RUN)

How Has This Been Tested?

run dig commands on pihole on a amd64 (intel i5) and arm64 (Rpi4)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.

src/Dockerfile Outdated Show resolved Hide resolved
src/Dockerfile Outdated Show resolved Hide resolved
src/Dockerfile Outdated Show resolved Hide resolved
src/Dockerfile Outdated Show resolved Hide resolved
PromoFaux
PromoFaux previously approved these changes Jul 23, 2023
@PromoFaux PromoFaux dismissed their stale review July 23, 2023 22:29

Actually....

@PromoFaux
Copy link
Member

Sorry, I should be a stickler here... Can you squash all commits and also sign off per instructions here to keep the bot happy

https://github.com/pi-hole/docker-pi-hole/pull/1393/checks?check_run_id=15273573118

@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

edgd1er and others added 2 commits July 24, 2023 00:39
@github-actions
Copy link

Conflicts have been resolved.

@sonarcloud
Copy link

sonarcloud bot commented Jul 23, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@PromoFaux PromoFaux merged commit a926798 into pi-hole:development-v6 Jul 23, 2023
11 of 18 checks passed
@edgd1er edgd1er deleted the Dockerfile_changes branch July 23, 2023 23:13
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.

3 participants