Sync from SUSE:SLFO:Main cockpit-podman revision c798d1fbe41e3dd12d72ace79643e9ad

This commit is contained in:
Adrian Schröter 2024-11-12 15:39:02 +01:00
parent 704b98a999
commit 566a37af2a
5 changed files with 35 additions and 0 deletions

4
_scmsync.obsinfo Normal file
View File

@ -0,0 +1,4 @@
mtime: 1730813965
commit: cad7a00b2d063e504b2379004fa346cf304e0f644342501396b2e7ef4b6c2064
url: https://src.opensuse.org/cockpit/cockpit-podman.git
revision: cad7a00b2d063e504b2379004fa346cf304e0f644342501396b2e7ef4b6c2064

BIN
build.specials.obscpio (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Nov 5 13:02:39 UTC 2024 - Alice Brooks <alice.brooks@suse.com>
- correct-container-search.patch: Fixes issues searching containers
bsc#1232687
-------------------------------------------------------------------
Fri Aug 9 17:49:45 UTC 2024 - Herbert Graeber <herbert@graeber-clan.de>
- Fix systemd units folder for leap and sle (Similar issue like boo#1226541)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 31 12:42:45 UTC 2024 - Adam Majer <adam.majer@suse.de> Wed Jul 31 12:42:45 UTC 2024 - Adam Majer <adam.majer@suse.de>

View File

@ -28,6 +28,7 @@ Source11: node_modules.spec.inc
Source12: update_version.sh Source12: update_version.sh
%include %_sourcedir/node_modules.spec.inc %include %_sourcedir/node_modules.spec.inc
Patch10: load-css-overrides.patch Patch10: load-css-overrides.patch
Patch11: correct-container-search.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: appstream-glib BuildRequires: appstream-glib
Requires: cockpit-bridge >= 138 Requires: cockpit-bridge >= 138
@ -37,6 +38,7 @@ Requires: podman >= 2.0.4
BuildRequires: cockpit-devel >= 298 BuildRequires: cockpit-devel >= 298
BuildRequires: local-npm-registry BuildRequires: local-npm-registry
BuildRequires: sassc BuildRequires: sassc
BuildRequires: sed
%description %description
Cockpit component for managing Podman containers Cockpit component for managing Podman containers
@ -59,6 +61,10 @@ export PREFIX=%{_prefix}
%make_install %make_install
appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
%if 0%{?suse_version} == 1500
sed -i -e 's#"/lib/systemd/system#"%{_unitdir}#' %{buildroot}%{_datadir}/cockpit/podman/manifest.json
%endif
%files %files
%doc README.md %doc README.md
%license LICENSE %license LICENSE

View File

@ -0,0 +1,11 @@
--- a/src/ImageRunModal.jsx
+++ b/src/ImageRunModal.jsx
@@ -516,7 +516,7 @@ export class ImageRunModal extends React.Component {
}
// Strip out all non-allowed container image characters when filtering.
- let regexString = searchText.replace(/[^\w_.:-]/g, "");
+ let regexString = searchText.replace(/[^/\w_.:-]/g, "");
// Strip image registry option if set for comparing results for docker.io searching for docker.io/fedora
// returns docker.io/$username/fedora for example.
if (regexString.includes('/')) {