Merge branch 'master' into dvdrental

docker-compose-windows.yml

+# Use postgres/example user/password credentials
+version: '3.4'
+
+volumes:
+  dbp-postgres-data-volume:
+    driver: local
+    name: dbp-postgres-data-volume
+
+services:
+  db:
+    volumes:
+      - dbp-postgres-data-volume:/var/lib/postgresql/data

docker-compose.yml

@@ -16,9 +16,12 @@ services:
 
 
   adminer:
+    image: adminer:4.7.6
     build:
       context: ./src
       dockerfile: Dockerfile
+    environment:
+     - ADMINER_PLUGINS=account-nolock-plugin
     restart: always
     ports:
       - 8085:8080

reset_db_windows.bat

+@echo off
+echo Wollen Sie dbp-postgres-data-volume wirklich loeschen?
+pause
+docker volume rm dbp-postgres-data-volume
+pause
+echo Wenn es geklappt hat, gut, andernfalls muessen die noch die Container mit docker-compose down entfernt werden. Siehe README.md
+exit

src/Dockerfile

-from adminer:4.7.1
-RUN sed -i "s/auth_error(lang(83,ceil(\$df\/60)));/{}/g" /var/www/html/adminer.php
+from adminer:4.7.3
+USER root:root
+COPY account-nolock-plugin.php /var/www/html/plugins/
+USER adminer:adminer

src/account-nolock-plugin.php

+<?php
+/** Disable account locking
+*/
+class AdminerNolock  {
+        function bruteForceKey() {
+          // Return high resolution time
+          // to get for each call a different key.
+          // This effectively disables the locking mechanism
+          // that forces a wait time of 30 min after 30 failed
+          // login attempts. This could is needed in class room situations
+          // with all clients accessing adminer through the same IP
+          // to prevent locking adminer by single students.
+          // convert time to string by prefixing "t"
+          // as the caller expects a string.
+          return "t" . hrtime(true);
+        }
+}