List of commits:
Subject Hash Author Date (UTC)
Install dependencies before trying to build the rpm 4df3dbf7e1f79b0c616d8dbeba8b1b30c9474f17 Catalin(ux) M. BOIE 2021-10-21 16:49:37
duilder fixes 2afa9250c1da72997092847df5a2a18cddb8ccb9 Catalin(ux) M. BOIE 2021-10-21 15:59:24
worker: move dependencies path 2e8902609a2d94e2eba5fb8ccda85de90ae23fb5 Catalin(ux) M. BOIE 2021-10-21 15:22:25
Lots of changes, too hard to split them; sorry about it 77c26d9ce82d452ebdc1b609d71c5e931768805c Catalin(ux) M. BOIE 2021-10-21 06:05:51
Lots of changes to the rg daemons 8b68e3967f650953d368dfb5ca5cdd2927e9c0de Catalin(ux) M. BOIE 2021-10-21 06:05:03
Hooks: Mostly cosmetic 3633af7d937f7c9c7c0c33cdc3ad9897aab8becd Catalin(ux) M. BOIE 2021-10-21 06:04:02
Added RGFS for packages e0573aadcff81694d38ee448326964bddf0c3c13 Catalin(ux) M. BOIE 2021-10-21 06:02:37
Container changes cb3c4a84e2abc3a4b206925b60fdf4524e0379de Catalin(ux) M. BOIE 2021-10-21 06:01:25
Lots of html/css changes bde37682fac058f68806b3342ba043a2f72458ba Catalin(ux) M. BOIE 2021-10-21 06:00:29
Lots of tests updated 40e01f4db4d341d4e2dceb4407ea7d6ff523ac9e Catalin(ux) M. BOIE 2021-10-21 06:00:02
Big changes to add rpm packages repositories 5e07ff440d6ad7f0ef9900a634b2f39f0e7fa1e4 Catalin(ux) M. BOIE 2021-10-21 05:59:26
Cosmetic 02376344f7d7d321d824ab7978de2ad49c007167 Catalin(ux) M. BOIE 2021-05-23 12:57:06
Added FIDO2 support for SSH 04186abe13896ad4f4ea7126691d0a2b1798de1a Catalin(ux) M. BOIE 2021-05-23 12:30:43
ssh: show the id of the key both on web and when connecting ab95ccfa2819d6ac9f427209ee61c75aad8a3661 Catalin(ux) M. BOIE 2021-05-23 10:52:44
Some events are doing some queries, and we need to cover them in transaction, not only the subevents 4768ffec303961971cc0c3732a24e858f47dd381 Catalin(ux) M. BOIE 2020-12-15 07:33:36
Added rate limit for ssh and git connections b667130e6c5721a3d30193863a5defd8bbff50f1 Catalin(ux) M. BOIE 2020-11-30 10:49:27
cosmetic abe44edadda9da7c639b7bd8c9e13e6058555669 Catalin(ux) M. BOIE 2020-11-30 10:21:01
gpg functions and test ecb9e05c99a2b73edfba5014329e362d8c6e9246 Catalin(ux) M. BOIE 2020-11-09 07:38:11
Stats page is not rendered for bots. 29ca3f62ac460b64eb0a10fbb8bdfdf4a1767dc5 Catalin(ux) M. BOIE 2020-10-13 05:48:43
Added rate limit options 60e939a52577a01603f9f386ffaf1a9712f99ab6 Catalin(ux) M. BOIE 2020-10-07 05:02:25
Commit 4df3dbf7e1f79b0c616d8dbeba8b1b30c9474f17 - Install dependencies before trying to build the rpm
Author: Catalin(ux) M. BOIE
Author date (UTC): 2021-10-21 16:49
Committer name: Catalin(ux) M. BOIE
Committer date (UTC): 2021-10-21 16:49
Parent(s): 2afa9250c1da72997092847df5a2a18cddb8ccb9
Signer:
Signing key:
Signing status: N
Tree: 270d3da9a75fba07eb663bf966342daae120b3f6
File Lines added Lines deleted
scripts/worker.php 22 16
File scripts/worker.php changed (mode: 100644) (index 6732642..9839920)
... ... function start_worker_build_tools($job, &$reason, &$reason2)
583 583 . '{' . "\n" . '{' . "\n"
584 584 . ' local dir=${1}; shift' . "\n" . ' local dir=${1}; shift' . "\n"
585 585 . "\n" . "\n"
586 . ' rg_log_push "rg_build_dotrepo dir=${dir} [`date`]"' . "\n"
586 . ' rg_log_push "rg_build_dotrepo dir=${dir}"' . "\n"
587 587 . ' while [ 1 ]; do' . "\n" . ' while [ 1 ]; do' . "\n"
588 588 . ' rg_extract_rpm_info "${dir}" || break' . "\n" . ' rg_extract_rpm_info "${dir}" || break' . "\n"
589 589 . ' local dst_tar_gz="/mnt/rpmbuild/SOURCES/${spec_name}-${spec_ver}.tar.gz"' . "\n" . ' local dst_tar_gz="/mnt/rpmbuild/SOURCES/${spec_name}-${spec_ver}.tar.gz"' . "\n"
 
... ... function start_worker_build_tools($job, &$reason, &$reason2)
610 610 . '{' . "\n" . '{' . "\n"
611 611 . ' local dir=${1}; shift' . "\n" . ' local dir=${1}; shift' . "\n"
612 612 . "\n" . "\n"
613 . ' rg_log_push "rg_build_rpm: dir=${dir} [`date`]"' . "\n"
613 . ' rg_log_push "rg_build_rpm: dir=${dir}"' . "\n"
614 614 . ' while [ 1 ]; do' . "\n" . ' while [ 1 ]; do' . "\n"
615 615 . ' rg_extract_rpm_info "${dir}" || break' . "\n" . ' rg_extract_rpm_info "${dir}" || break' . "\n"
616 616 . ' local dst_tar_gz="/mnt/rpmbuild/SOURCES/${repo_username}+${spec_name}-${spec_ver}.tar.gz"' . "\n" . ' local dst_tar_gz="/mnt/rpmbuild/SOURCES/${repo_username}+${spec_name}-${spec_ver}.tar.gz"' . "\n"
 
... ... function start_worker($job)
1444 1444 . 'else' . "\n" . 'else' . "\n"
1445 1445 . ' iptables -I OUTPUT -m owner --uid-owner build -j REJECT' . "\n" . ' iptables -I OUTPUT -m owner --uid-owner build -j REJECT' . "\n"
1446 1446 . ' if [ "${?}" != "0" ]; then' . "\n" . ' if [ "${?}" != "0" ]; then' . "\n"
1447 . ' ERR="Cannot disable network access"' . "\n"
1447 . ' ERR="Cannot disable network access for build user"' . "\n"
1448 . ' fi' . "\n"
1449 . ' iptables -I OUTPUT -m owner --uid-owner build2 -j REJECT' . "\n"
1450 . ' if [ "${?}" != "0" ]; then' . "\n"
1451 . ' ERR="Cannot disable network access for build2 user"' . "\n"
1448 1452 . ' fi' . "\n" . ' fi' . "\n"
1449 1453 . 'fi' . "\n" . 'fi' . "\n"
1450 1454 . "\n" . "\n"
1451 1455 . 'while [ "${ERR}" = "" ]; do' . "\n" . 'while [ "${ERR}" = "" ]; do' . "\n"
1452 1456 . ' su - build -c "bash /mnt/build.sh" &>/mnt/status/build.log' . "\n" . ' su - build -c "bash /mnt/build.sh" &>/mnt/status/build.log' . "\n"
1453 . ' date +%s > /mnt/T_RPMS_START' . "\n"
1454 . ' su - build -c "bash /mnt/build_rpms.sh" &>/mnt/status/build_rpms.log' . "\n"
1455 . ' E=${?}' . "\n"
1456 . ' date +%s > /mnt/T_RPMS_END' . "\n"
1457 . ' if [ "${E}" != "0" ]; then' . "\n"
1458 . ' ERR=$(< ~/rg_op.err)' . "\n"
1459 . ' break' . "\n"
1460 . ' fi' . "\n"
1461 . "\n"
1457 . "\n"
1458 . ' # Now we may have the .spec file, we can try to extract info' . "\n"
1462 1459 . ' _deps=`cat /mnt/tmp/_deps 2>/dev/null`' . "\n" . ' _deps=`cat /mnt/tmp/_deps 2>/dev/null`' . "\n"
1463 1460 . ' if [ "${_deps}" != "" ]; then' . "\n" . ' if [ "${_deps}" != "" ]; then' . "\n"
1464 1461 . ' echo; echo "`date`: Installing dependencies [${_deps}]"' . "\n" . ' echo; echo "`date`: Installing dependencies [${_deps}]"' . "\n"
 
... ... function start_worker($job)
1470 1467 . ' break' . "\n" . ' break' . "\n"
1471 1468 . ' fi' . "\n" . ' fi' . "\n"
1472 1469 . ' fi' . "\n" . ' fi' . "\n"
1473 . "\n"
1470 . "\n"
1471 . ' date +%s > /mnt/T_RPMS_START' . "\n"
1472 . ' su - build -c "bash /mnt/build_rpms.sh" &>/mnt/status/build_rpms.log' . "\n"
1473 . ' E=${?}' . "\n"
1474 . ' date +%s > /mnt/T_RPMS_END' . "\n"
1475 . ' if [ "${E}" != "0" ]; then' . "\n"
1476 . ' ERR=$(< ~/rg_op.err)' . "\n"
1477 . ' break' . "\n"
1478 . ' fi' . "\n"
1479 . "\n"
1474 1480 . ' rm -f ~/rg_op.err # it was owned by build user till now' . "\n" . ' rm -f ~/rg_op.err # it was owned by build user till now' . "\n"
1475 1481 . ' # Moving everything to build2 dir. TODO: Why?' . "\n" . ' # Moving everything to build2 dir. TODO: Why?' . "\n"
1476 . ' mv /mnt/target/rocketgit /mnt/build2' . "\n"
1482 . ' mv -f /mnt/target/rocketgit /mnt/build2' . "\n"
1477 1483 . ' chown -R build2:build2 /mnt/build2 /mnt/rpmbuild' . "\n" . ' chown -R build2:build2 /mnt/build2 /mnt/rpmbuild' . "\n"
1478 1484 . "\n" . "\n"
1479 1485 . ' echo; echo "`date`: Running build_rgfs.sh script"' . "\n" . ' echo; echo "`date`: Running build_rgfs.sh script"' . "\n"
 
... ... function start_worker($job)
1481 1487 . ' if [ "${?}" != "0" ]; then' . "\n" . ' if [ "${?}" != "0" ]; then' . "\n"
1482 1488 . ' echo "error building rgfs; trying to continue"' . "\n" . ' echo "error building rgfs; trying to continue"' . "\n"
1483 1489 . ' fi' . "\n" . ' fi' . "\n"
1484 . "\n"
1490 . "\n"
1485 1491 . ' if [ -r /mnt/build_repo.sh ]; then' . "\n" . ' if [ -r /mnt/build_repo.sh ]; then' . "\n"
1486 1492 . ' echo; echo "`date`: Running build_repo.sh script"' . "\n" . ' echo; echo "`date`: Running build_repo.sh script"' . "\n"
1487 1493 . ' date +%s > /mnt/T_REPO_START' . "\n" . ' date +%s > /mnt/T_REPO_START' . "\n"
 
... ... function start_worker($job)
1493 1499 . ' break' . "\n" . ' break' . "\n"
1494 1500 . ' fi' . "\n" . ' fi' . "\n"
1495 1501 . ' fi' . "\n" . ' fi' . "\n"
1496 . "\n"
1502 . "\n"
1497 1503 . ' break' . "\n" . ' break' . "\n"
1498 1504 . 'done' . "\n" . 'done' . "\n"
1499 1505 . 'if [ "${ERR}" != "" ]; then' . "\n" . 'if [ "${ERR}" != "" ]; then' . "\n"
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/catalinux/rocketgit

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit

Clone this repository using git:
git clone git://git.rocketgit.com/user/catalinux/rocketgit

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main