From f7e8982a4b584004e56fd52ce6c33360dc57d4bf Mon Sep 17 00:00:00 2001
From: Andrey Kozhevnikov <coderusinbox@gmail.com>
Date: Mon, 6 Jan 2025 08:00:50 +0700
Subject: [PATCH] heredoc

---
 .github/workflows/build.yml |  2 +-
 Dockerfile.arch             | 17 +++++++++++------
 Dockerfile.tooling          | 20 ++++++++++++++------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index caee6cf..844d046 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ on:
       - master
 
 env:
-  RELEASE: 3.4.0.24
+  RELEASE: 4.6.0.13
 
 jobs:
   build:
diff --git a/Dockerfile.arch b/Dockerfile.arch
index aa8cebb..d6c9a0a 100644
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -6,9 +6,14 @@ ARG ARCH
 
 COPY build/target-$ARCH.tar /target-$ARCH.tar
 
-RUN set -ex ;\
- sudo zypper ref ;\
- sdk-assistant -y create SailfishOS-$RELEASE-$ARCH /target-$ARCH.tar ;\
- sudo rm -f /target-$ARCH.tar ;\
- sudo rm -rf /var/cache/zypp/* ;\
- sudo rm -rf /srv/mer/targets/SailfishOS-$RELEASE-$ARCH/var/cache/zypp/*
\ No newline at end of file
+RUN <<EOF
+ set -ex
+ ssu fl
+ ssu domain
+ ssu lr
+ sudo zypper ref
+ sdk-assistant -y create SailfishOS-$RELEASE-$ARCH /target-$ARCH.tar
+ sudo rm -f /target-$ARCH.tar
+ sudo rm -rf /var/cache/zypp/*
+ sudo rm -rf /srv/mer/targets/SailfishOS-$RELEASE-$ARCH/var/cache/zypp/*
+ EOF
\ No newline at end of file
diff --git a/Dockerfile.tooling b/Dockerfile.tooling
index aef6f6c..414f560 100644
--- a/Dockerfile.tooling
+++ b/Dockerfile.tooling
@@ -8,9 +8,17 @@ COPY build/tooling-i486.tar /tooling-i486.tar
 USER mersdk
 WORKDIR /home/mersdk
 
-RUN set -ex ;\
- sudo mkdir /host_targets ;\
- sudo zypper ref ;\
- sdk-assistant -y create SailfishOS-$RELEASE /tooling-i486.tar ;\
- sudo rm -f /tooling-i486.tar ;\
- sudo rm -rf /var/cache/zypp/*
\ No newline at end of file
+RUN <<EOF
+ set -ex
+ sudo mkdir /host_targets
+ ssu fl
+ ssu domain
+ ssu release
+ ssu lr
+ ssu fl release
+ ssu domain sailfish
+ sudo zypper ref
+ sdk-assistant -y create SailfishOS-$RELEASE /tooling-i486.tar
+ sudo rm -f /tooling-i486.tar
+ sudo rm -rf /var/cache/zypp/*
+ EOF
\ No newline at end of file