Skip to content

OHOS: Update to ubuntu 24.04 #116

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

Merged
jschwe merged 2 commits into from
Apr 15, 2026
Merged

OHOS: Update to ubuntu 24.04 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49094cb
update to ubuntu 24.04
Narfinger Mar 3, 2026
2a4e4dd
base ubuntu image already has this id
Narfinger Apr 14, 2026
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
6 changes: 3 additions & 3 deletions docker/base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


# syntax=docker/dockerfile:1
# check=error=true
Expand All @@ -8,7 +8,7 @@
# quickly as possible.
# We already add a user in this image, so all other images inherit it.

FROM ubuntu:22.04 AS base_fetcher
FROM ubuntu:24.04 AS base_fetcher

ARG DEBIAN_FRONTEND=noninteractive

Expand All @@ -18,7 +18,7 @@ RUN apt-get update && \
&& rm -rf /var/cache/apt/lists

ARG USERNAME=servo_ci
ARG USER_UID=1000
ARG USER_UID=1010
ARG USER_GID=${USER_UID}

RUN groupadd --gid ${USER_GID} ${USERNAME} && \
Expand Down
2 changes: 1 addition & 1 deletion docker/runner/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG GITHUB_ACTIONS_RUNNER_VERSION
ARG HOS_COMMANDLINE_TOOLS_VERSION

FROM ubuntu:22.04 AS rust
FROM ubuntu:24.04 AS rust
RUN apt update && apt install -y curl build-essential
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
| sh -s -- -y --default-toolchain stable \
Expand Down