Rx3-Docker/docker_tools
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

- Fix greedy locales stripping bug in mk_base_image.

Browse Source
This commit is contained in:
Arnaud G. GIBERT
2026-05-30 10:26:12 +02:00
parent c5e6d07bc2
commit 89ec509f92
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReleaseNotes.txt
View File

@@ -1,9 +1,10 @@
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Docker Tools V 1.5.2 - A. GIBERT - 2026/05/28 Rx3-Docker/Docker Tools V 1.5.2 - A. GIBERT - 2026/05/30
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
- Move lib to top dir and remove usr, - Move lib to top dir and remove usr,
- Update mk_base_image to use urpmi-setup-dump.cgi, - Update mk_base_image to use urpmi-setup-dump.cgi,
- Fix greedy locales stripping bug in mk_base_image,
- Fix double / bug in docker_tools_install, - Fix double / bug in docker_tools_install,
- Add docker_mk_env default global variables, - Add docker_mk_env default global variables,
- Now support rx3-base 1.1.2. - Now support rx3-base 1.1.2.

2
SPECS/docker_tools.spec
View File

@@ -184,7 +184,7 @@ cp sbin/* %{buildroot}%{_sbindir}
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
%changelog %changelog
* Thu May 28 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.2-1rx3.mga9 * Sat May 30 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.2-1rx3.mga9
- Update to 1.5.2 - Update to 1.5.2
- move lib to top dir - move lib to top dir

10
sbin/mk_base_image
View File

@@ -371,15 +371,15 @@ function mbi_base_install_post()
function mbi_base_strip() function mbi_base_strip()
{ {
# RPM force uninstall # RPM force uninstall
cmd_exec chroot ${ROOT_DIR} rpm -e --nodeps cracklib-dicts cmd_exec chroot ${ROOT_DIR} rpm -e --nodeps cracklib-dicts || true
cmd_exec chroot ${ROOT_DIR} rpm -e dhcp-common dhcp-client cronie-anacron cmd_exec chroot ${ROOT_DIR} rpm -e dhcp-common dhcp-client cronie-anacron || true
# Docker mounts tmpfs at /dev and procfs at /proc so we can remove them # Docker mounts tmpfs at /dev and procfs at /proc so we can remove them
cmd_exec rm -rf "${ROOT_DIR}"/dev "${ROOT_DIR}"/proc 2>/dev/null cmd_exec rm -rf "${ROOT_DIR}"/dev "${ROOT_DIR}"/proc 2>/dev/null || true
cmd_exec mkdir -p "${ROOT_DIR}"/dev "${ROOT_DIR}"/proc 2>/dev/null cmd_exec mkdir -p "${ROOT_DIR}"/dev "${ROOT_DIR}"/proc 2>/dev/null || true
# Keep only en_US.UTF8 locale # Keep only en_US.UTF8 locale
cmd_exec rm -rf "${ROOT_DIR}"/usr/share/locale/!("en_US.UTF-8"|"locale.alias"|"locale-archive") cmd_exec rm -rf "${ROOT_DIR}"/usr/share/locale/!("UTF-8"|"C.UTF-8"|"en_US.UTF-8"|"en"|"locale.alias"|"locale-archive")
cmd_exec rm -rf "${ROOT_DIR}"/usr/{{lib,lib64}/gconv,bin/localedef,sbin/build-locale-archive} cmd_exec rm -rf "${ROOT_DIR}"/usr/{{lib,lib64}/gconv,bin/localedef,sbin/build-locale-archive}