Merge branch 'master' into dvdrental

docker-compose.yml

@@ -4,8 +4,10 @@ version: '3.4'
 services:
 
   db:
-    image: postgres
+    image: postgres:12
     restart: always
+    env_file:
+      - ".env"
     environment:
       - POSTGRES_PASSWORD
     ports:
@@ -16,7 +18,6 @@ services:
 
 
   adminer:
-    image: adminer:4.7.6
     build:
       context: ./src
       dockerfile: Dockerfile

init/settings.sh

 #!/bin/bash
 set -e
 
-psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL
 ALTER SYSTEM SET statement_timeout = 10000;
+REVOKE connect ON DATABASE postgres FROM PUBLIC;
 EOSQL

src/Dockerfile

-from adminer:4.7.3
+from adminer:4.7.6
 USER root:root
 COPY account-nolock-plugin.php /var/www/html/plugins/
 USER adminer:adminer