From 5dba0f0b62642d8c2c46d32eb111e27447908442 Mon Sep 17 00:00:00 2001
From: Steffen Jost <S.Jost@Fraport.de>
Date: Tue, 9 May 2023 14:19:17 +0000
Subject: [PATCH] Revert "feat(docker): wrap within tini"

This reverts commit c86f36b2f67a014352b043397c32b6d8ca1642fe.
---
 nix/docker/default.nix | 84 +++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 50 deletions(-)

diff --git a/nix/docker/default.nix b/nix/docker/default.nix
index 139ab2f7d..d452f8849 100644
--- a/nix/docker/default.nix
+++ b/nix/docker/default.nix
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2023 Gregor Kleen <gregor@kleen.consulting>, Sarah Vaupel <sarah.vaupel@ifi.lmu.de>, Steffen Jost <jost@tcs.ifi.lmu.de>
+# SPDX-FileCopyrightText: 2022 Gregor Kleen <gregor.kleen@ifi.lmu.de>,Sarah Vaupel <sarah.vaupel@ifi.lmu.de>,Steffen Jost <jost@cip.ifi.lmu.de>,Steffen Jost <jost@tcs.ifi.lmu.de>
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
@@ -13,47 +13,38 @@ let
         printf '%s' $(date -Is -d '@${toString self.lastModified}') > $out
       '');
     in if self ? lastModified then fromDate else "1970-01-01T00:00:01Z";
-
+  
   mkUniworxDocker = { isDemo }: prev.dockerTools.buildImage {
     name = "uniworx${optionalString isDemo "-demo"}";
     tag =
       let
         versionFile = if isDemo then ./demo-version.json else ./version.json;
       in (builtins.fromJSON (prev.lib.readFile versionFile)).version;
-    inherit created;
+    inherit created; 
 
-    copyToRoot = prev.buildEnv {
-      name = "uniworx${optionalString isDemo "-demo"}-root";
-      paths = with final; [
-        uniworx.uniworx.components.exes.uniworx
-        prev.dockerTools.binSh findutils coreutils
-        iana-etc
-        # just for manual testing within the pod, may be removed for production?
-        curl wget netcat openldap
-        unixtools.netstat htop gnugrep
-        locale
-      ] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ];
-
-      nativeBuildInputs = with prev; [ makeWrapper ];
-      postBuild = ''
-        wrapProgram $out/bin/uniworx \
-          --set-default LOCALE_ARCHIVE ${final.glibcLocalesUtf8}/lib/locale/locale-archive \
-          --set-default LOCALE_ARCHIVE_2_27 ${final.glibcLocalesUtf8}/lib/locale/locale-archive \
-          --set-default LANG en_DK.UTF-8 \
-          --suffix PATH : ${makeBinPath (with final; [
-            busybox
-            pdftk
-            (texlive.combine {
-              inherit (texlive) scheme-basic
-                babel-german babel-english booktabs textpos
-                enumitem eurosym koma-script parskip xcolor dejavu
-                # required fro LuaTeX
-                luatexbase lualatex-math unicode-math selnolig
-                ;
-            })
-          ])}
-      '';
-    };
+    contents = with final; [
+      uniworx.uniworx.components.exes.uniworx
+      prev.dockerTools.binSh findutils coreutils      
+      iana-etc
+      # for PDF creation with Pandoc and LuaTeX 
+      #cups # needed for interface with print center -- did not work as intended, requires lpd running
+      busybox # should provide a working lpr -- to be tested
+      htop
+      pdftk # for encrypting pdfs
+      #texlive.combined.scheme-medium # too large for container in LMU build environment.
+      (texlive.combine {        
+          inherit (texlive) scheme-basic 
+            babel-german babel-english booktabs textpos
+            enumitem eurosym koma-script parskip xcolor dejavu
+            # required fro LuaTeX 
+            luatexbase lualatex-math unicode-math selnolig
+            ;
+        })      
+      # just for manual testing within the pod, may be removef for production?
+      curl wget netcat openldap 
+      unixtools.netstat htop gnugrep
+      locale
+    ] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ];
 
     runAsRoot = ''
       #!${final.stdenv.shell}
@@ -70,7 +61,7 @@ let
       install -d -g uniworx -o uniworx -m 0755 /var/log/uniworx
 
       # just to see how to create directories here
-      mkdir -p /testdir
+      mkdir -p /testdir 
 
       ${optionalString isDemo ''
           install -d -g uniworx -o uniworx -m 0750 /var/lib/postgres
@@ -143,7 +134,7 @@ let
           approot: "_env:APPROOT:http://localhost:8080"
         '';
       in {
-        Cmd = [ "${final.tini}/bin/tini" "${entrypoint}/bin/uniworx-entrypoint" ];
+        Cmd = [ "${entrypoint}/bin/uniworx-entrypoint" ];
         User = "uniworx:uniworx";
         ExposedPorts = {
           "8080/tcp" = {};
@@ -154,10 +145,6 @@ let
         } // optionalAttrs isDemo {
           "/var/lib/postgres" = {};
         };
-        Env = [
-          "TINI_SUBREAPER=yes"
-          "TINI_VERBOSITY=2"
-        ];
       };
   };
 in
@@ -168,15 +155,12 @@ in
     tag = (builtins.fromJSON (prev.lib.readFile ./ci-version.json)).version;
     fromImage = prev.docker-nixpkgs.nix-unstable;
 
-    copyToRoot = prev.buildEnv {
-      name = "uniworx-ci-root";
-      paths = with final; [
-        bash coreutils
-        minio-client
-        xz
-      ];
-    };
-
+    contents = with final; [
+      bash coreutils
+      minio-client
+      xz
+    ];
+    
     runAsRoot = ''
       #!${final.stdenv.shell}