Accepting request 1067602 from home:mslacken:pr

- added simple sif building for SLE systems via suseconnect-container
- added files: 
  * simpler-sif-building.patch
  * SLE-12SP5.def
  * leap.def

OBS-URL: https://build.opensuse.org/request/show/1067602
OBS-URL: https://build.opensuse.org/package/show/network:cluster/apptainer?expand=0&rev=38

README.SUSE

@@ -6,20 +6,22 @@ of bootdef variables need to be specified:
 
 1. Create a bootdef file (for instance 'sle.def'), add
    BootStrap: zypper
-2. Set the OS version:
+2. Set the optional OS version:
    OSVersion: 15.0
    The version number corresponds to the Leap version or the
    SLE version and service pack level: <version>.<service_pack_level>
    Example: SLE-12 SP4 would be 12.4.
    The inital release of a major version corresponds to
    <service_pack_level> 0.  
-3. For openSUSE the following additional variables need to be
+3. For openSUSE the following variables need to be
    specified:
-   * MirrorURL: URL to the installation repository.
-                Check 'man 8 zypper' for supported formats
+   * MirrorURL: URL to the installation repository. Following URL 
+     should be work:
+     http://download.opensuse.org/distribution/openSUSE-stable/repo/oss
    * UpdateURL: (optional) URI of the update repository
-4. For SLE, all required settings are obtained from SCC.
-   The following variables are recognized:
+4. For SLE, all required settings are obtained from SCC via 
+   suseconnect-container. If the container should be registered separately 
+   the following variables are recognized:
    * Product: The product code: The following forms may be
                  used:
                  <product_id>
@@ -51,8 +53,8 @@ of bootdef variables need to be specified:
 
 Examples
 ========
-Example defintions for SLE12-SP5 and SLE15-SP3 are in the same 
-directory as README.SUSE
+Example defintions for openSUSE leap, registration via suseconnect-container, SLE12-SP5 
+and SLE15-SP5 are in the same directory as README.SUSE
 
 ProductPGP
 ==========

SLE-12SP5.def

@@ -36,17 +36,5 @@ MDEhky/9NqMy\n\
 
 %post
     ln -s /etc/products.d/SLE-HPC.prod /etc/products.d/baseproduct
-    SUSEConnect -p PackageHub/12.5/x86_64
-    zypper install -y bash coreutils e2fsprogs \
-    ethtool filesystem findutils gawk grep \
-    iputils iproute2 net-tools nfs-client pam psmisc rsync sed \
-    rsyslog util-linux words wicked tar less \
-    gzip which util-linux \
-    pciutils vim strace sudo syslinux tcpdump timezone chrony cpio \
-    wget openssh 
-    # up to here, its a base container, line below can be used
-    # used for warewulf
-    zypper install -y ipmitool kernel-default
-
-    systemctl enable sshd
-
+    echo "Hello from post boot strap"
+    zypper install -y vim

SLE-15SP5.def

@@ -1,7 +1,7 @@
 BootStrap: zypper
-OSVersion: 15.3
+OSVersion: 15.5
 Include: zypper
-Product: SLES/15.3/x86_64
+Product: SLES/15.5/x86_64
 User: EMAIL
 Regcode: REGCODE
 MirrorURL: https://updates.suse.com/SUSE/Products/SLE-BCI/15-SP3/x86_64/product/
@@ -35,19 +35,5 @@ MDEhky/9NqMy\n\
 
 %post
     update-ca-certificates 
-    SUSEConnect -p PackageHub/15.3/x86_64
-    SUSEConnect -p sle-module-web-scripting/15.3/x86_64
-    SUSEConnect -p sle-module-hpc/15.3/x86_64
-    zypper install -y bash coreutils e2fsprogs \
-    ethtool filesystem findutils gawk grep \
-    iputils iproute2 net-tools nfs-client pam psmisc rsync sed \
-    rsyslog util-linux words wicked tar less \
-    gzip which util-linux \
-    pciutils vim strace sudo syslinux tcpdump timezone chrony cpio \
-    wget openssh 
-    # up to here, its a base container, line below can be used
-    # used for warewulf
-    zypper in -y kernel-default ipmitool 
-
-    systemctl enable sshd
-
+    echo "Hello from post boot strap"
+    zypper in -y vim

SLE.def

@@ -0,0 +1,8 @@
+# Install container from the repos of the host
+BootStrap: zypper
+
+%post
+    update-ca-certificates
+    echo "Hello from post boot strap"
+    zypper in -y vim
+

apptainer.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Feb 24 13:22:57 UTC 2023 - Christian Goll <cgoll@suse.com>
+
+- added simple sif building for SLE systems via suseconnect-container
+- added files: 
+  * simpler-sif-building.patch
+  * SLE-12SP5.def
+  * leap.def
+
 -------------------------------------------------------------------
 Wed Feb 15 09:01:08 UTC 2023 - Christian Goll <cgoll@suse.com>
 

apptainer.spec

@@ -34,9 +34,12 @@ Obsoletes:      singularity <= 3.8.5
 Source0:        https://github.com/apptainer/apptainer/archive/v%{version}%{?vers_suffix}/apptainer-%{version}%{?vers_suffix}.tar.gz
 Source1:        README.SUSE
 Source2:        SLE-12SP5.def
-Source3:        SLE-15SP3.def
-Source5:        %{name}-rpmlintrc
+Source3:        SLE-15SP5.def
+Source4:        SLE.def
+Source5:        leap.def
+Source8:        %{name}-rpmlintrc
 Source9:        vendor.tar.gz
+Patch1:         simpler-sif-building.patch
 %if "%{?squashfuse_version}" != ""
 Source10:       https://github.com/vasi/squashfuse/archive/%{squashfuse_version}/squashfuse-%{squashfuse_version}.tar.gz
 Patch10:        https://github.com/vasi/squashfuse/pull/70.patch
@@ -85,7 +88,8 @@ containers that can be used across host environments.
 %patch -P 10 -p1
 %endif
 %setup -q -n %{name}-%{version}
-cp %{S:1} %{S:2} %{S:3} .
+%patch1 -p 1
+cp %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} .
 
 %build
 %if "%{?squashfuse_version}" != ""

leap.def

@@ -0,0 +1,6 @@
+Bootstrap: zypper
+MirrorURL: http://download.opensuse.org/distribution/openSUSE-stable/repo/oss
+Include: zypper
+%post
+    echo "Hello from post boot strap"
+    zypper in -y vim