Merge branch '145-build-system-rewrite' into fradrive/merge-rewrite-jost

2025-02-20 16:41:02 +01:00 · 2025-02-20 16:41:02 +01:00 · bf4a79a8ec
commit bf4a79a8ec
parent d46fb9e928 8198559a94
5 changed files with 101 additions and 161 deletions
--- a/.gitlab-ci/version.pl
+++ b/.gitlab-ci/version.pl
@ -6,8 +6,11 @@ use warnings;
 use Data::Dumper;

 # Version changes:
-#  v[x].[y].[z] -- Main version number
-#  v[x].[y].[z]-test-[branchstring]-num -- test/branch/devel version number
+#  [x].[y].[z] -- Main version number
+# XXX old
+#  [x].[y].[z]-test-[branchstring]-[num] -- test/branch/devel version number
+# XXX new
+#  [x].[y].[z]-[num]+[branchname]
 #  on main/master: Biggest version so far, increment by occuring changes
 #  on other branches: find version; be it branch string, old format or main version number;
 #    increments from there. Increment version number, but on global conflict use new version number
@ -133,8 +136,10 @@ if($par{'h'}) {
  exit 0
 }

+my $branchNameEscaped = `$par{vcsbranch}`;
+chomp $branchNameEscaped;
 if($par{autokind}) {
-  my $branch = `$par{vcsbranch}`;
+  my $branch = $branchNameEscaped;
  my @rules = split /,/, $par{autokind};
  RULES: {
    for my $r(@rules) {
@ -150,7 +155,7 @@ if($par{autokind}) {
    warn "$0: No autokind rule matches; leaving the kind unchanged.\n"
  }
 }
-
+$branchNameEscaped =~ s/[^0-9a-zA-Z]+/-/g;

 if($par{'v'}) {
  print "VERBOSE: Parameters\n";
@ -224,33 +229,17 @@ sub parseVersion {
    warn "$0: internal error (parseVersion called on undef at $c)\n";
    return undef
  }
-  my ($pre,$ma,$mi,$p,$sp,$brn,$brv) = ();
-  if($v=~m#^([a-z]*)([0-9]+)$#) {
-    $pre = $1;
-    $ma = $2;
-  } elsif($v=~m#^([a-z]*)([0-9]+)\.([0-9]+)$#) {
-    $pre = $1;
-    $ma = $2;
-    $mi = $3
-  } elsif($v=~m#^([a-z]*)([0-9]+)\.([0-9]+)\.([0-9]+)$#) {
-    $pre = $1;
-    $ma = $2;
-    $mi = $3;
-    $p = $4;
-  } elsif($v=~m#^([a-z]*)([0-9]+)\.([0-9]+)\.([0-9]+)-test-([a-z]+)-([0-9\.]+)$#) {
-    $pre = $1;
-    $ma = $2;
-    $mi = $3;
-    $p = $4;
-    $sp = $5;
-    $brn = $6;
-    $brv = $7;
-  } elsif($v=~m#^([a-z]*)([0-9]+)\.([0-9]+)\.([0-9]+)-(.*)$#) {
-    $pre = $1;
-    $ma = $2;
-    $mi = $3;
-    $p = $4;
-    $sp = $5;
+  my %cap = ();
+  if(
+    $v=~m#^(?<pre>[a-z]*)(?<ma>[0-9]+)$# ||
+    $v=~m#^(?<pre>[a-z]*)(?<ma>[0-9]+)\.(?<mi>[0-9]+)$# ||
+    $v=~m#^(?<pre>[a-z]*)(?<ma>[0-9]+)\.(?<mi>[0-9]+)\.(?<p>[0-9]+)$# ||
+    $v=~m#^(?<pre>[a-z]*)(?<ma>[0-9]+)\.(?<mi>[0-9]+)\.(?<p>[0-9]+)-test-(?<sp>(?<brn>[a-z]+)-?(?<brv>[0-9\.]+))$# ||
+    $v=~m#^(?<pre>[a-z]*)(?<ma>[0-9]+)\.(?<mi>[0-9]+)\.(?<p>[0-9]+)-(?<sp>(?<brv>[0-9\.]+)\+(?<brn>[0-9A-Za-z\-]+))$# || # [x].[y].[z]-[num]+[branchname]
+    $v=~m#^(?<pre>[a-z]*)(?<ma>[0-9]+)\.(?<mi>[0-9]+)\.(?<p>[0-9]+)-(?<sp>.*)$#
+  ) {
+    %cap = %+
+#  my ($pre,$ma,$mi,$p,$sp,$brn,$brv) = ();
  } else {
    warn "$0: unexpected old version number: $v\n" if $par{v};
    return undef
@ -298,7 +287,7 @@ sub vsCompare {
  #for($v, $w) {
  #  $_ = parseVersion($_) unless ref $_;
  #}
-  if('v' eq $v->{prefix} and 'v' eq $w->{prefix}) {
+  if($v->{prefix}=~m/^v?$/ and $w->{prefix}=~m/^v?$/) {
    return(
      ($v->{major} // 0) <=> ($w->{major} // 0) ||
      ($v->{minor} // 0) <=> ($w->{minor} // 0) ||
@ -307,9 +296,9 @@ sub vsCompare {
      ($v->{branchversion} // '') <=> ($w->{branchversion} // '') ||
      ($v->{subpatch} // '') cmp ($w->{subpatch} // '')
    )
-  } elsif('v' eq $v->{prefix} and 'v' ne $w->{prefix}) {
+  } elsif($v->{prefix}=~m/^v?$/ and !$w->{prefix}=~m/^v?$/) {
    return 1;
-  } elsif('v' ne $v->{prefix} and 'v' eq $w->{prefix}) {
+  } elsif(!$v->{prefix}=~m/^v?$/ and $w->{prefix}=~m/^v?$/) {
    return -1;
  } else {
    return vsStringDebug($v) cmp vsStringDebug($w) 
@ -349,13 +338,21 @@ sub vsJustVersion {

 sub vsTestVersion {
  my $v = shift;
+  # [x].[y].[z]-[num]+[branchname]
  my $ret =
-  'v' .
  ($v->{major} // 0) . "." .
  ($v->{minor} // 0) . "." .
-  ($v->{patch} // 0) . "-test-" .
-  ($v->{branchname} // 'a') .
-  ($v->{branchversion} // '0.0.0');
+  ($v->{patch} // 0) . "-" .
+  ($v->{branchversion} // '0.0.0') . "+" .
+  $branchNameEscaped;
+  # old version format
+  #my $ret =
+  #'v' .
+  #($v->{major} // 0) . "." .
+  #($v->{minor} // 0) . "." .
+  #($v->{patch} // 0) . "-test-" .
+  #($v->{branchname} // 'a') .
+  #($v->{branchversion} // '0.0.0');
  return $ret
 }

@ -393,8 +390,9 @@ VERSION: for my $v(@versions) {
  #  $tag=$1;
  #  last VERSION
  #}
-  if($v->{meta}=~m#tag\s*:\s*([vtd]b?[0-9\.]+(?:-.*)?)\)#) {
+  if($v->{meta}=~m#tag\s*:\s*((?:[vtd]|db|)[0-9\.]+(?:[a-zA-Z\-\+0-9\.]*)?)[\),]#) {
    $v->{version} = $1;
+    warn "$0: Found version number in log: '$v->{version}'\n" if $par{v};
    push @versionPast, $v->{version}
  }
  next if $v->{subject}=~m#^\s*(?:Merge (?:branch|remote)|Revert )#;
@ -451,8 +449,11 @@ for my $r(reverse @change) {

 my @allVersions = split /\n/, `$par{vcstags}`;

-my @sortAll = sort {vsCompare($b, $a)} @allVersions;
-my @sortSee = sort {vsCompare($b, $a)} @versionPast;
+#my @sortAll = sort {vsCompare($b, $a)} @allVersions;
+#my @sortSee = sort {vsCompare($b, $a)} @versionPast;
+# we want the latest version and do not sort
+my @sortAll = @allVersions;
+my @sortSee = @versionPast;
 #print "all: $sortAll[0] -- see: $sortSee[0]\n";
 #
 #print vsString($tag), "\n";
@ -483,7 +484,7 @@ sub justVersionInc {
 my $newVersion = undef;

 if($mainVersion) {
-  $newVersion = "v" . justVersionInc($highStart, \%reactCollect);
+  $newVersion = justVersionInc($highStart, \%reactCollect);
 } else {
  my $v = parseVersion($highStart);
  if(exists $v->{branchname}) {
@ -589,7 +590,7 @@ if($par{changelog}) {
  my $preVersion = '';
  if(defined $sects[0] and defined $sects[0][0] and $sects[0][0]=~m/^##\s*\[([^\]\[]+)\]\(/) {
    $preVersion = $1;
-    $preVersion =~ s#^v?#v#;
+    # $preVersion =~ s#^v?#v#;
  }
  my $today = do {
    my @time = localtime;
@ -618,11 +619,3 @@ All notable changes to this project will be documented in this file. See [standa



-
-
-
-
-
-
-
-
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,20 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+## [v27.4.59-test-g0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.17...v27.4.59-test-g0.0.17) (2025-02-18)
+
+## [v27.4.59-test-f0.0.17](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-g0.0.16...v27.4.59-test-f0.0.17) (2025-02-17)
+
+## [v27.4.59-test-g0.0.16](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.16...v27.4.59-test-g0.0.16) (2025-02-16)
+
+## [v27.4.59-test-f0.0.16](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.15...v27.4.59-test-f0.0.16) (2025-02-16)
+
+## [v27.4.59-test-f0.0.15](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.15...v27.4.59-test-f0.0.15) (2025-02-15)
+
+## [v27.4.59-test-e0.0.15](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-f0.0.14...v27.4.59-test-e0.0.15) (2025-02-14)
+
+## [v27.4.59-test-f0.0.14](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59-test-e0.0.14...v27.4.59-test-f0.0.14) (2025-02-14)
+
 ## [v27.4.59-test-a0.0.0](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive//compare/v27.4.59...v27.4.59-test-a0.0.0) (2024-10-25)

 ### Features
@ -102,99 +116,13 @@ All notable changes to this project will be documented in this file. See [standa

 ### Bug Fixes

-* **build:** hlint wants a newtype instead ([0766351](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/07663516e520814e26740d671325b7cd10855dd4))
-
-## [27.4.69](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.68...v27.4.69) (2024-06-21)
-
-
-### Bug Fixes
-
-* **avs:** fix type causing avs surname upate not working ([822c43c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/822c43c8a7db2086954ad187502ec2c4f1811d17))
-* **avs:** keep company on unchange address/email only if either is non-empty ([766b858](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/766b8589d6945df21fc6ce90d35a004655ffa471))
-* **avs:** synch job deletes used row instead of truncation ([d7acc7a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d7acc7a2d0fe5fc18929a8cb2d9c9f8a259c9944))
-
-## [27.4.68](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.67...v27.4.68) (2024-06-19)
-
-
-### Bug Fixes
-
-* **letter:** minor ([2ae11dc](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2ae11dc25c000486af9acc26439a0580f5c687f2))
-
-## [27.4.67](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.66...v27.4.67) (2024-06-17)
-
-
-### Bug Fixes
-
-* **avs:** fix rare avs update bug involving values optional in avs but compulsory in user entity ([a6d0105](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a6d0105903caba0eb47715eeb217ea2c53d99e23))
-
-## [27.4.66](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.65...v27.4.66) (2024-06-12)
-
-
-### Bug Fixes
-
-* **avs:** fix [#164](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/164) by removing companyPersonalNumber and companyDepartment upon ldap sync expiry ([da74b95](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/da74b957295caefb010c90297af557f997b18e7c))
-* **avs:** fix [#165](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/165) by updating userCompanyDepartmen and userCompanyPersonalNumer ([76e0710](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/76e0710c7b54a40d2c236299ea4fabd009d3f35a))
-* **avs:** repeated avs sync enqueue no longe violates duplicate db uniqueness constraints ([996e6a0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/996e6a0ce563bda96638863efd40ce38fce8ac2b))
-* **avs:** update email on manual company switch ([9fd80f2](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9fd80f25526eefce217c659f6ea2991771c11ece)), closes [#164](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/164)
-
-## [27.4.65](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.64...v27.4.65) (2024-06-10)
-
-
-### Bug Fixes
-
-* **avs:** company update no longer fails on duplicate key ([bb101de](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/bb101dee7b40cd3d8ba10a559af642396d5b87b5))
-* **avs:** profile page correctly indicates automatic email and postal addresses ([e553ad4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e553ad4358a71fc96fa946533f0441d4af5202c9))
-* **avs:** steps towards [#164](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/164) ([aa1d230](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/aa1d230e497f0e59dbea9f4fd5c7da773f5a4280))
-* **lette:** adjust window for new pin letters ([6acfd84](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6acfd849aeb473a018f7a9c34e69f61b3c22b6f8))
-
-## [27.4.64](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.63...v27.4.64) (2024-05-27)
-
-## [27.4.63](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.62...v27.4.63) (2024-05-23)
-
-
-### Bug Fixes
-
-* **avs:** company update checks uniques and ignores those updates if necessary ([9451d90](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9451d90a9e00d08a2a7d169c4674d99ff1018ee9))
-
-## [27.4.62](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.61...v27.4.62) (2024-05-19)
-
-
-### Bug Fixes
-
-* **avs:** avs update on company shorthands working now ([ff2347b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ff2347b1c950c7a2bb281cdcd07a52925e23b9f0))
-* **avs:** deal gracefully with empty card status results ([ccf9340](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ccf934044938277d821eb4b9ea08a8a134e84189))
-
-## [27.4.61](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.60...v27.4.61) (2024-05-06)
-
-
-### Bug Fixes
-
-* **avs:** fix [#76](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/76) allowing company changes and fix [#69](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/69) ([3c4a0b8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3c4a0b86c1e3d8a28405ab73b964ba1b988d2822))
-* **build:** add missing tex packages ([6750798](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/6750798920dc76882f4e8ef39b47018fb7b77e44))
-* **build:** workaround non modal form result handler ([2fbd281](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/2fbd28154cd7aea282eaa2604a42263ac90e3b1e))
-
-## [27.4.60](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.59...v27.4.60) (2024-04-26)
-
-
-### Bug Fixes
-
-* **avs:** disable caching by 0s no longer causes an exception ([d578e80](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d578e80282c8bf6872fa6040514a9d2c85582707))
-* **avs:** fix [#152](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/152) by providing new online avs card filter throughout ([ad2375b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ad2375b338866f37c8b7825a9eab12fa6c9abccb))
-* **avs:** fix [#36](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/36) and remove dead code ([4f8850b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4f8850b3b4f710f9cf59163175b27599c97ac5c0))
-* **avs:** fix [#69](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/69) by redesigning live avs status page ([697979c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/697979c277ce7198f4573d6cea30373a1fcc17da))
-* **avs:** invalidate contact cache after licence writes ([c382be9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/c382be9325fcc92e13cb5dc2ad7c20b198db26fc))
-* **avs:** several minor bugfixes ([a52c8a6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a52c8a6ad709029a8822d383370b0d2bdd25e7d7)), closes [#158](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/158)
-* **build:** add import needed for production only ([724e4a0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/724e4a0bec343ab9c6d172d8e93b8040bbe3fe7d))
-* **build:** migration needs to check for table existens first ([f439ea4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f439ea45af9b1c4a029fc1b9b6383f3c97194ed0))
-* **build:** minor error non-development code ([66eaa4f](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/66eaa4f7dcc124b631414d4a1adbe555a4029100))
-* **build:** missing parameters added ([83afdf7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/83afdf760f93fc1a553de3a122b444412ed84ba4))
-* **build:** simple type error ([d56a1cd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d56a1cdd46259418faa737b9bb0a9d9ffba442e0))
-* **build:** type error in test db fill data ([f465cc9](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/f465cc972367233a4944dd0aeb81b223a187bb85))
-* **doc:** minor haddock problems ([d4f8a6c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d4f8a6c77b2a4a4540935f7f0beca0d0605508c8))
-* **firm:** supervisor filter acts weird in test environment ([b566e59](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/b566e59eb1325485fe26dc4f0b5cb63165c58f74))
-* **i18n:** fix some bad plurals ([890f8ad](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/890f8ad8b60115533faa6b99f4c4504243cbfb1d))
-* **lint:** remove minor superfluous dollar ([64a1233](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/64a123387f3539b73649d02a6ecd97de577097e6))
-* **qualification:** fix [#159](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/159) by removing an misleadingly named column for user qualification table ([fd6a538](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/fd6a5384d3517958a3c7726e32eed3bad197a591))
+* **stack.yaml:** move to uniworx.de gitlab ([55484e6](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/55484e631b786ea3710d322282019baf5292c243))
+* **utils/renamer:** Mehr outputs nur im verbose-Fall. ([ac30cb9](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/ac30cb9e6712d0ee3f204da4863d1e2509af8a76))
+* **utils:** Verboseparameter -v hinzugefuegt; rekursives makedir; genauere Meldungen. ([1806d9f](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/1806d9f01fc4a0746d2f9df42ef1ee6827c7fa09))
+* **Dockerfile:** change rights of source dir to env user ([e7a8183](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/e7a8183656ae419cfee2942543045c6fa6a9caa3))
+* **Makefile:** add missing dependency on well-known for backend-builds ([a09dc59](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/a09dc59f260843f8815c382576bb5254d21104bf))
+* **frontend:** fixed icon colour in table headers ([4c4571d](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/4c4571d2d0879e89f2572eba6015d34a7f4794c8))
+* **doc:** minor haddock problems ([d4f8a6c](https://fraport@dev.azure.com/fraport/Fahrerausbildung/_git/FRADrive/commit/d4f8a6c77b2a4a4540935f7f0beca0d0605508c8))

 ## [27.4.59](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.58...v27.4.59) (2024-02-13)

--- a/13
+++ b/13
@ -80,12 +80,12 @@ clean-all: clean
 .PHONY: release
 # HELP: create, commit and push a new release
 release:
-	./.gitlab-ci/version.pl -changelog CHANGELOG.md
-	git add CHANGELOG.md
-	VERSION=`.gitlab-ci/version.pl`
-	git tag $${VERSION}
-	git commit -m "chore(release): $${VERSION}"
-#	git push
+	VERSION=`./utils/version.pl -changelog CHANGELOG.md -v` ; \
+	git add CHANGELOG.md ; \
+	git commit -m "chore(release): $${VERSION}" ; \
+	git push ; \
+	git tag $${VERSION} ; \
+	git push origin $${VERSION}

 .PHONY: compile
 compile:
@ -98,6 +98,7 @@ start:
 	$(MAKE) start-memcached
 	$(MAKE) start-minio
 	$(MAKE) compile-frontend
+	$(MAKE) compile-uniworxdb
 	$(MAKE) start-backend

 .PHONY: %-backend
--- a/docker/fradrive/Dockerfile
+++ b/docker/fradrive/Dockerfile
@ -8,9 +8,19 @@ RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
    locale-gen
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8

-# Binary runtime dependencies
+# FraDrive runtime dependencies
+ENV DEBIAN_FRONTEND=noninteractive
+ENV TZ=Etc/UTC
+RUN apt-get update && apt-get -y install libpq-dev
+RUN apt-get update && apt-get -y install libsodium-dev
 # TODO: minimize texlive dependencies, switch to basic schemes where possible
-RUN apt-get -y install texlive-latex-recommended texlive-latex-extra texlive-luatex texlive-fonts-recommended texlive-fonts-extra texlive-lang-english texlive-lang-german
+RUN apt-get update && apt-get -y install \
+    texlive-latex-base \
+    texlive-luatex \
+    texlive-fonts-recommended \
+    texlive-fonts-extra \
+    texlive-lang-english \
+    texlive-lang-german

 # Add uniworx user and directories
 RUN mkdir -p /var/lib
@ -23,7 +33,12 @@ RUN mkdir -p /var/log/uniworx && chown -R uniworx:uniworx /var/log/uniworx
 # TODO: is this still needed?
 # RUN install -d -g uniworx -o uniworx -m 0750 /var/lib/uniworx
 # RUN install -d -g uniworx -o uniworx -m 0755 /var/log/uniworx
-RUN cp /tmp/uniworx-bin/uniworx /usr/bin/uniworx
+COPY ./bin/uniworx /usr/bin/uniworx
+COPY ./bin/uniworxdb /usr/bin/uniworxdb
+# COPY uniworxload /usr/bin/uniworx
+RUN chmod -R 777 /usr/bin
+COPY ./docker/fradrive/fradrive-entrypoint.sh /entrypoint.sh
+RUN chmod 777 /entrypoint.sh

 USER uniworx
 ENTRYPOINT fradrive-entrypoint.sh
--- a/docker/fradrive/fradrive-entrypoint.sh
+++ b/docker/fradrive/fradrive-entrypoint.sh
@ -4,16 +4,19 @@ cTime=$(date -Is)

 # export LOGDEST=/var/log/uniworx/${cTime}.log # kubernetes prefers log via stdout

-typeset -a configs
+# typeset -a configs

 configDir=${CONFIG_DIR-/cfg}
-configs=()
-if [[ -d "${configDir}" ]]; then
-  while IFS= read -d $'\0' cfg; do
-    configs+=("${(q)cfg}")
-  done < <(find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz)
-fi
+# configs=()
+# if [[ -d "${configDir}" ]]; then
+#   while IFS= read -d $'\0' cfg; do
+#     # IMPORTANT: The paths to the settings-yaml-files should not contain spaces, otherwise this might fail runtime!
+#     configs+=("${cfg}")
+#   done < <(find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz)
+# fi

 cd /var/lib/uniworx

-exec -- uniworx ${configs}
+# exec -- uniworx ${configs}
+# find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz | xargs -0 exec -- uniworx
+find "${configDir}" \( -name '*.yml' -o -name '*.yaml' \) -print0 | sort -rz | xargs -0 uniworx