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 Dockerfile for ubuntu 20 lts non-hwe #1927

Merged
merged 2 commits into from
Oct 19, 2023
Merged

🐛 Fix Dockerfile for ubuntu 20 lts non-hwe #1927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fc7be7
Fix Dockerfile for ubuntu 20 lts non-hwe
mauromorales Oct 19, 2023
642b1a9
Merge branch 'master' into fix-ubuntu-20-non-hwe
mauromorales Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions images/Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@ RUN apt-get update \
###############################################################
#### Common to an Arch and Flavor ####
###############################################################
FROM ${TARGETARCH} AS base-20-lts
FROM ${TARGETARCH} AS base-ubuntu-20-lts
RUN apt-get update && apt-get install -y --no-install-recommends \
file \
fuse \
patch \
policykit-1 \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

FROM ${TARGETARCH} AS base-22-lts
FROM ${TARGETARCH} AS base-ubuntu-22-lts
RUN apt-get update && apt-get install -y --no-install-recommends \
dracut-live \
firmware-sof-signed \
Expand All @@ -143,29 +143,27 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
polkitd \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

FROM base-22-lts AS hwe-22-lts
FROM base-ubuntu-22-lts AS hwe-22-lts
RUN apt-get update && apt-get install -y --no-install-recommends \
linux-image-generic-hwe-22.04 \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

FROM base-20-lts AS hwe-20-lts
FROM base-ubuntu-20-lts AS hwe-20-lts
RUN apt-get update && apt-get install -y --no-install-recommends \
linux-image-generic-hwe-20.04 \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

FROM base-22-lts AS non-hwe-20-lts
RUN apt-get update && apt-get install -y --no-install-recommends \
linux-image-generic \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

FROM non-hwe-20-lts AS non-hwe-22-lts

FROM hwe-22-lts AS amd64-ubuntu
FROM hwe-22-lts AS amd64-ubuntu-22-lts
FROM hwe-20-lts AS amd64-ubuntu-20-lts

FROM non-hwe-22-lts AS amd64-ubuntu-22-lts-non-hwe
FROM non-hwe-20-lts AS amd64-ubuntu-20-lts-non-hwe
FROM base-${FLAVOR} AS amd64-non-hwe
RUN apt-get update && apt-get install -y --no-install-recommends \
linux-image-generic \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

FROM amd64-non-hwe AS amd64-ubuntu-22-lts-non-hwe
FROM amd64-non-hwe AS amd64-ubuntu-20-lts-non-hwe

FROM base-22-lts AS arm64-ubuntu
FROM base-22-lts AS arm64-ubuntu-22-lts
Expand Down
Loading