Skip to content

Commit

Permalink
Move Ubuntu 22.04 to a separate dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
amezin committed Oct 16, 2024
1 parent 1b49f84 commit 54876aa
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
dockerfile: debian.dockerfile

- image: ubuntu-22.04
dockerfile: debian.dockerfile
dockerfile: debian-old.dockerfile

- image: ubuntu-24.04
dockerfile: debian.dockerfile
Expand Down
26 changes: 26 additions & 0 deletions debian-old.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
ARG base_image=ubuntu-22.04

FROM docker.io/library/ubuntu:22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe AS ubuntu-22.04

FROM ${base_image}

RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
gnome-session \
gjs \
dbus-user-session \
gdm3 \
gir1.2-vte-2.91 \
xvfb \
packagekit \
gir1.2-packagekitglib-1.0 \
wl-clipboard \
gir1.2-handy-1

COPY data /

RUN systemctl set-default multi-user.target && \
systemctl mask systemd-oomd low-memory-monitor rtkit-daemon udisks2 && \
truncate --size 0 /etc/machine-id

CMD [ "/sbin/init" ]
1 change: 0 additions & 1 deletion debian.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ ARG base_image=ubuntu-24.04

FROM docker.io/library/debian:12@sha256:27586f4609433f2f49a9157405b473c62c3cb28a581c413393975b4e8496d0ab AS debian-12
FROM docker.io/library/debian:trixie@sha256:4b826db5f1f14d1db0b560304f189d4b17798ddce2278b7822c9d32313fe3f50 AS debian-13
FROM docker.io/library/ubuntu:22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe AS ubuntu-22.04
FROM docker.io/library/ubuntu:24.04@sha256:d4f6f70979d0758d7a6f81e34a61195677f4f4fa576eaf808b79f17499fd93d1 AS ubuntu-24.04
FROM docker.io/library/ubuntu:24.10@sha256:3f49af910ce126ee3d7d1982fe57e34cc90265cb9ac2db3f9e7166e2c21fdb44 AS ubuntu-24.10

Expand Down

0 comments on commit 54876aa

Please sign in to comment.