aa

Dockerfile

@@ -13,6 +13,7 @@ RUN apt-get -yqq update && \
       gcc \
       git-core \
       gosu \
+      iproute2 \
       # Needed for mysqlclient
       libmysqlclient-dev \
       libpq-dev \
@@ -43,17 +44,12 @@ RUN curl -LSs "https://github.com/scottchiefbaker/dool/archive/${DOOL_VERSION}.t
       tar --strip-components=1 -xz && \
     ./install.py
 
-# Check if the group ID is already created
+# create group and user
 ARG GROUP_ID
-RUN if ! getent group "$GROUP_ID"; then \
-      addgroup --gid "$GROUP_ID" user; \
-    fi
-
-# Check if the user ID is already created
 ARG USER_ID
-RUN if ! getent passwd "$USER_ID"; then \
-      adduser --disabled-password --gecos '' --gid "$GROUP_ID" --uid "$USER_ID" user; \
-    fi
+
+RUN groupadd -g "$GROUP_ID" user || true && \
+    useradd -m -u "$USER_ID" -g "$GROUP_ID" -s /bin/bash user || true
 
 ENV FWROOT=/FrameworkBenchmarks USER_ID="$USER_ID"
 ENV PYTHONPATH="$FWROOT"

frameworks/CSharp/aspnetcore/benchmark_config.json

@@ -1,5 +1,6 @@
 {
   "framework": "aspnetcore",
+  "maintainers": ["DamianEdwards", "sebastienros"],
   "tests": [
     {
       "default": {
@@ -14,15 +15,15 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "Postgres",
-        "framework": "ASP.NET Core",
+        "framework": "ASP.NET Core [Platform]",
         "language": "C#",
         "orm": "Raw",
         "platform": ".NET",
         "flavor": "CoreCLR",
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "ASP.NET Core [Platform, Pg]",
+        "display_name": "ASP.NET Core [Platform]",
         "notes": ""
       },
       "aot": {
@@ -37,15 +38,15 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "Postgres",
-        "framework": "ASP.NET Core",
+        "framework": "ASP.NET Core [Platform]",
         "language": "C#",
         "orm": "Raw",
         "platform": ".NET",
         "flavor": "NativeAOT",
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "ASP.NET Core [Platform, Pg, AOT]",
+        "display_name": "ASP.NET Core [Platform, AOT]",
         "notes": ""
       },
       "minimal": {
@@ -67,7 +68,7 @@
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "ASP.NET Core [Minimal APIs, Pg, Dapper]",
+        "display_name": "ASP.NET Core [Minimal APIs]",
         "notes": "",
         "versus": "aspnetcore"
       },
@@ -89,7 +90,7 @@
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "ASP.NET Core [MVC, Pg, EF]",
+        "display_name": "ASP.NET Core [MVC]",
         "notes": "",
         "versus": "aspnetcore"
       },
@@ -103,16 +104,17 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "MySQL",
-        "framework": "ASP.NET Core",
+        "framework": "ASP.NET Core [Platform]",
         "language": "C#",
         "orm": "Raw",
         "platform": ".NET",
         "flavor": "CoreCLR",
         "webserver": "Kestrel",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "ASP.NET Core [Platform, My]",
-        "notes": ""
+        "display_name": "ASP.NET Core [Platform, MySQL]",
+        "notes": "",
+        "versus": "aspnetcore"
       }
     }
   ]

frameworks/Go/gin/gin-src/hello.go

@@ -99,6 +99,7 @@ func fortunes(c *gin.Context) {
 		c.AbortWithError(500, err)
 		return
 	}
+	defer rows.Close() // Ensure rows are closed
 
 	fortunes := make(Fortunes, 0)
 	for rows.Next() { //Fetch rows

frameworks/Go/gin/gin-std/main.go

@@ -99,6 +99,7 @@ func fortunes(c *gin.Context) {
 		c.AbortWithError(500, err)
 		return
 	}
+	defer rows.Close() // Ensure rows are closed
 
 	fortunes := make(Fortunes, 0)
 	for rows.Next() { //Fetch rows

frameworks/Go/goravel/src/fiber/go.mod

@@ -66,7 +66,7 @@ require (
 	github.com/gofiber/template/html/v2 v2.1.1 // indirect
 	github.com/gofiber/utils v1.1.0 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
-	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
 	github.com/golang-migrate/migrate/v4 v4.17.1 // indirect
 	github.com/golang-module/carbon/v2 v2.3.12 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect

frameworks/Go/goravel/src/fiber/go.sum

@@ -289,8 +289,8 @@ github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w
 github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
 github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
-github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
+github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-migrate/migrate/v4 v4.17.1 h1:4zQ6iqL6t6AiItphxJctQb3cFqWiSpMnX7wLTPnnYO4=
 github.com/golang-migrate/migrate/v4 v4.17.1/go.mod h1:m8hinFyWBn0SA4QKHuKh175Pm9wjmxj3S2Mia7dbXzM=
 github.com/golang-module/carbon/v2 v2.3.12 h1:VC1DwN1kBwJkh5MjXmTFryjs5g4CWyoM8HAHffZPX/k=

frameworks/Go/goravel/src/gin/go.mod

@@ -65,7 +65,7 @@ require (
 	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
 	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/golang-migrate/migrate/v4 v4.17.1 // indirect
 	github.com/golang-module/carbon/v2 v2.3.12 // indirect
@@ -122,7 +122,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/pterm/pterm v0.12.79 // indirect
 	github.com/rabbitmq/amqp091-go v1.9.0 // indirect
-	github.com/redis/go-redis/v9 v9.5.3 // indirect
+	github.com/redis/go-redis/v9 v9.5.5 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect

frameworks/Go/goravel/src/gin/go.sum

@@ -288,8 +288,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
-github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
+github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
@@ -566,8 +566,8 @@ github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc
 github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
 github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
 github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
-github.com/redis/go-redis/v9 v9.5.3 h1:fOAp1/uJG+ZtcITgZOfYFmTKPE7n4Vclj1wZFgRciUU=
-github.com/redis/go-redis/v9 v9.5.3/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
+github.com/redis/go-redis/v9 v9.5.5 h1:51VEyMF8eOO+NUHFm8fpg+IOc1xFuFOhxs3R+kPu1FM=
+github.com/redis/go-redis/v9 v9.5.5/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo=

frameworks/Haskell/ihp/ihp.dockerfile

@@ -1,14 +1,14 @@
 FROM nixos/nix
 
-COPY ./src /ihp
-WORKDIR /ihp
-
 # Add build dependencies
-RUN nix-env -i cachix
+RUN nix-env -f https://github.com/NixOS/nixpkgs/archive/54b4bb956f9891b872904abdb632cea85a033ff2.tar.gz -iA cachix
 RUN cachix use digitallyinduced
 
+COPY ./src /ihp
+WORKDIR /ihp
+
 # Build 
-RUN nix-build -j auto --cores 0
+RUN nix --extra-experimental-features "nix-command flakes" build -j auto --cores 0 .#optimized-prod-server
 
 # Setup
 ENV DATABASE_URL=postgres://benchmarkdbuser:benchmarkdbpass@tfb-database:5432/hello_world

frameworks/Haskell/ihp/src/.envrc

@@ -0,0 +1,16 @@
+if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+fi
+
+use flake . --impure --accept-flake-config
+
+# Include .env file if it exists locally. Use the .env file to load env vars that you don't want to commit to git
+if [ -f .env ]
+then
+    set -o allexport
+    source .env
+    set +o allexport
+fi
+# Add your env vars here
+#
+# E.g. export AWS_ACCESS_KEY_ID="XXXXX"

frameworks/Haskell/ihp/src/.ghci

@@ -1,3 +1,4 @@
-import Prelude
-:def source readFile
-:source build/ihp-lib/applicationGhciConfig
+:set -XNoImplicitPrelude
+:def loadFromIHP \file -> (System.Environment.getEnv "IHP_LIB") >>= (\ihpLib -> readFile (ihpLib <> "/" <> file))
+:loadFromIHP applicationGhciConfig
+import IHP.Prelude

frameworks/Haskell/ihp/src/.gitignore

@@ -1,5 +1,4 @@
 .DS_Store
-.envrc
 .idea
 tmp
 result
@@ -17,3 +16,8 @@ gen
 del
 static/prod.*
 Config/client_session_key.aes
+
+.devenv*
+devenv.local.nix
+.direnv
+.env

frameworks/Haskell/ihp/src/Makefile

@@ -1,11 +1,3 @@
-ifneq ($(wildcard IHP/.*),)
-IHP = IHP/lib/IHP
-else
-IHP = $(shell dirname $$(which RunDevServer))/../lib/IHP
-endif
-
-include ${IHP}/Makefile.dist
-
 CSS_FILES += ${IHP}/static/vendor/bootstrap.min.css
 CSS_FILES += ${IHP}/static/vendor/flatpickr.min.css
 
@@ -19,3 +11,5 @@ JS_FILES += ${IHP}/static/vendor/morphdom-umd.min.js
 JS_FILES += ${IHP}/static/vendor/turbolinks.js
 JS_FILES += ${IHP}/static/vendor/turbolinksInstantClick.js
 JS_FILES += ${IHP}/static/vendor/turbolinksMorphdom.js
+
+include ${IHP}/Makefile.dist