diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml index a11ca90..cc5ed79 100644 --- a/.forgejo/workflows/build-image.yaml +++ b/.forgejo/workflows/build-image.yaml @@ -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 diff --git a/Dockerfile.gnome b/Dockerfile.gnome index f074faf..133ff29 100644 --- a/Dockerfile.gnome +++ b/Dockerfile.gnome @@ -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 diff --git a/Dockerfile.kde b/Dockerfile.kde index efafd70..55d1eb1 100644 --- a/Dockerfile.kde +++ b/Dockerfile.kde @@ -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