Skip to content

Commit

Permalink
Generate images from Tumbleweed (#1)
Browse files Browse the repository at this point in the history
Images generated on Leap 15.2 aren't recognized by the newest
flatpak version on Tumbleweed
openSUSE/obs-build#668

Also update README.md with more detailed instructions
  • Loading branch information
perlpunk committed Mar 4, 2021
1 parent f6826c6 commit 34548b3
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM opensuse/leap:15.2
FROM opensuse/tumbleweed

RUN zypper refresh && zypper -n install \
flatpak \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.builder
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM opensuse/leap:15.2
FROM opensuse/tumbleweed

RUN zypper refresh && zypper -n install \
xeyes \
Expand Down
29 changes: 26 additions & 3 deletions README → README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,42 @@ Build the container for installing flatpak base images:

make docker-base

Examples:
Example:

# Check for necessary updates
% perl scripts/flatpak-check-updates.pl

→ org.freedesktop.Platform can be updated (v20.08.3 -> v20.08.5)
→ org.freedesktop.Sdk can be updated (v20.08.3 -> v20.08.5)
✓ org.gnome.Platform is uptodate (v3.38)
✓ org.gnome.Sdk is uptodate (v3.38)
✓ org.kde.Platform is uptodate (v5.15)
✓ org.kde.Sdk is uptodate (v5.15)

# Checkout OBS:Flatpak
% cd ~/osc
# Warning! Needs 11G disk space (currently)
% osc co OBS:Flatpak

# Update org.freedesktop.Sdk
# Install a runtime in docker environment and create tarballs under `output/`
# Use '20.08' (the flatpak branch name), not the full version
% scripts/flatpak-call-install.sh runtime/org.freedesktop.Sdk/x86_64/20.08
# Create spec files from tarballs under `osc/package-name/`
% perl scripts/flatpak-spec.pl org.freedesktop.Sdk
# Then move the resulting files in the `osc/` directories to your osc checkout
% rsync -a osc/org.* ~/osc/OBS:Flatpak/
# Remove generated files
% rm -rf osc/org.*

% scripts/flatpak-call-install.sh org.freedesktop.Platform/x86_64/20.08
# Update org.freedesktop.Platform
% scripts/flatpak-call-install.sh runtime/org.freedesktop.Platform/x86_64/20.08
% perl scripts/flatpak-spec.pl org.freedesktop.Platform
% rsync -a osc/org.* ~/osc/OBS:Flatpak/
% rm -rf osc/org.*

# Commit the updated OBS packages
% cd ~/osc/OBS:Flatpak/
# look for updated packages and commit

### Requirements

Expand Down

0 comments on commit 34548b3

Please sign in to comment.