fix phpunit

nix/image/bootstrap-nginx.sh

@@ -3,6 +3,10 @@
 NGINX_CONFIG="$1"
 FPM_CONFIG="$2"
 
+shadow-setup
+
+chmod +sx /sbin/sudo
+
 echo "nginx: $NGINX_CONFIG"
 echo "fpm: $FPM_CONFIG"
 
@@ -15,14 +19,6 @@ tail --follow --retry /var/log/nginx/*.log &
 HAZE_UID=${HAZE_UID:-1000}
 HAZE_GID=${HAZE_GID:-1000}
 
-# undo the fakeNss symlink
-mv /etc/passwd /etc/passwd.bak
-cp /etc/passwd.bak /etc/passwd
-
-
-mv /etc/group /etc/group.bak
-cp /etc/group.bak /etc/group
-
 if [ "$(getent group "$HAZE_GID")" ]; then
   groupadd haze
   EXTRA_GROUP=" -G haze"

nix/image/bootstrap.sh

@@ -103,5 +103,4 @@ else
   redis-server --protected-mode no &
 fi
 
-echo "starting nginx"
 bootstrap-nginx "$@"

nix/image/configs.nix

@@ -1,8 +1,10 @@
 {runCommand}:
 runCommand "configs" {} ''
   mkdir -p $out/etc
+  mkdir -p $out/etc/sudoers.d
   mkdir -p $out/conf
   cp ${./configs/cron.conf} $out/etc/oc-cron.conf
   cp ${./configs/nginx-app.conf} $out/conf/nginx-app.conf
+  cp ${./configs/sudoers} $out/etc/sudoers.d/haze
   cp -r ${./configs/nc} $out/etc/nc
 ''

nix/image/haze.nix

@@ -24,12 +24,15 @@
   minio-client,
   neovim,
   helix,
+  sudo,
+  su,
+  which,
   debug ? false,
   writeShellApplication,
 }: let
-  inherit (lib) readFile getExe;
+  inherit (lib) readFile getExe concatStringsSep splitString take;
 
-  phpVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." php.version));
+  phpVersion = concatStringsSep "." (take 2 (splitString "." php.version));
   phpEnv = callPackage ./php.nix {inherit debug php;};
 
   bootstrap-nginx = writeShellApplication {
@@ -41,6 +44,10 @@
     runtimeInputs = [getent];
     text = readFile ./bootstrap.sh;
   };
+  shadowSetupScript = writeShellApplication {
+    name = "shadow-setup";
+    text = dockerTools.shadowSetup;
+  };
 
   tmpDir = runCommand "tmp-dir" {} ''
     mkdir -p $out/tmp
@@ -56,6 +63,7 @@
   '';
   configs = callPackage ./configs.nix {};
   scripts = callPackage ./scripts.nix {};
+  phpunit = callPackage ./phpunit.nix {php = phpEnv;};
   redis-certificates = runCommand "scripts" {} ''
     mkdir -p $out
     cp -r ${../../redis-certificates} $out/redis-certificates
@@ -68,7 +76,6 @@
     copyToRoot = [
       dockerTools.caCertificates
       dockerTools.usrBinEnv
-      dockerTools.fakeNss
       bash
       blackfire
       nginx
@@ -80,6 +87,9 @@
       procps
       gnugrep
       minio-client
+      sudo
+      su
+      which
       # samba
       wget
       curl
@@ -96,6 +106,7 @@
     copyToRoot = [
       phpEnv
       phpEnv.packages.composer
+      phpunit
     ];
   };
 in
@@ -111,6 +122,7 @@ in
       configs
       scripts
       redis-certificates
+      shadowSetupScript
     ];
     fakeRootCommands = ''
       chmod 1777 tmp

nix/image/phpunit.nix

@@ -0,0 +1,63 @@
+{
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  php,
+  phpunit,
+  testers,
+  versionCheckHook,
+}: let
+  inherit (lib) concatStringsSep splitString take;
+  phpVersion = concatStringsSep "." (take 2 (splitString "." php.version));
+  versions = {
+    "8.1" = {
+      version = "10.5.46";
+      hash = "sha256-DtQ6CR4RAGKpZcJA9WZ5ud5ztIBTr8MeVTIhFwbGHYc=";
+      vendorHash = "sha256-fNv9pWFwYTyw3KEGtmbKNzXFsiDE6oZjRCWhypa/k0A=";
+    };
+    "8.2" = {
+      version = "11.5.22";
+      hash = "sha256-oXoh/2G0bqPPyvVoQUUdUz8XGyNtRJE3taUFGu2UIsc=";
+      vendorHash = "sha256-9gLTJe2ft90qGr/d8/Zc/ua7EWyNZ16wPEZRe9sKZf0=";
+    };
+    "8.3" = {
+      version = "12.2.1";
+      hash = "sha256-D5WI1kv05L8X3Gfw/MCxGdIcqWyWJg68GL9I24z/zIY=";
+      vendorHash = "sha256-H+XMRMvbUz/WCUdPRmL8nSCqa5YE3Qb1+goEQjjDK70=";
+    };
+    "8.4" = {
+      version = "12.2.1";
+      hash = "sha256-D5WI1kv05L8X3Gfw/MCxGdIcqWyWJg68GL9I24z/zIY=";
+      vendorHash = "sha256-H+XMRMvbUz/WCUdPRmL8nSCqa5YE3Qb1+goEQjjDK70=";
+    };
+  };
+in php.buildComposerProject2 (finalAttrs: {
+  pname = "phpunit";
+  inherit (versions.${phpVersion}) version vendorHash;
+
+  src = fetchFromGitHub {
+    owner = "sebastianbergmann";
+    repo = "phpunit";
+    tag = finalAttrs.version;
+    inherit (versions.${phpVersion}) hash;
+  };
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion { package = phpunit; };
+  };
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
+    changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md";
+    description = "PHP Unit Testing framework";
+    homepage = "https://phpunit.de";
+    license = lib.licenses.bsd3;
+    mainProgram = "phpunit";
+    maintainers = with lib.maintainers; [ onny ];
+    teams = [ lib.teams.php ];
+  };
+})

nix/image/scripts/phpunit

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/local/bin/php -d memory_limit=512M /usr/local/bin/phpunit.phar $@