Skip to content

Commit

Permalink
update for f40
Browse files Browse the repository at this point in the history
  • Loading branch information
lleyton committed Jun 23, 2024
1 parent 97358cc commit e58dc13
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 110 deletions.
103 changes: 0 additions & 103 deletions .github/workflows/docker-publish.yml

This file was deleted.

24 changes: 24 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Docker

on:
schedule:
- cron: "15 14 * * *"
push:
branches: ["main"]
# Publish semver tags as releases.
tags: ["v*.*.*"]
pull_request:
branches: ["main"]
workflow_dispatch:

jobs:
docker:
uses: FyraLabs/actions/.github/workflows/docker.yml@main
with:
publish: ${{ github.event_name != 'pull_request' }}
permissions:
contents: read
packages: write
# This is used to complete the identity challenge
# with sigstore/fulcio when running outside of PRs.
id-token: write
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM fedora:38
FROM registry.fedoraproject.org/fedora-minimal:40

RUN dnf install -y nodejs docker xorg-x11-server-Xvfb lorax wget ostree ostree-devel rpm-ostree git hfsplus-tools flatpak flatpak-builder dbus dbus-daemon rpmdevtools make mock selinux-policy python3-pip jq @development-tools gcc cairo-devel python3-devel python3-aiohttp python3-tenacity python3-gobject 'pkgconfig(gobject-introspection-1.0)' 'pkgconfig(cairo-gobject)' 'dnf-command(config-manager)'
RUN dnf config-manager --add-repo='https://raw.githubusercontent.com/terrapkg/subatomic-repos/main/terra38.repo'
RUN dnf -y install melody vala-lint-nightly
RUN dnf5 up -y
RUN dnf5 install -y nodejs docker xorg-x11-server-Xvfb lorax wget ostree ostree-devel rpm-ostree git hfsplus-tools flatpak flatpak-builder dbus dbus-daemon rpmdevtools make mock selinux-policy python3-pip jq @development-tools gcc cairo-devel python3-devel python3-aiohttp python3-tenacity python3-gobject 'pkgconfig(gobject-introspection-1.0)' 'pkgconfig(cairo-gobject)'
RUN dnf5 install -y --repofrompath 'terra,https://repos.fyralabs.com/terra40' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra40/key.asc' terra-release
RUN dnf5 -y install melody vala-lint-nightly

RUN dnf clean all
RUN rm -rf /var/cache/yum
RUN dnf5 clean all

RUN pip3 install --no-cache-dir ostree-push yq
RUN pip3 install --no-cache-dir yq

RUN curl https://raw.githubusercontent.com/flatpak/flat-manager/master/flat-manager-client -o /usr/bin/flat-manager-client
RUN chmod +x /usr/bin/flat-manager-client

0 comments on commit e58dc13

Please sign in to comment.