Skip to content

Commit 15e7330

Browse files
authored
OHOS: Update to ubuntu 24.04 (#116)
This updates the base images to ubuntu 24.04 with keeping in line with the other jobs on CI. The new ubuntu image has a default `ubuntu` user with UID 1000, so we adjust our UID. Signed-off-by: Narfinger <Narfinger@users.noreply.github.com> --------- Signed-off-by: Narfinger <Narfinger@users.noreply.github.com>
1 parent f21e124 commit 15e7330

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

docker/base/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
22

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

11-
FROM ubuntu:22.04 AS base_fetcher
11+
FROM ubuntu:24.04 AS base_fetcher
1212

1313
ARG DEBIAN_FRONTEND=noninteractive
1414

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

2020
ARG USERNAME=servo_ci
21-
ARG USER_UID=1000
21+
ARG USER_UID=1010
2222
ARG USER_GID=${USER_UID}
2323

2424
RUN groupadd --gid ${USER_GID} ${USERNAME} && \

docker/runner/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG GITHUB_ACTIONS_RUNNER_VERSION
22
ARG HOS_COMMANDLINE_TOOLS_VERSION
33

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

0 commit comments

Comments
 (0)