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.

Sign up for GitHub

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

Jump to bottom

fix: do not fail on apt-get update for extra packages, for #5620 #5623

Merged
merged 2 commits into from
Dec 13, 2023
Merged

fix: do not fail on apt-get update for extra packages, for #5620 #5623

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5aba79
fix: do not fail on apt update for extra packages
stasadev Dec 12, 2023
7ab0a11
Remove debug line [skip ci]
stasadev Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/ddevapp/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,8 +1085,8 @@ RUN (groupadd --gid $gid "$username" || groupadd "$username" || true) && (userad
if extraPackages != nil {
contents = contents + `
### DDEV-injected from webimage_extra_packages or dbimage_extra_packages
RUN echo "Disk usage problems: " && df -h /tmp && ls -l /var/lib/apt/lists
RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y -o Dpkg::Options::="--force-confold" --no-install-recommends --no-install-suggests ` + strings.Join(extraPackages, " ") + "\n"
RUN echo "Disk usage problems: " && df -h / && ls -l /var/lib/apt/lists
Copy link
Member Author

Choose a reason for hiding this comment

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

@rfay I'm not sure if we still need this check, if we skip failures for apt-get update, but anyway:
I changed df -h /tmp to df -h / - we discussed this on Discord earlier and df -h /tmp produced less output.

Copy link
Member

Choose a reason for hiding this comment

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

Agreed we probably won't need it at all, can remove. Install of PHP related packages can still fail, but we have no control. And this check didn't actually do anything but somehow seemed to result in less failures

RUN (apt-get -qq update || true) && DEBIAN_FRONTEND=noninteractive apt-get -qq install -y -o Dpkg::Options::="--force-confold" --no-install-recommends --no-install-suggests ` + strings.Join(extraPackages, " ") + "\n"
}

// For webimage, update to latest Composer.
Expand Down