File project.diff of Package opensuse-leap-image

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package opensuse-leap-image

--- config.kiwi.orig
+++ config.kiwi
@@ -29,13 +29,14 @@
             <label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
             <label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org/"/>
+            <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/leap:%OS_VERSION_ID%.%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
           </suse_label_helper:add_prefix>
         </labels>
       </containerconfig>
     </type>
-    <version>15.4.0</version>
+    <version>15.5.0</version>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <rpm-excludedocs>true</rpm-excludedocs>
@@ -54,7 +55,9 @@
     <package name="ca-certificates"/>
     <package name="ca-certificates-mozilla"/>
     <package name="coreutils"/>
+    <package name="curl"/>
     <package name="openSUSE-build-key"/>
+    <package name="timezone"/>
     <package name="netcfg"/>
     
     <package name="live-add-yast-repos"/>
@@ -74,5 +77,6 @@
     <package name="openSUSE-release"/>
     <package name="openSUSE-release-appliance-docker"/>
     <package name="shadow"/>
+    <package name="zypper"/>
   </packages>
 </image>
--- config.sh.orig
+++ config.sh
@@ -49,7 +49,42 @@ sed -i 's/.*rpm.install.excludedocs.*/#
 #--------------------------------------
 find /usr/share/locale -name '*.mo' -delete
 
+#======================================
 # Remove zypp uuid (bsc#1098535)
+#--------------------------------------
 rm -f /var/lib/zypp/AnonymousUniqueId
 
+#==========================================
+# Clean up log files
+#------------------------------------------
+# Remove various log files. While it's possible to just rm -rf /var/log/*, that
+# would also remove some package owned directories (not %ghost) and some files
+# are actually wanted, like lastlog in the !docker case.
+# For those wondering about YaST2 here: Kiwi writes /etc/hosts, so the version
+# from the netcfg package ends up as /etc/hosts.rpmnew, which zypper writes a
+# letter about to /var/log/YaST2/config_diff_2022_03_06.log. Kiwi fixes this,
+# but the log file remains.
+rm -rf /var/log/{zypper.log,zypp/history,YaST2}
+
+# Remove the entire zypper cache content (not the dir itself, owned by libzypp)
+rm -rf /var/cache/zypp/*
+
+#==========================================
+# Hack! The go container management tools can't handle sparse files:
+# https://github.com/golang/go/issues/13548
+# If lastlog doesn't exist, useradd doesn't attempt to reserve space,
+# also in derived containers.
+#------------------------------------------
+if [[ "$kiwi_profiles" == *"docker"* ]]; then
+	# Hack! The go container management tools can't handle sparse files:
+	# https://github.com/golang/go/issues/13548
+	# When lastlog doesn't exist, useradd doesn't attempt to reserve space.
+	rm /var/log/lastlog
+fi
+
+#======================================
+# Remove locale files
+#--------------------------------------
+find /usr/share/locale -name '*.mo' -delete
+
 exit 0
--- opensuse-leap-image.changes.orig
+++ opensuse-leap-image.changes
@@ -1,4 +1,19 @@
 -------------------------------------------------------------------
+Fri Sep 29 11:10:24 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- Add curl (jsc#SLE-23748) and timezone (bsc#1201537)
+- Add zypper explicitly to work around obs-build bug
+  (gh#openSUSE/obs-build#562)
+- Add org.opencontainers.image.source label
+- Clean /var/log and /var/cache/zypp
+- Remove /var/log/lastlog to avoid container size explosion
+
+-------------------------------------------------------------------
+Fri Sep  2 12:30:20 UTC 2022 - Lubos Kocman <lubos.kocman@suse.com>
+
+- Bump to 15.5 
+
+-------------------------------------------------------------------
 Tue Oct 19 08:31:04 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 
 - Add patterns-base-fips to work also in FIPS environments (bsc#1183154)

Places

File project.diff of Package opensuse-leap-image

Places