ver4a/ostree-native-containers
1
0
Fork 0
Code Activity Actions

Rebase to F42
All checks were successful
/ build-gnome (push) Successful in 18m19s
Details
/ build-kde (push) Successful in 24m59s
Details

Browse source
This commit is contained in:
ver4a 2025-04-16 13:08:52 +02:00
parent 6079b7a33c
commit 9ed69ddf96
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.forgejo/workflows/build-image.yaml
View file

@ -12,7 +12,7 @@ jobs:
# base
- run: mkdir cache
# Waits for a CI pull lock to be released before starting a new pull
- run: flock -x /tmp/CI-podman-pull-lock -c 'podman pull quay.io/fedora-ostree-desktops/kinoite:41'
- run: flock -x /tmp/CI-podman-pull-lock -c 'podman pull quay.io/fedora-ostree-desktops/kinoite:42'
- run: podman build . -f Dockerfile.kde --userns container --security-opt no-new-privileges --no-cache --pull=never -v ${PWD}/cache:/var/cache/libdnf5:Z --squash --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }} --build-arg NAMESPACE=${{ vars.NAMESPACE }} -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main --annotation quay.expires-after=
- run: podman push --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main
- run: podman build -f Dockerfile.scratch --from ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-kde:main --label quay.expires-after=4w --annotation quay.expires-after=4w
@ -47,7 +47,7 @@ jobs:
# base
- run: mkdir cache
# Waits for a CI pull lock to be released before starting a new pull
- run: flock -x /tmp/CI-podman-pull-lock -c 'podman pull quay.io/fedora-ostree-desktops/silverblue:41'
- run: flock -x /tmp/CI-podman-pull-lock -c 'podman pull quay.io/fedora-ostree-desktops/silverblue:42'
- run: podman build . -f Dockerfile.gnome --userns container --security-opt no-new-privileges --no-cache --pull=never -v ${PWD}/cache:/var/cache/libdnf5:Z --squash --build-arg REGISTRY_DOMAIN=${{ vars.REGISTRY_DOMAIN }} --build-arg NAMESPACE=${{ vars.NAMESPACE }} -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main --annotation quay.expires-after=
- run: podman push --compression-format=zstd --compression-level=${{ vars.COMPRESSION_LEVEL }} ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main
- run: podman build -f Dockerfile.scratch --from ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main -t ${{ vars.REGISTRY_DOMAIN }}/${{ vars.NAMESPACE }}/onc-gnome:main --label quay.expires-after=4w --annotation quay.expires-after=4w

4
Dockerfile.gnome
View file

@ -1,4 +1,4 @@
FROM quay.io/fedora-ostree-desktops/silverblue:41 AS mpv-build
FROM quay.io/fedora-ostree-desktops/silverblue:42 AS mpv-build
RUN dnf5 -y install --setopt install_weak_deps=false git meson g++ autoconf cmake automake libtool freetype-devel fribidi-devel nasm pipewire-devel wayland-devel wayland-protocols-devel libshaderc-devel libxkbcommon-devel vulkan-loader-devel compat-lua-devel libva-devel openssl-devel
@ -9,7 +9,7 @@ COPY ./mpv_options /build/mpv-build/mpv_options
RUN cd /build/mpv-build && ./rebuild -j$(nproc)
FROM quay.io/fedora-ostree-desktops/silverblue:41
FROM quay.io/fedora-ostree-desktops/silverblue:42
COPY --from=mpv-build /build/mpv-build/mpv/build/mpv /bin/mpv

4
Dockerfile.kde
View file

@ -1,4 +1,4 @@
FROM quay.io/fedora-ostree-desktops/kinoite:41 AS mpv-build
FROM quay.io/fedora-ostree-desktops/kinoite:42 AS mpv-build
RUN dnf5 -y install --setopt install_weak_deps=false git meson g++ autoconf cmake automake libtool freetype-devel fribidi-devel nasm pipewire-devel wayland-devel wayland-protocols-devel libshaderc-devel libxkbcommon-devel vulkan-loader-devel compat-lua-devel libva-devel openssl-devel
@ -9,7 +9,7 @@ COPY ./mpv_options /build/mpv-build/mpv_options
RUN cd /build/mpv-build && ./rebuild -j$(nproc)
FROM quay.io/fedora-ostree-desktops/kinoite:41
FROM quay.io/fedora-ostree-desktops/kinoite:42
COPY --from=mpv-build /build/mpv-build/mpv/build/mpv /bin/mpv