diff --git a/README.md b/README.md index 7a2c351..fe7aa92 100644 --- a/README.md +++ b/README.md @@ -397,6 +397,7 @@ A collection of delicious docker recipes. - [x] outlinewiki/outline - [x] gabekangas/owncast - [x] owncloud +- [x] dpage/pgadmin4 - [x] phpmyadmin - [x] pihole/pihole - [x] mcr.microsoft.com/playwright diff --git a/nifi/README.md b/nifi/README.md index 9882da3..68ae52a 100644 --- a/nifi/README.md +++ b/nifi/README.md @@ -32,6 +32,9 @@ $ curl http://127.0.0.1:8080/nifi/ $ curl http://127.0.0.1:18080/nifi-registry/ ``` -> I copied config files from a temporary container. Maybe there are better ways. +Maybe there are better ways to populate a volume: + +- named volumes +- anonymous volumes [1]: https://nifi.apache.org diff --git a/nifi/docker-compose-cluster.yml b/nifi/docker-compose-cluster.yml index 96d3450..6dc5fcd 100644 --- a/nifi/docker-compose-cluster.yml +++ b/nifi/docker-compose-cluster.yml @@ -1,7 +1,7 @@ version: "3.8" services: nifi: - image: apache/nifi:1.15.1 + image: apache/nifi:1.15.3 ports: - "8080:8080" - "8082:8082" diff --git a/nifi/docker-compose.yml b/nifi/docker-compose.yml index f4fd094..7ab5755 100644 --- a/nifi/docker-compose.yml +++ b/nifi/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: nifi: - image: apache/nifi:1.15.1 + image: apache/nifi:1.15.3 ports: - "8080:8080" volumes: @@ -17,14 +17,15 @@ services: - ./data/nifi/logs:/opt/nifi/nifi-current/logs environment: - NIFI_WEB_HTTP_PORT=8080 - - NIFI_SENSITIVE_PROPS_KEY=00000000-0000-0000-0000-000000000000 - NIFI_JVM_HEAP_INIT=8g - NIFI_JVM_HEAP_MAX=16g + - SINGLE_USER_CREDENTIALS_USERNAME=admin + - SINGLE_USER_CREDENTIALS_PASSWORD=admin hostname: nifi restart: unless-stopped registry: - image: apache/nifi-registry:1.15.1 + image: apache/nifi-registry:1.15.3 ports: - "18080:18080" volumes: diff --git a/pgadmin4/README.md b/pgadmin4/README.md new file mode 100644 index 0000000..5cedfeb --- /dev/null +++ b/pgadmin4/README.md @@ -0,0 +1,2 @@ +pgadmin4 +======== diff --git a/pgadmin4/docker-compose.yml b/pgadmin4/docker-compose.yml new file mode 100644 index 0000000..55924c6 --- /dev/null +++ b/pgadmin4/docker-compose.yml @@ -0,0 +1,16 @@ +version: "3.8" + +services: + pgadmin4: + image: dpage/pgadmin4 + ports: + - "5050:80" + volumes: + - data:/var/lib/pgadmin + environment: + - PGADMIN_DEFAULT_EMAIL=admin@gmail.com + - PGADMIN_DEFAULT_PASSWORD=****** + restart: unless-stopped + +volumes: + data: diff --git a/pgadmin4/nginx.conf b/pgadmin4/nginx.conf new file mode 100644 index 0000000..6d8c108 --- /dev/null +++ b/pgadmin4/nginx.conf @@ -0,0 +1,30 @@ +# +# https://www.pgadmin.org/docs/pgadmin4/latest/container_deployment.html +# + +server { + listen 80; + return 301 https://$host$request_uri; +} + +server { + listen 443; + server_name _; + + ssl_certificate /etc/nginx/server.cert; + ssl_certificate_key /etc/nginx/server.key; + + ssl on; + ssl_session_cache builtin:1000 shared:SSL:10m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers HIGH:!aNULL:!eNULL:!EXPORT:!CAMELLIA:!DES:!MD5:!PSK:!RC4; + ssl_prefer_server_ciphers on; + + location / { + proxy_set_header X-Script-Name /; + proxy_set_header X-Scheme $scheme; + proxy_set_header Host $host; + proxy_pass http://localhost:5050/; + proxy_redirect off; + } +}