diff --git a/examples/behind-reverse-proxy/docker-compose.yml b/examples/behind-reverse-proxy/docker-compose.yml index 0549be7c3..6003ac5bf 100644 --- a/examples/behind-reverse-proxy/docker-compose.yml +++ b/examples/behind-reverse-proxy/docker-compose.yml @@ -45,7 +45,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -54,7 +54,7 @@ services: - net-docker myproxy: - image: haproxy + image: haproxy:2.7.0 ports: - 80:8080 volumes: diff --git a/examples/bigbluebutton/docker-compose.yml b/examples/bigbluebutton/docker-compose.yml index 5980ba9d9..f55c5cc46 100644 --- a/examples/bigbluebutton/docker-compose.yml +++ b/examples/bigbluebutton/docker-compose.yml @@ -70,7 +70,7 @@ services: net-docker: docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/certbot-dns-cloudflare/docker-compose.yml b/examples/certbot-dns-cloudflare/docker-compose.yml index fa65c1a84..ea514b997 100644 --- a/examples/certbot-dns-cloudflare/docker-compose.yml +++ b/examples/certbot-dns-cloudflare/docker-compose.yml @@ -14,7 +14,6 @@ services: # more info at https://docs.bunkerweb.io volumes: - bw-data:/data - - certs:/certs environment: - MULTISITE=yes - SERVER_NAME=app1.example.com app2.example.com app3.example.com # replace with your domains @@ -49,12 +48,13 @@ services: - DOCKER_HOST=tcp://docker-proxy:2375 volumes: - bw-data:/data + - certs:/certs networks: - bw-universe - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -63,7 +63,7 @@ services: - net-docker mycertbot: - image: certbot/dns-cloudflare + image: certbot/dns-cloudflare:v2.0.0 environment: - DOMAINS=*.example.com,example.com - EMAIL=contact@example.com diff --git a/examples/certbot-dns-digitalocean/docker-compose.yml b/examples/certbot-dns-digitalocean/docker-compose.yml index 4a23feedf..6a28fcd68 100644 --- a/examples/certbot-dns-digitalocean/docker-compose.yml +++ b/examples/certbot-dns-digitalocean/docker-compose.yml @@ -14,7 +14,6 @@ services: # more info at https://docs.bunkerweb.io volumes: - bw-data:/data - - certs:/certs environment: - MULTISITE=yes - SERVER_NAME=app1.example.com app2.example.com app3.example.com # replace with your domains @@ -49,12 +48,13 @@ services: - DOCKER_HOST=tcp://docker-proxy:2375 volumes: - bw-data:/data + - certs:/certs networks: - bw-universe - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -63,7 +63,7 @@ services: - net-docker mycertbot: - image: certbot/dns-digitalocean + image: certbot/dns-digitalocean:v2.0.0 environment: - DOMAINS=*.example.com,example.com - EMAIL=contact@example.com diff --git a/examples/certbot-dns-google/docker-compose.yml b/examples/certbot-dns-google/docker-compose.yml index b8d9cdfa4..47556920d 100644 --- a/examples/certbot-dns-google/docker-compose.yml +++ b/examples/certbot-dns-google/docker-compose.yml @@ -14,7 +14,6 @@ services: # more info at https://docs.bunkerweb.io volumes: - bw-data:/data - - certs:/certs environment: - MULTISITE=yes - SERVER_NAME=app1.example.com app2.example.com app3.example.com # replace with your domains @@ -49,12 +48,13 @@ services: - DOCKER_HOST=tcp://docker-proxy:2375 volumes: - bw-data:/data + - certs:/certs networks: - bw-universe - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -63,7 +63,7 @@ services: - net-docker mycertbot: - image: certbot/dns-google + image: certbot/dns-google:v2.0.0 environment: - DOMAINS=*.example.com,example.com - EMAIL=contact@example.com diff --git a/examples/certbot-dns-ovh/docker-compose.yml b/examples/certbot-dns-ovh/docker-compose.yml index f60f68e7a..f4f207bc1 100644 --- a/examples/certbot-dns-ovh/docker-compose.yml +++ b/examples/certbot-dns-ovh/docker-compose.yml @@ -54,7 +54,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -63,7 +63,7 @@ services: - net-docker mycertbot: - image: certbot/dns-ovh + image: certbot/dns-ovh:v2.0.0 environment: - DOMAINS=*.example.com,example.com - EMAIL=contact@example.com diff --git a/examples/certbot-dns-route53/docker-compose.yml b/examples/certbot-dns-route53/docker-compose.yml index a88d99059..80572078a 100644 --- a/examples/certbot-dns-route53/docker-compose.yml +++ b/examples/certbot-dns-route53/docker-compose.yml @@ -54,7 +54,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -63,7 +63,7 @@ services: - net-docker mycertbot: - image: certbot/dns-google + image: certbot/dns-google:v2.0.0 environment: - DOMAINS=*.example.com,example.com - EMAIL=contact@example.com diff --git a/examples/community/brawdunoir-homelab/docker/bw/docker-compose.yaml b/examples/community/brawdunoir-homelab/docker/bw/docker-compose.yaml index 6736b1962..424db5bc1 100644 --- a/examples/community/brawdunoir-homelab/docker/bw/docker-compose.yaml +++ b/examples/community/brawdunoir-homelab/docker/bw/docker-compose.yaml @@ -57,7 +57,7 @@ services: - bw-universe docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/cors/autoconf.yml b/examples/cors/autoconf.yml index ad195fae7..79eb500dc 100644 --- a/examples/cors/autoconf.yml +++ b/examples/cors/autoconf.yml @@ -2,15 +2,15 @@ version: "3" services: myapp1: - image: php:fpm + image: php:fpm-alpine3.17 networks: bw-services: aliases: - myapp1 - # ⚠️ UID and GID of mywww (101:101) and php:fpm (33:33) are not the same ⚠️ + # ⚠️ UID and GID of mywww (101:101) and php:fpm (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www/app1.example.com:/app # folder containing PHP app1 (don't forget to rename it) labels: @@ -21,15 +21,15 @@ services: - bunkerweb.REMOTE_PHP_PATH=/app myapp2: - image: php:fpm + image: php:fpm-alpine3.17 networks: bw-services: aliases: - myapp2 - # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm (33:33) are not the same ⚠️ + # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www/app2.example.com:/app # folder containing PHP app2 (don't forget to rename it) labels: @@ -38,15 +38,15 @@ services: - bunkerweb.REMOTE_PHP_PATH=/app myapp3: - image: php:fpm + image: php:fpm-alpine3.17 networks: bw-services: aliases: - myapp3 - # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm (33:33) are not the same ⚠️ + # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www/app3.example.com:/app # folder containing PHP app3 (don't forget to rename it) labels: diff --git a/examples/cors/docker-compose.yml b/examples/cors/docker-compose.yml index abf4f4cc2..403a6febe 100644 --- a/examples/cors/docker-compose.yml +++ b/examples/cors/docker-compose.yml @@ -46,13 +46,13 @@ services: environment: - DOCKER_HOST=tcp://docker-proxy:2375 volumes: - - bw-data:/data + - ./bw-data:/data networks: - bw-universe - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -61,33 +61,33 @@ services: - net-docker myapp1: - image: php:fpm - # ⚠️ UID and GID of mywww (101:101) and php:fpm (33:33) are not the same ⚠️ + image: php:fpm-alpine3.17 + # ⚠️ UID and GID of mywww (101:101) and php:fpm-alpine3.17 (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www/app1.example.com:/app # folder containing PHP app1 (don't forget to rename it) networks: - net_app1 myapp2: - image: php:fpm - # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm (33:33) are not the same ⚠️ + image: php:fpm-alpine3.17 + # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm-alpine3.17 (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www/app2.example.com:/app # folder containing PHP app2 (don't forget to rename it) networks: - net_app2 myapp3: - image: php:fpm - # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm (33:33) are not the same ⚠️ + image: php:fpm-alpine3.17 + # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm-alpine3.17 (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www/app3.example.com:/app # folder containing PHP app3 (don't forget to rename it) networks: diff --git a/examples/cors/setup-autoconf.sh b/examples/cors/setup-autoconf.sh index feea1a687..6fe09301e 100755 --- a/examples/cors/setup-autoconf.sh +++ b/examples/cors/setup-autoconf.sh @@ -7,6 +7,6 @@ fi chown -R root:101 bw-data chmod -R 770 bw-data -chown -R 33:101 ./bw-data/www +chown -R 82:101 ./bw-data/www find ./bw-data/www -type f -exec chmod 0640 {} \; find ./bw-data/www -type d -exec chmod 0750 {} \; \ No newline at end of file diff --git a/examples/cors/setup-docker.sh b/examples/cors/setup-docker.sh index feea1a687..6fe09301e 100755 --- a/examples/cors/setup-docker.sh +++ b/examples/cors/setup-docker.sh @@ -7,6 +7,6 @@ fi chown -R root:101 bw-data chmod -R 770 bw-data -chown -R 33:101 ./bw-data/www +chown -R 82:101 ./bw-data/www find ./bw-data/www -type f -exec chmod 0640 {} \; find ./bw-data/www -type d -exec chmod 0750 {} \; \ No newline at end of file diff --git a/examples/docker-configs/docker-compose.yml b/examples/docker-configs/docker-compose.yml index c7ed0a2f9..5874cc83f 100644 --- a/examples/docker-configs/docker-compose.yml +++ b/examples/docker-configs/docker-compose.yml @@ -20,9 +20,7 @@ services: - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24 - SERVE_FILES=no - DISABLE_DEFAULT_SERVER=yes - # - AUTO_LETS_ENCRYPT=yes # TODO uncomment this line when the tests are done - - USE_BUNKERNET=no # TODO remove this line when the tests are done - - GENERATE_SELF_SIGNED_SSL=yes # TODO remove this line when the tests are done + - AUTO_LETS_ENCRYPT=yes - USE_CLIENT_CACHE=yes - USE_GZIP=yes - USE_REVERSE_PROXY=yes @@ -75,7 +73,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/drupal/autoconf.yml b/examples/drupal/autoconf.yml index b329e49a1..3ff42fbb0 100644 --- a/examples/drupal/autoconf.yml +++ b/examples/drupal/autoconf.yml @@ -2,7 +2,7 @@ version: "3" services: mydrupal: - image: drupal:9-apache + image: drupal:9.4-apache networks: bw-services: aliases: diff --git a/examples/drupal/docker-compose.yml b/examples/drupal/docker-compose.yml index 6308947da..2638cffcf 100644 --- a/examples/drupal/docker-compose.yml +++ b/examples/drupal/docker-compose.yml @@ -29,9 +29,10 @@ services: USE_REVERSE_PROXY: "yes" REVERSE_PROXY_URL: "/" REVERSE_PROXY_HOST: "http://mydrupal" + CUSTOM_CONF_MODSEC_CRS_drupal: 'SecAction "id:900130,phase:1,nolog,pass,t:none,setvar:tx.crs_exclusions_drupal=1"' + # Onces the installation is done, you can remove these lines LIMIT_REQ_URL_1: "/core/install.php" LIMIT_REQ_RATE_1: "5r/s" - CUSTOM_CONF_MODSEC_CRS_drupal: 'SecAction "id:900130,phase:1,nolog,pass,t:none,setvar:tx.crs_exclusions_drupal=1"' labels: - "bunkerweb.INSTANCE" # required for the scheduler to recognize the container networks: @@ -52,7 +53,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -61,7 +62,7 @@ services: - net-docker mydrupal: - image: drupal:9-apache + image: drupal:9.4-apache volumes: - ./drupal-modules:/var/www/html/modules - ./drupal-profiles:/var/www/html/profiles @@ -71,7 +72,7 @@ services: - bw-services mydb: - image: mariadb + image: mariadb:10.10 volumes: - db-data:/var/lib/mysql environment: diff --git a/examples/drupal/setup-docker.sh b/examples/drupal/setup-docker.sh deleted file mode 100755 index 69265c914..000000000 --- a/examples/drupal/setup-docker.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ $(id -u) -ne 0 ] ; then - echo "❌ Run me as root" - exit 1 -fi - -chown -R root:101 bw-data -find ./bw-data -type f -exec chmod 0660 {} \; -find ./bw-data -type d -exec chmod 0770 {} \; \ No newline at end of file diff --git a/examples/drupal/swarm.yml b/examples/drupal/swarm.yml index c0312c21c..fd0fcfbf3 100644 --- a/examples/drupal/swarm.yml +++ b/examples/drupal/swarm.yml @@ -2,7 +2,7 @@ version: "3.3" services: mydrupal: - image: drupal:9-apache + image: drupal:9.4-apache networks: - bw-services volumes: diff --git a/examples/ghost/autoconf.yml b/examples/ghost/autoconf.yml index a209167fe..422401394 100644 --- a/examples/ghost/autoconf.yml +++ b/examples/ghost/autoconf.yml @@ -2,7 +2,7 @@ version: "3" services: myghost: - image: ghost:alpine + image: ghost:5.25-alpine volumes: - ./ghost_data:/var/lib/ghost/content networks: diff --git a/examples/ghost/docker-compose.yml b/examples/ghost/docker-compose.yml index 9e91508f1..e4b231afa 100644 --- a/examples/ghost/docker-compose.yml +++ b/examples/ghost/docker-compose.yml @@ -44,7 +44,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -53,7 +53,7 @@ services: - net-docker myghost: - image: ghost:alpine + image: ghost:5.25-alpine volumes: - ./ghost-data:/var/lib/ghost/content environment: diff --git a/examples/ghost/swarm.yml b/examples/ghost/swarm.yml index 40ed4cefb..96ba5b233 100644 --- a/examples/ghost/swarm.yml +++ b/examples/ghost/swarm.yml @@ -2,7 +2,7 @@ version: "3.3" services: myghost: - image: ghost:alpine + image: ghost:5.25-alpine volumes: - ghost_data:/var/lib/ghost/content networks: diff --git a/examples/gogs/autoconf.yml b/examples/gogs/autoconf.yml index 7cc0a1146..4e561f2e7 100644 --- a/examples/gogs/autoconf.yml +++ b/examples/gogs/autoconf.yml @@ -2,7 +2,7 @@ version: "3" services: mygogs: - image: gogs/gogs + image: gogs/gogs:0.12 volumes: - ./gogs-data:/data networks: diff --git a/examples/gogs/docker-compose.yml b/examples/gogs/docker-compose.yml index e3ee4053e..06fdf079c 100644 --- a/examples/gogs/docker-compose.yml +++ b/examples/gogs/docker-compose.yml @@ -13,7 +13,7 @@ services: # another example for existing folder : chown -R root:101 folder && chmod -R 770 folder # more info at https://docs.bunkerweb.io volumes: - - ./bw-data:/data # contains some Core Rule Set configuration to fix FP + - bw-data:/data environment: - SERVER_NAME=www.example.com # replace with your domain - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24 @@ -48,7 +48,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -57,12 +57,15 @@ services: - net-docker mygogs: - image: gogs/gogs + image: gogs/gogs:0.12 volumes: - ./gogs-data:/data networks: - bw-services +volumes: + bw-data: + networks: bw-universe: ipam: diff --git a/examples/gogs/setup-docker.sh b/examples/gogs/setup-docker.sh deleted file mode 100755 index 69265c914..000000000 --- a/examples/gogs/setup-docker.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ $(id -u) -ne 0 ] ; then - echo "❌ Run me as root" - exit 1 -fi - -chown -R root:101 bw-data -find ./bw-data -type f -exec chmod 0660 {} \; -find ./bw-data -type d -exec chmod 0770 {} \; \ No newline at end of file diff --git a/examples/gogs/swarm.yml b/examples/gogs/swarm.yml index 724564289..5caafe8d3 100644 --- a/examples/gogs/swarm.yml +++ b/examples/gogs/swarm.yml @@ -2,7 +2,7 @@ version: "3.3" services: mygogs: - image: gogs/gogs + image: gogs/gogs:0.12 volumes: - gogs_data:/data/gogs/data networks: diff --git a/examples/hardened/docker-compose.yml b/examples/hardened/docker-compose.yml index 7ace7c523..e0438c6f5 100644 --- a/examples/hardened/docker-compose.yml +++ b/examples/hardened/docker-compose.yml @@ -57,7 +57,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/joomla/docker-compose.yml b/examples/joomla/docker-compose.yml index 1b1b399f0..88bc2f1f5 100644 --- a/examples/joomla/docker-compose.yml +++ b/examples/joomla/docker-compose.yml @@ -53,7 +53,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -74,7 +74,7 @@ services: - bw-services mydb: - image: mariadb + image: mariadb:10.10 volumes: - db-data:/var/lib/mysql environment: diff --git a/examples/load-balancer/docker-compose.yml b/examples/load-balancer/docker-compose.yml index 18fa1488f..f57581f9d 100644 --- a/examples/load-balancer/docker-compose.yml +++ b/examples/load-balancer/docker-compose.yml @@ -51,7 +51,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/magento/docker-compose.yml b/examples/magento/docker-compose.yml index 4dcbbbc6a..f8c98097c 100644 --- a/examples/magento/docker-compose.yml +++ b/examples/magento/docker-compose.yml @@ -50,7 +50,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -87,7 +87,7 @@ services: - bw-services mydb: - image: mariadb:10.2 + image: mariadb:10.10 volumes: - db-data:/var/lib/mysql environment: diff --git a/examples/mattermost/.env b/examples/mattermost/.env index 77a84c893..0529e673f 100644 --- a/examples/mattermost/.env +++ b/examples/mattermost/.env @@ -14,7 +14,7 @@ RESTART_POLICY=unless-stopped ## Please keep in mind this will create a superuser and it's recommended to use a less privileged ## user to connect to the database. ## A guide on how to change the database user to a nonsuperuser can be found in docs/creation-of-nonsuperuser.md -POSTGRES_IMAGE_TAG=13-alpine +POSTGRES_IMAGE_TAG=15-alpine POSTGRES_DATA_PATH=./volumes/db/var/lib/postgresql/data POSTGRES_USER=mmuser @@ -60,7 +60,7 @@ MM_BLEVESETTINGS_INDEXDIR=/mattermost/bleve-indexes ## This will be 'mattermost-enterprise-edition' or 'mattermost-team-edition' based on the version of Mattermost you're installing. MATTERMOST_IMAGE=mattermost-enterprise-edition -MATTERMOST_IMAGE_TAG=6.3 +MATTERMOST_IMAGE_TAG=master ## Make Mattermost container readonly. This interferes with the regeneration of root.html inside the container. Only use ## it if you know what you're doing. diff --git a/examples/mattermost/docker-compose.yml b/examples/mattermost/docker-compose.yml index 1466848f2..118538ced 100644 --- a/examples/mattermost/docker-compose.yml +++ b/examples/mattermost/docker-compose.yml @@ -69,7 +69,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/mongo-express/autoconf.yml b/examples/mongo-express/autoconf.yml index 481025ab1..aaa88eb99 100644 --- a/examples/mongo-express/autoconf.yml +++ b/examples/mongo-express/autoconf.yml @@ -2,7 +2,7 @@ version: "3" services: mongo: - image: mongo:latest + image: mongo:5.0.14 networks: bw-services: aliases: @@ -15,7 +15,7 @@ services: - MONGO_INITDB_DATABASE=mongo # replace with the database name of your choice mongo-ui: - image: mongo-express:latest + image: mongo-express:0.54.0 networks: bw-services: aliases: diff --git a/examples/mongo-express/docker-compose.yml b/examples/mongo-express/docker-compose.yml index d67ee490b..99fcfec61 100644 --- a/examples/mongo-express/docker-compose.yml +++ b/examples/mongo-express/docker-compose.yml @@ -47,7 +47,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -56,7 +56,7 @@ services: - net-docker mongo: - image: mongo:latest + image: mongo:5.0.14 volumes: - ./db:/data/db environment: @@ -67,7 +67,7 @@ services: - bw-services mongo-ui: - image: mongo-express:latest + image: mongo-express:0.54.0 environment: - ME_CONFIG_MONGODB_SERVER=mongo - ME_CONFIG_MONGODB_ADMINUSERNAME=root # replace with a less obvious username diff --git a/examples/mongo-express/setup-docker.sh b/examples/mongo-express/setup-docker.sh deleted file mode 100755 index 0faae2d5a..000000000 --- a/examples/mongo-express/setup-docker.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ $(id -u) -ne 0 ] ; then - echo "❌ Run me as root" - exit 1 -fi - -chown -R root:101 bw-data -chmod -R 770 bw-data diff --git a/examples/mongo-express/swarm.yml b/examples/mongo-express/swarm.yml index beabd340e..6713d01d8 100644 --- a/examples/mongo-express/swarm.yml +++ b/examples/mongo-express/swarm.yml @@ -2,7 +2,7 @@ version: "3" services: mongo: - image: mongo:latest + image: mongo:5.0.14 networks: - bw-services volumes: @@ -17,7 +17,7 @@ services: - "node.role==worker" mongo-ui: - image: mongo-express:latest + image: mongo-express:0.54.0 networks: - bw-services environment: diff --git a/examples/moodle/autoconf.yml b/examples/moodle/autoconf.yml index f93e5ad61..541c3029c 100644 --- a/examples/moodle/autoconf.yml +++ b/examples/moodle/autoconf.yml @@ -2,7 +2,7 @@ version: "3" services: mymoodle: - image: bitnami/moodle:latest + image: bitnami/moodle:4.1.0 networks: bw-services: aliases: diff --git a/examples/moodle/docker-compose.yml b/examples/moodle/docker-compose.yml index 3d7046cef..fdfe6c213 100644 --- a/examples/moodle/docker-compose.yml +++ b/examples/moodle/docker-compose.yml @@ -50,7 +50,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -59,7 +59,7 @@ services: - net-docker mymoodle: - image: bitnami/moodle:latest + image: bitnami/moodle:4.1.0 depends_on: - mydb volumes: @@ -78,7 +78,7 @@ services: - bw-services mydb: - image: mariadb:10.5 + image: mariadb:10.10 volumes: - db-data:/var/lib/mysql environment: diff --git a/examples/moodle/setup-linux.sh b/examples/moodle/setup-linux.sh index 5041b3c04..ccaa198a5 100755 --- a/examples/moodle/setup-linux.sh +++ b/examples/moodle/setup-linux.sh @@ -13,7 +13,7 @@ else echo "❌ No PHP user found" exit 1 fi -curl https://download.moodle.org/download.php/direct/stable400/moodle-4.0.2.tgz -Lo /tmp/moodle.tgz +curl https://download.moodle.org/download.php/direct/stable401/moodle-4.1.tgz -Lo /tmp/moodle.tgz tar -xzf /tmp/moodle.tgz -C /tmp cp -r /tmp/moodle/* /var/www/html chown -R $user:nginx /var/www/html diff --git a/examples/moodle/swarm.yml b/examples/moodle/swarm.yml index 03c26fa62..9e62e4475 100644 --- a/examples/moodle/swarm.yml +++ b/examples/moodle/swarm.yml @@ -2,7 +2,7 @@ version: "3" services: mymoodle: - image: bitnami/moodle:latest + image: bitnami/moodle:4.1.0 networks: - bw-services depends_on: diff --git a/examples/nextcloud/docker-compose.yml b/examples/nextcloud/docker-compose.yml index 90ef7eeeb..6519e18c2 100644 --- a/examples/nextcloud/docker-compose.yml +++ b/examples/nextcloud/docker-compose.yml @@ -39,25 +39,11 @@ services: LIMIT_REQ_RATE_2: "8r/s" LIMIT_REQ_URL_3: "/core/preview" LIMIT_REQ_RATE_3: "5r/s" - CUSTOM_CONF_MODSEC_CRS_nextcloud: "\ - SecAction \ - \"id:900130,\ - phase:1,\ - nolog,\ - pass,\ - t:none,\ - setvar:tx.crs_exclusions_nextcloud=1\" + CUSTOM_CONF_MODSEC_CRS_nextcloud: + 'SecAction "id:900130,phase:1,nolog,pass,t:none,setvar:tx.crs_exclusions_nextcloud=1" - # WebDAV - SecAction \ - \"id:900200,\ - phase:1,\ - nolog,\ - pass,\ - t:none,\ - setvar:'tx.allowed_methods=GET POST HEAD COPY DELETE LOCK MKCOL MOVE PROPFIND PROPPATCH PUT UNLOCK OPTIONS'\"" - CUSTOM_CONF_MODSEC_nextcloud: "\ - SecRule REQUEST_FILENAME \"@rx ^/remote.php/dav/files/\" \"id:1000,ctl:ruleRemoveByTag=attack-protocol,ctl:ruleRemoveByTag=attack-generic,nolog\"" + # WebDAV SecAction "id:900200,phase:1,nolog,pass,t:none,setvar:''tx.allowed_methods=GET POST HEAD COPY DELETE LOCK MKCOL MOVE PROPFIND PROPPATCH PUT UNLOCK OPTIONS''"' + CUSTOM_CONF_MODSEC_nextcloud: 'SecRule REQUEST_FILENAME "@rx ^/remote.php/dav/files/" "id:1000,ctl:ruleRemoveByTag=attack-protocol,ctl:ruleRemoveByTag=attack-generic,nolog"' labels: - "bunkerweb.INSTANCE" # required for the scheduler to recognize the container networks: @@ -78,7 +64,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -104,7 +90,7 @@ services: - bw-services mydb: - image: mariadb:10.5 + image: mariadb:10.10 volumes: - db-data:/var/lib/mysql environment: diff --git a/examples/passbolt/autoconf.yml b/examples/passbolt/autoconf.yml index 29ed5671a..7ae791667 100644 --- a/examples/passbolt/autoconf.yml +++ b/examples/passbolt/autoconf.yml @@ -5,7 +5,7 @@ services: # example : docker-compose exec mypassbolt su -m -c "/usr/share/php/passbolt/bin/cake passbolt register_user -u -f -l -r admin" -s /bin/sh www-data # more info at https://github.com/passbolt/passbolt_docker mypassbolt: - image: passbolt/passbolt:3.8.1-1-ce + image: passbolt/passbolt:3.8.3-1-ce networks: bw-services: aliases: diff --git a/examples/passbolt/docker-compose.yml b/examples/passbolt/docker-compose.yml index 0ece685ba..5da776479 100644 --- a/examples/passbolt/docker-compose.yml +++ b/examples/passbolt/docker-compose.yml @@ -51,7 +51,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -63,9 +63,9 @@ services: # example : docker-compose exec mypassbolt su -m -c "/usr/share/php/passbolt/bin/cake passbolt register_user -u -f -l -r admin" -s /bin/sh www-data # more info at https://github.com/passbolt/passbolt_docker mypassbolt: - image: passbolt/passbolt:3.8.1-1-ce + image: passbolt/passbolt:3.8.3-1-ce #Alternatively you can use rootless: - # image: passbolt/passbolt:3.8.1-1-ce-non-root + # image: passbolt/passbolt:3.8.3-1-ce-non-root depends_on: - mydb environment: diff --git a/examples/php-multisite/autoconf.yml b/examples/php-multisite/autoconf.yml index 23ff60890..5ed9a7434 100644 --- a/examples/php-multisite/autoconf.yml +++ b/examples/php-multisite/autoconf.yml @@ -2,11 +2,11 @@ version: "3" services: myapp1: - image: php:fpm - # ⚠️ UID and GID of mywww (101:101) and php:fpm (33:33) are not the same ⚠️ + image: php:fpm-alpine3.17 + # ⚠️ UID and GID of mywww (101:101) and php:fpm-alpine3.17 (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www/app1.example.com:/app # folder containing PHP app1 (don't forget to rename it) networks: @@ -19,11 +19,11 @@ services: - bunkerweb.REMOTE_PHP_PATH=/app myapp2: - image: php:fpm - # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm (33:33) are not the same ⚠️ + image: php:fpm-alpine3.17 + # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm-alpine3.17 (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www/app2.example.com:/app # folder containing PHP app2 (don't forget to rename it) networks: diff --git a/examples/php-multisite/docker-compose.yml b/examples/php-multisite/docker-compose.yml index 5614eaa9d..d9565cdc9 100644 --- a/examples/php-multisite/docker-compose.yml +++ b/examples/php-multisite/docker-compose.yml @@ -46,7 +46,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -55,22 +55,22 @@ services: - net-docker myapp1: - image: php:fpm - # ⚠️ UID and GID of mywww (101:101) and php:fpm (33:33) are not the same ⚠️ + image: php:fpm-alpine3.17 + # ⚠️ UID and GID of mywww (101:101) and php:fpm-alpine3.17 (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www/app1.example.com:/app # folder containing PHP app1 (don't forget to rename it) networks: - net-app1 myapp2: - image: php:fpm - # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm (33:33) are not the same ⚠️ + image: php:fpm-alpine3.17 + # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm-alpine3.17 (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www/app2.example.com:/app # folder containing PHP app2 (don't forget to rename it) networks: diff --git a/examples/php-multisite/setup-autoconf.sh b/examples/php-multisite/setup-autoconf.sh index b777f182a..f87e3d84c 100755 --- a/examples/php-multisite/setup-autoconf.sh +++ b/examples/php-multisite/setup-autoconf.sh @@ -7,6 +7,6 @@ fi chown -R root:101 bw-data chmod -R 770 bw-data -chown -R 33:101 ./bw-data/www +chown -R 82:101 ./bw-data/www find ./bw-data/www -type f -exec chmod 0640 {} \; find ./bw-data/www -type d -exec chmod 0750 {} \; diff --git a/examples/php-multisite/setup-docker.sh b/examples/php-multisite/setup-docker.sh index b777f182a..f87e3d84c 100755 --- a/examples/php-multisite/setup-docker.sh +++ b/examples/php-multisite/setup-docker.sh @@ -7,6 +7,6 @@ fi chown -R root:101 bw-data chmod -R 770 bw-data -chown -R 33:101 ./bw-data/www +chown -R 82:101 ./bw-data/www find ./bw-data/www -type f -exec chmod 0640 {} \; find ./bw-data/www -type d -exec chmod 0750 {} \; diff --git a/examples/php-singlesite/docker-compose.yml b/examples/php-singlesite/docker-compose.yml index 405fcbf5a..8208d1984 100644 --- a/examples/php-singlesite/docker-compose.yml +++ b/examples/php-singlesite/docker-compose.yml @@ -42,7 +42,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -51,11 +51,11 @@ services: - net-docker myphp: - image: php:fpm - # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm (33:33) are not the same ⚠️ + image: php:fpm-alpine3.17 + # ⚠️ UID and GID of bunkerweb (101:101) and php:fpm-alpine3.17 (82:82) are not the same ⚠️ # but both needs access to the files and folders of web-files # don't forget to edit the permissions of the files and folders accordingly - # example : chown -R 33:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; + # example : chown -R 82:101 ./bw-data/www && find ./bw-data/www -type f -exec chmod 0640 {} \; && find ./bw-data/www -type d -exec chmod 0750 {} \; volumes: - ./bw-data/www:/app # folder containing PHP app networks: diff --git a/examples/php-singlesite/setup-docker.sh b/examples/php-singlesite/setup-docker.sh index b777f182a..f87e3d84c 100755 --- a/examples/php-singlesite/setup-docker.sh +++ b/examples/php-singlesite/setup-docker.sh @@ -7,6 +7,6 @@ fi chown -R root:101 bw-data chmod -R 770 bw-data -chown -R 33:101 ./bw-data/www +chown -R 82:101 ./bw-data/www find ./bw-data/www -type f -exec chmod 0640 {} \; find ./bw-data/www -type d -exec chmod 0750 {} \; diff --git a/examples/prestashop/docker-compose.yml b/examples/prestashop/docker-compose.yml index cba075c24..2b9da688d 100644 --- a/examples/prestashop/docker-compose.yml +++ b/examples/prestashop/docker-compose.yml @@ -53,7 +53,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -79,7 +79,7 @@ services: - bw-services mydb: - image: mariadb + image: mariadb:10.10 volumes: - db-data:/var/lib/mysql environment: diff --git a/examples/proxy-protocol/docker-compose.yml b/examples/proxy-protocol/docker-compose.yml index b078ec530..649cf88d0 100644 --- a/examples/proxy-protocol/docker-compose.yml +++ b/examples/proxy-protocol/docker-compose.yml @@ -47,7 +47,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -56,7 +56,7 @@ services: - net-docker myproxy: - image: haproxy + image: haproxy:2.7-alpine ports: - 80:8080 - 443:8443 diff --git a/examples/radarr/autoconf.yml b/examples/radarr/autoconf.yml index 2a28efdce..654200289 100644 --- a/examples/radarr/autoconf.yml +++ b/examples/radarr/autoconf.yml @@ -2,7 +2,7 @@ version: "3.5" services: radarr: - image: lscr.io/linuxserver/radarr:latest + image: lscr.io/linuxserver/radarr:4.2.4.6635-ls157 networks: bw-services: aliases: diff --git a/examples/radarr/docker-compose.yml b/examples/radarr/docker-compose.yml index 16da1b1d1..c6c790cc1 100644 --- a/examples/radarr/docker-compose.yml +++ b/examples/radarr/docker-compose.yml @@ -54,7 +54,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -63,7 +63,7 @@ services: - net-docker radarr: - image: lscr.io/linuxserver/radarr:latest + image: lscr.io/linuxserver/radarr:4.2.4.6635-ls157 container_name: radarr environment: - PUID=1000 diff --git a/examples/radarr/swarm.yml b/examples/radarr/swarm.yml index e501ba081..28f4fb4d5 100644 --- a/examples/radarr/swarm.yml +++ b/examples/radarr/swarm.yml @@ -2,7 +2,7 @@ version: "3.3" services: radarr: - image: linuxserver/radarr:latest + image: lscr.io/linuxserver/radarr:4.2.4.6635-ls157 networks: - bw-services environment: diff --git a/examples/redmine/autoconf.yml b/examples/redmine/autoconf.yml index 19df738ef..b06b54735 100644 --- a/examples/redmine/autoconf.yml +++ b/examples/redmine/autoconf.yml @@ -2,7 +2,7 @@ version: "3" services: myredmine: - image: redmine + image: redmine:5.0.4-alpine restart: always volumes: - ./redmine-data:/usr/src/redmine/files @@ -21,19 +21,7 @@ services: - bunkerweb.REVERSE_PROXY_URL=/ - bunkerweb.REVERSE_PROXY_HOST=http://myredmine:3000 - mydb: - image: mysql - volumes: - - ./db-data:/var/lib/mysql - networks: - bw-services: - aliases: - - mydb - environment: - - MYSQL_ROOT_PASSWORD=db-root-pwd # replace with a stronger password - - MYSQL_DATABASE=redminedb - - MYSQL_USER=user - - MYSQL_PASSWORD=db-user-pwd # replace with a stronger password (must match REDMINE_DB_PASSWORD) + # For the database, you can refer to the autoconf example including a database networks: bw-services: diff --git a/examples/redmine/docker-compose.yml b/examples/redmine/docker-compose.yml index 4cfb26778..f3f66b45b 100644 --- a/examples/redmine/docker-compose.yml +++ b/examples/redmine/docker-compose.yml @@ -47,7 +47,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -56,7 +56,7 @@ services: - net-docker myredmine: - image: redmine + image: redmine:5.0.4-alpine restart: always volumes: - ./redmine-data:/usr/src/redmine/files @@ -69,7 +69,7 @@ services: - bw-services mydb: - image: mariadb + image: mariadb:10.10 volumes: - db-data:/var/lib/mysql environment: diff --git a/examples/redmine/swarm.yml b/examples/redmine/swarm.yml index e1f986444..4015c4578 100644 --- a/examples/redmine/swarm.yml +++ b/examples/redmine/swarm.yml @@ -23,21 +23,7 @@ services: - bunkerweb.REVERSE_PROXY_URL=/ - bunkerweb.REVERSE_PROXY_HOST=http://myredmine:3000 - mydb: - image: mysql - volumes: - - db_data:/var/lib/mysql - networks: - - bw-services - environment: - - MYSQL_ROOT_PASSWORD=db-root-pwd # replace with a stronger password - - MYSQL_DATABASE=redminedb - - MYSQL_USER=user - - MYSQL_PASSWORD=db-user-pwd # replace with a stronger password (must match REDMINE_DB_PASSWORD) - deploy: - placement: - constraints: - - "node.role==worker" + # For the database, you can refer to the swarm example including a database networks: bw-services: diff --git a/examples/reverse-proxy-multisite/docker-compose.yml b/examples/reverse-proxy-multisite/docker-compose.yml index 2fcd71ad4..e894c3a0c 100644 --- a/examples/reverse-proxy-multisite/docker-compose.yml +++ b/examples/reverse-proxy-multisite/docker-compose.yml @@ -48,7 +48,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/reverse-proxy-singlesite/docker-compose.yml b/examples/reverse-proxy-singlesite/docker-compose.yml index d44622448..165f5a2f1 100644 --- a/examples/reverse-proxy-singlesite/docker-compose.yml +++ b/examples/reverse-proxy-singlesite/docker-compose.yml @@ -52,7 +52,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/reverse-proxy-websocket/docker-compose.yml b/examples/reverse-proxy-websocket/docker-compose.yml index 0ffbad7a8..87534dd8d 100644 --- a/examples/reverse-proxy-websocket/docker-compose.yml +++ b/examples/reverse-proxy-websocket/docker-compose.yml @@ -45,7 +45,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/syslog/docker-compose.yml b/examples/syslog/docker-compose.yml index b86042f2c..074363b42 100644 --- a/examples/syslog/docker-compose.yml +++ b/examples/syslog/docker-compose.yml @@ -53,7 +53,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -62,7 +62,7 @@ services: - net-docker mysyslog: - image: balabit/syslog-ng + image: balabit/syslog-ng:3.38.1 command: --no-caps volumes: - ./syslog-ng.conf:/etc/syslog-ng/syslog-ng.conf diff --git a/examples/tomcat/docker-compose.yml b/examples/tomcat/docker-compose.yml index 4d96e68cd..0db38b88f 100644 --- a/examples/tomcat/docker-compose.yml +++ b/examples/tomcat/docker-compose.yml @@ -43,7 +43,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -52,7 +52,7 @@ services: - net-docker mytomcat: - image: tomcat + image: tomcat:10.1.2 volumes: - ./app:/usr/local/tomcat/webapps/ # folder containing war files networks: diff --git a/examples/tor-hidden-service/docker-compose.yml b/examples/tor-hidden-service/docker-compose.yml index de6980bfc..c8225bb59 100644 --- a/examples/tor-hidden-service/docker-compose.yml +++ b/examples/tor-hidden-service/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: myonion: - image: goldy/tor-hidden-service + image: goldy/tor-hidden-service:0.4.6.9 volumes: - ./hidden-services:/var/lib/tor/hidden_service # .onion address and private key will be located in ./hidden_service environment: @@ -54,7 +54,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/web-ui/docker-compose.yml b/examples/web-ui/docker-compose.yml index da4b758a8..9eef98761 100644 --- a/examples/web-ui/docker-compose.yml +++ b/examples/web-ui/docker-compose.yml @@ -67,7 +67,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: diff --git a/examples/wordpress/autoconf.yml b/examples/wordpress/autoconf.yml index 6a2447131..37eb0cc5e 100644 --- a/examples/wordpress/autoconf.yml +++ b/examples/wordpress/autoconf.yml @@ -2,7 +2,7 @@ version: "3" services: mywp: - image: wordpress:5-apache + image: wordpress:6.1.1-apache volumes: - ./wp-data:/var/www/html networks: @@ -31,19 +31,7 @@ services: t:none,\ setvar:tx.crs_exclusions_wordpress=1" - mydb: - image: mariadb - volumes: - - ./db-data:/var/lib/mysql - networks: - bw-services: - aliases: - - mydb - environment: - - MYSQL_ROOT_PASSWORD=db-root-pwd # replace with a stronger password - - MYSQL_DATABASE=wp - - MYSQL_USER=user - - MYSQL_PASSWORD=db-user-pwd # replace with a stronger password (must match WORDPRESS_DB_PASSWORD) + # For the database, you can refer to the autoconf integration example including a database networks: bw-services: diff --git a/examples/wordpress/docker-compose.yml b/examples/wordpress/docker-compose.yml index e2104987a..731a93439 100644 --- a/examples/wordpress/docker-compose.yml +++ b/examples/wordpress/docker-compose.yml @@ -49,7 +49,7 @@ services: - net-docker docker-proxy: - image: tecnativa/docker-socket-proxy + image: tecnativa/docker-socket-proxy:0.1 volumes: - /var/run/docker.sock:/var/run/docker.sock:ro environment: @@ -58,7 +58,7 @@ services: - net-docker mywp: - image: wordpress:5-apache + image: wordpress:6.1.1-apache volumes: - ./wp-data:/var/www/html environment: @@ -71,7 +71,7 @@ services: - bw-services mydb: - image: mariadb + image: mariadb:10.10 volumes: - db-data:/var/lib/mysql environment: diff --git a/examples/wordpress/setup-linux.sh b/examples/wordpress/setup-linux.sh index f6e363dd2..eb1963d1a 100755 --- a/examples/wordpress/setup-linux.sh +++ b/examples/wordpress/setup-linux.sh @@ -13,8 +13,8 @@ else echo "❌ No PHP user found" exit 1 fi -curl https://wordpress.org/latest.zip -Lo /tmp/wordpress.zip -unzip -qq /tmp/wordpress.zip -d /tmp +curl https://wordpress.org/wordpress-6.1.1.tar.gz -Lo /tmp/wordpress.tar.gz +tar -xzf /tmp/wordpress.tar.gz -C /tmp cp -r /tmp/wordpress/* /var/www/html chown -R $user:nginx /var/www/html find /var/www/html -type f -exec chmod 0640 {} \; diff --git a/examples/wordpress/swarm.yml b/examples/wordpress/swarm.yml index d02c11ed3..b0842d721 100644 --- a/examples/wordpress/swarm.yml +++ b/examples/wordpress/swarm.yml @@ -24,21 +24,7 @@ services: - bunkerweb.REVERSE_PROXY_URL=/ - bunkerweb.REVERSE_PROXY_HOST=http://mywp - mydb: - image: mariadb - volumes: - - db_data:/var/lib/mysql - networks: - - bw-services - environment: - - MYSQL_ROOT_PASSWORD=db-root-pwd # replace with a stronger password - - MYSQL_DATABASE=wp - - MYSQL_USER=user - - MYSQL_PASSWORD=db-user-pwd # replace with a stronger password (must match WORDPRESS_DB_PASSWORD) - deploy: - placement: - constraints: - - "node.role==worker" + # For the database, you can refer to the swarm integration example including a database networks: bw-services: