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

- Move lib to top dir and remove usr,

Browse Source 
- Update mk_base_image to use urpmi-setup-dump.cgi,
- Now support rx3-base 1.1.2.
This commit is contained in:
Arnaud G. GIBERT
2026-04-16 19:18:46 +02:00
parent 8839a9baf6
commit 9cce50b55f
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ReleaseNotes.txt
View File

@@ -1,3 +1,13 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Docker Tools V 1.5.2 - A. GIBERT - 2026/04/xx
------------------------------------------------------------------------------------------------------------------------------------
- Move lib to top dir and remove usr,
- Update mk_base_image to use urpmi-setup-dump.cgi,
- Now support rx3-base 1.1.2.
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Docker Tools V 1.5.1 - A. GIBERT - 2026/04/10 Rx3-Docker/Docker Tools V 1.5.1 - A. GIBERT - 2026/04/10
------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------

8
SPECS/docker_tools.spec
View File

@@ -24,7 +24,7 @@
%define name docker_tools %define name docker_tools
%define version 1.5.1 %define version 1.5.2
%define release %mkrel 1rx3 %define release %mkrel 1rx3
%global debug_package %{nil} %global debug_package %{nil}
@@ -116,7 +116,7 @@ cp etc/bash_completion.d/* %{buildroot}%{_sysconfdir}/bash_completi
# Lib # Lib
%{__mkdir_p} %{buildroot}%{_prefix}/lib/rx3 %{__mkdir_p} %{buildroot}%{_prefix}/lib/rx3
cp usr/lib/rx3/*.bash %{buildroot}%{_prefix}/lib/rx3 cp lib/rx3/*.bash %{buildroot}%{_prefix}/lib/rx3
# Bin # Bin
%{__mkdir_p} %{buildroot}%{_sbindir} %{__mkdir_p} %{buildroot}%{_sbindir}
@@ -174,6 +174,10 @@ cp sbin/* %{buildroot}%{_sbindir}
#----------------------------------------------------------------------------------------------------------------------------------- #-----------------------------------------------------------------------------------------------------------------------------------
%changelog %changelog
* Thu Apr 16 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.2-1rx3.mga9
- Update to 1.5.2
- move lib to top dir
* Fri Apr 10 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.1-1rx3.mga9 * Fri Apr 10 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.5.1-1rx3.mga9
- Update to 1.5.1 - Update to 1.5.1

0
usr/lib/rx3/docker_tools.bash → lib/rx3/docker_tools.bash
View File

6
sbin/mk_base_image
View File

@@ -116,7 +116,8 @@ function mbi_args_parse()
# Note the quotes around `$tmp_args': they are essential! # Note the quotes around `$tmp_args': they are essential!
eval set -- "${tmp_args}" eval set -- "${tmp_args}"
while true ; do while true
do
case "$1" in case "$1" in
# Options # Options
@@ -246,7 +247,7 @@ function mbi_env_init()
echo_error "Making Builder..." echo_error "Making Builder..."
cmd_exec cp /etc/resolv.conf "${BUILDER_DIR}/etc/resolv.conf" cmd_exec cp /etc/resolv.conf "${BUILDER_DIR}/etc/resolv.conf"
cmd_exec chroot "${BUILDER_DIR}" bash -c 'curl -L http://mirror.rx3.net/rx3/sbin/urpmi-setup-'${DISTRIB}' | bash' cmd_exec chroot "${BUILDER_DIR}" bash -c 'curl -L http://mirror.rx3.net/rx3/cgi-bin/urpmi-setup-dump.cgi?'${DISTRIB}' | bash'
cmd_exec chroot "${BUILDER_DIR}" urpmi --force rx3-base cmd_exec chroot "${BUILDER_DIR}" urpmi --force rx3-base
fi fi
fi fi
@@ -350,7 +351,6 @@ function mbi_base_install_post()
{ {
cmd_exec chroot ${ROOT_DIR} urpmi-setup --verbose --distrib "${DISTRIB}" cmd_exec chroot ${ROOT_DIR} urpmi-setup --verbose --distrib "${DISTRIB}"
# cmd_exec chroot ${ROOT_DIR} bash -c 'curl -L http://mirror.rx3.net/rx3/sbin/urpmi-setup-'${DISTRIB}' | bash'
cmd_exec chroot ${ROOT_DIR} urpmi --force --auto-update cmd_exec chroot ${ROOT_DIR} urpmi --force --auto-update