diff --git a/init-image/Dockerfile b/init-image/Dockerfile index 28bd4fab7..46e024346 100644 --- a/init-image/Dockerfile +++ b/init-image/Dockerfile @@ -21,7 +21,10 @@ #!BuildVersion: 15.5 FROM bci/bci-base:15.5 -RUN set -euo pipefail; zypper -n in --no-recommends systemd gzip sles-release; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends systemd gzip sles-release; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.bci.init diff --git a/init-image/init-image.changes b/init-image/init-image.changes index 0f32c4bf6..bb90e3ff2 100644 --- a/init-image/init-image.changes +++ b/init-image/init-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:38:08 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:17:45 UTC 2024 - Dirk Mueller diff --git a/nodejs-18-image/Dockerfile b/nodejs-18-image/Dockerfile index abbf44836..07d352d8b 100644 --- a/nodejs-18-image/Dockerfile +++ b/nodejs-18-image/Dockerfile @@ -25,7 +25,10 @@ #!BuildVersion: 15.5.18 FROM bci/bci-base:15.5 -RUN set -euo pipefail; zypper -n in --no-recommends nodejs18 npm18 update-alternatives curl findutils gawk git-core procps; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends nodejs18 npm18 update-alternatives curl findutils gawk git-core procps; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.bci.nodejs diff --git a/nodejs-18-image/nodejs-18-image.changes b/nodejs-18-image/nodejs-18-image.changes index d73522cf6..db4275530 100644 --- a/nodejs-18-image/nodejs-18-image.changes +++ b/nodejs-18-image/nodejs-18-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:38:08 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:17:45 UTC 2024 - Dirk Mueller diff --git a/openjdk-11-devel-image/Dockerfile b/openjdk-11-devel-image/Dockerfile index a75d7bc83..9a0c352e0 100644 --- a/openjdk-11-devel-image/Dockerfile +++ b/openjdk-11-devel-image/Dockerfile @@ -21,7 +21,10 @@ #!BuildVersion: 15.5.11 FROM bci/openjdk:11 -RUN set -euo pipefail; zypper -n in --no-recommends java-11-openjdk-devel maven; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends java-11-openjdk-devel maven; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.bci.openjdk.devel diff --git a/openjdk-11-devel-image/openjdk-11-devel-image.changes b/openjdk-11-devel-image/openjdk-11-devel-image.changes index 56c3ca27d..42465944d 100644 --- a/openjdk-11-devel-image/openjdk-11-devel-image.changes +++ b/openjdk-11-devel-image/openjdk-11-devel-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:38:08 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:17:45 UTC 2024 - Dirk Mueller diff --git a/openjdk-11-image/Dockerfile b/openjdk-11-image/Dockerfile index d82c39b95..abe4f8185 100644 --- a/openjdk-11-image/Dockerfile +++ b/openjdk-11-image/Dockerfile @@ -21,7 +21,10 @@ #!BuildVersion: 15.5.11 FROM bci/bci-base:15.5 -RUN set -euo pipefail; zypper -n in --no-recommends java-11-openjdk curl findutils gawk git-core procps; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends java-11-openjdk curl findutils gawk git-core procps; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.bci.openjdk diff --git a/openjdk-11-image/openjdk-11-image.changes b/openjdk-11-image/openjdk-11-image.changes index 7d00dfbc4..e1ff9d5d0 100644 --- a/openjdk-11-image/openjdk-11-image.changes +++ b/openjdk-11-image/openjdk-11-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:38:08 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:17:45 UTC 2024 - Dirk Mueller diff --git a/openjdk-17-devel-image/Dockerfile b/openjdk-17-devel-image/Dockerfile index 5078d8c2a..a4a161a54 100644 --- a/openjdk-17-devel-image/Dockerfile +++ b/openjdk-17-devel-image/Dockerfile @@ -21,7 +21,10 @@ #!BuildVersion: 15.5.17 FROM bci/openjdk:17 -RUN set -euo pipefail; zypper -n in --no-recommends java-17-openjdk-devel maven; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends java-17-openjdk-devel maven; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.bci.openjdk.devel diff --git a/openjdk-17-devel-image/openjdk-17-devel-image.changes b/openjdk-17-devel-image/openjdk-17-devel-image.changes index 7e09b07e2..595dc7541 100644 --- a/openjdk-17-devel-image/openjdk-17-devel-image.changes +++ b/openjdk-17-devel-image/openjdk-17-devel-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:38:08 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:17:45 UTC 2024 - Dirk Mueller diff --git a/openjdk-17-image/Dockerfile b/openjdk-17-image/Dockerfile index 0287e6e5a..2a68377a4 100644 --- a/openjdk-17-image/Dockerfile +++ b/openjdk-17-image/Dockerfile @@ -21,7 +21,10 @@ #!BuildVersion: 15.5.17 FROM bci/bci-base:15.5 -RUN set -euo pipefail; zypper -n in --no-recommends java-17-openjdk curl findutils gawk git-core procps; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends java-17-openjdk curl findutils gawk git-core procps; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.bci.openjdk diff --git a/openjdk-17-image/openjdk-17-image.changes b/openjdk-17-image/openjdk-17-image.changes index 493efdf5c..184d6eb4b 100644 --- a/openjdk-17-image/openjdk-17-image.changes +++ b/openjdk-17-image/openjdk-17-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:38:08 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:17:45 UTC 2024 - Dirk Mueller diff --git a/postgres-15-image/Dockerfile b/postgres-15-image/Dockerfile index 4d18efe69..243faa802 100644 --- a/postgres-15-image/Dockerfile +++ b/postgres-15-image/Dockerfile @@ -23,7 +23,10 @@ #!BuildVersion: 15.5.15 FROM suse/sle15:15.5 -RUN set -euo pipefail; zypper -n in --no-recommends libpq5 postgresql15-server findutils; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends libpq5 postgresql15-server findutils; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.application.postgres diff --git a/postgres-15-image/postgres-15-image.changes b/postgres-15-image/postgres-15-image.changes index 2c261eea9..b7e70f16d 100644 --- a/postgres-15-image/postgres-15-image.changes +++ b/postgres-15-image/postgres-15-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:38:08 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:17:45 UTC 2024 - Dirk Mueller diff --git a/sle15-kernel-module-devel-image/Dockerfile b/sle15-kernel-module-devel-image/Dockerfile index c7b846d72..2ef85e787 100644 --- a/sle15-kernel-module-devel-image/Dockerfile +++ b/sle15-kernel-module-devel-image/Dockerfile @@ -21,7 +21,10 @@ #!BuildVersion: 15.5 FROM bci/bci-base:15.5 -RUN set -euo pipefail; zypper -n in --no-recommends kernel-devel kernel-syms gcc kmod make patch gawk rpm-build sles-release; zypper -n clean; rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} +RUN set -euo pipefail; \ + zypper -n install --no-recommends kernel-devel kernel-syms gcc kmod make patch gawk rpm-build sles-release; \ + zypper -n clean; \ + rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.bci.sle15-kernel-module-devel diff --git a/sle15-kernel-module-devel-image/sle15-kernel-module-devel-image.changes b/sle15-kernel-module-devel-image/sle15-kernel-module-devel-image.changes index 4c0c509f5..d45756f72 100644 --- a/sle15-kernel-module-devel-image/sle15-kernel-module-devel-image.changes +++ b/sle15-kernel-module-devel-image/sle15-kernel-module-devel-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 17:38:08 UTC 2024 - Dirk Mueller + +- rerender installation step in multiple lines, allow uninstalling optional packages + ------------------------------------------------------------------- Wed Sep 25 17:17:45 UTC 2024 - Dirk Mueller