From 57504ebf8ae688da29b4be5782aa4c3ef380f012 Mon Sep 17 00:00:00 2001 From: thelamer Date: Wed, 24 Jul 2024 15:48:36 -0400 Subject: [PATCH] add noble base image --- .github/workflows/build-on-commit.yml | 1 + base-images/Dockerfile.alpine-320 | 2 +- base-images/Dockerfile.alpine-edge | 2 +- base-images/Dockerfile.debian-bookworm | 2 +- base-images/Dockerfile.debian-sid | 2 +- base-images/Dockerfile.ubuntu-jammy | 2 +- base-images/Dockerfile.ubuntu-noble | 49 ++++++++++++++++++++++++++ 7 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 base-images/Dockerfile.ubuntu-noble diff --git a/.github/workflows/build-on-commit.yml b/.github/workflows/build-on-commit.yml index cdc5cae4..b38d6eb2 100644 --- a/.github/workflows/build-on-commit.yml +++ b/.github/workflows/build-on-commit.yml @@ -33,6 +33,7 @@ jobs: - name: debian-bookworm - name: debian-sid - name: ubuntu-jammy + - name: ubuntu-noble meta: name: Ingest Metadata runs-on: ubuntu-latest diff --git a/base-images/Dockerfile.alpine-320 b/base-images/Dockerfile.alpine-320 index c3a765ca..1c0b0670 100644 --- a/base-images/Dockerfile.alpine-320 +++ b/base-images/Dockerfile.alpine-320 @@ -1,4 +1,4 @@ -FROM alpine:3.20 as rootfs +FROM alpine:3.20 AS rootfs ARG REPO diff --git a/base-images/Dockerfile.alpine-edge b/base-images/Dockerfile.alpine-edge index b7927865..e8d1e834 100644 --- a/base-images/Dockerfile.alpine-edge +++ b/base-images/Dockerfile.alpine-edge @@ -1,4 +1,4 @@ -FROM alpine:edge as rootfs +FROM alpine:edge AS rootfs ARG REPO diff --git a/base-images/Dockerfile.debian-bookworm b/base-images/Dockerfile.debian-bookworm index 4cf1573b..62152545 100644 --- a/base-images/Dockerfile.debian-bookworm +++ b/base-images/Dockerfile.debian-bookworm @@ -1,4 +1,4 @@ -FROM debian:bookworm-slim as rootfs +FROM debian:bookworm-slim AS rootfs ARG REPO diff --git a/base-images/Dockerfile.debian-sid b/base-images/Dockerfile.debian-sid index 9b87c4ea..1b9c249f 100644 --- a/base-images/Dockerfile.debian-sid +++ b/base-images/Dockerfile.debian-sid @@ -1,4 +1,4 @@ -FROM debian:sid-slim as rootfs +FROM debian:sid-slim AS rootfs ARG REPO diff --git a/base-images/Dockerfile.ubuntu-jammy b/base-images/Dockerfile.ubuntu-jammy index 8a3d88db..c7edc513 100644 --- a/base-images/Dockerfile.ubuntu-jammy +++ b/base-images/Dockerfile.ubuntu-jammy @@ -1,4 +1,4 @@ -FROM ubuntu:jammy as rootfs +FROM ubuntu:jammy AS rootfs ARG REPO diff --git a/base-images/Dockerfile.ubuntu-noble b/base-images/Dockerfile.ubuntu-noble new file mode 100644 index 00000000..c6db00b3 --- /dev/null +++ b/base-images/Dockerfile.ubuntu-noble @@ -0,0 +1,49 @@ +FROM ubuntu:noble AS rootfs + +ARG REPO + +# Install packages +RUN \ + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install -y --no-install-recommends \ + ca-certificates \ + curl \ + dbus-x11 \ + desktop-file-utils \ + fonts-noto \ + libvulkan1 \ + mesa-va-drivers \ + mesa-vulkan-drivers \ + netcat-openbsd \ + pulseaudio \ + xdg-utils \ + xserver-xorg-video-amdgpu \ + xserver-xorg-video-ati \ + $(if [ $(uname -m) == "x86_64" ];then echo "xserver-xorg-video-intel";fi) && \ + echo "**** setup xdg-open tunnel ****" && \ + mkdir -p /usr/share/applications && \ + curl -o \ + /usr/share/applications/xdg-open.desktop -L \ + "https://raw.githubusercontent.com/${REPO}/bins/xdg-open/xdg-open.desktop" && \ + curl -o \ + /usr/bin/xdg-open -L \ + "https://raw.githubusercontent.com/${REPO}/bins/xdg-open/xdg-open" && \ + chmod +x /usr/bin/xdg-open && \ + update-desktop-database && \ + echo "**** cleanup ****" && \ + apt-get remove -y \ + desktop-file-utils && \ + apt-get autoclean && \ + rm -rf \ + /root/.cache \ + /var/lib/apt/lists/* \ + /var/tmp/* \ + /tmp/* && \ + echo "**** wrap dpkg for user installs ****" && \ + mv \ + /usr/bin/dpkg \ + /usr/bin/dpkg-real + +# add local files +COPY /debian-root /