Skip to content

Commit

Permalink
Fix compatibility issue with Docker Compose v2 2.23.0 in examples and…
Browse files Browse the repository at this point in the history 
… docs
  • Loading branch information
@TheophileDiot
TheophileDiot committed Oct 26, 2023
1 parent 72d856a commit 8ec9a7d
Show file tree
Hide file tree
Showing 93 changed files with 102 additions and 102 deletions.
8 changes: 4 additions & 4 deletions docs/integrations.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ services:
mybunker:
image: bunkerity/bunkerweb:1.5.3
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- MY_SETTING=value
- ANOTHER_SETTING=another value
Expand Down Expand Up @@ -257,7 +257,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
Expand Down Expand Up @@ -340,7 +340,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
Expand Down Expand Up @@ -502,7 +502,7 @@ services:
constraints:
- "node.role == worker"
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
bw-autoconf:
image: bunkerity/bunkerweb-autoconf:1.5.3
Expand Down
10 changes: 5 additions & 5 deletions docs/quickstart-guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ You will find more settings about reverse proxy in the [settings section](settin
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
Expand Down Expand Up @@ -391,7 +391,7 @@ You will find more settings about reverse proxy in the [settings section](settin
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
- MULTISITE=yes
Expand Down Expand Up @@ -1156,7 +1156,7 @@ For complete list of settings regarding `stream` mode, please refer to the [sett
- 10000:10000 # app1
- 20000:20000 # app2
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=app1.example.com app2.example.com
- API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
Expand Down Expand Up @@ -1820,7 +1820,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=app1.example.com app2.example.com
- MULTISITE=yes
Expand Down Expand Up @@ -1918,7 +1918,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma
volumes:
- ./www:/var/www/html
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- MULTISITE=yes
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database
Expand Down
6 changes: 3 additions & 3 deletions docs/web-ui.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Because the web UI is a web application, the recommended installation procedure
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- MULTISITE=yes
Expand Down Expand Up @@ -194,7 +194,7 @@ Because the web UI is a web application, the recommended installation procedure
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
Expand Down Expand Up @@ -351,7 +351,7 @@ Because the web UI is a web application, the recommended installation procedure
constraints:
- "node.role == worker"
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"

bw-autoconf:
image: bunkerity/bunkerweb-autoconf:1.5.3
Expand Down
2 changes: 1 addition & 1 deletion examples/authelia/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/authentik/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/behind-reverse-proxy/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
- USE_REAL_IP=yes
- REAL_IP_FROM=10.10.10.0/24
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- net-proxy
- bw-universe
Expand Down
2 changes: 1 addition & 1 deletion examples/bigbluebutton/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=http://10.7.7.253:8080
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
# You have to put this IP address in your docker-compose.yml file
networks:
bbb-net:
Expand Down
2 changes: 1 addition & 1 deletion examples/certbot-dns-cloudflare/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- app3.example.com_REVERSE_PROXY_URL=/
- app3.example.com_REVERSE_PROXY_HOST=http://app3
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/certbot-dns-digitalocean/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- app3.example.com_REVERSE_PROXY_URL=/
- app3.example.com_REVERSE_PROXY_HOST=http://app3
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/certbot-dns-google/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- app3.example.com_REVERSE_PROXY_URL=/
- app3.example.com_REVERSE_PROXY_HOST=http://app3
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/certbot-dns-ovh/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- app3.example.com_REVERSE_PROXY_URL=/
- app3.example.com_REVERSE_PROXY_HOST=http://app3
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/certbot-dns-route53/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- app3.example.com_REVERSE_PROXY_URL=/
- app3.example.com_REVERSE_PROXY_HOST=http://app3
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/cors/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
- app3.example.com_REMOTE_PHP=myapp3
- app3.example.com_REMOTE_PHP_PATH=/app
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-configs/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ services:
}
}
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/drupal/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
LIMIT_REQ_URL_1: "/core/install.php"
LIMIT_REQ_RATE_1: "5r/s"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/ghost/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=http://myghost:2368
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/gogs/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- |
CUSTOM_CONF_MODSEC_CRS_gogs=SecAction "id:900220,phase:1,nolog,pass,t:none,setvar:'tx.allowed_request_content_type=|application/x-www-form-urlencoded| |multipart/form-data| |multipart/related| |text/xml| |application/xml| |application/soap+xml| |application/x-amf| |application/json| |application/cloudevents+json| |application/cloudevents-batch+json| |application/octet-stream| |application/csp-report| |application/xss-auditor-report| |text/plain| |application/x-git-upload-pack-request| |application/x-git-receive-pack-request|'"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/hardened/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
- REVERSE_PROXY_HOST=http://myapp
- REMOTE_PHP_PATH=/app
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/joomla/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
LIMIT_REQ_URL_2: "/installation/index.php"
LIMIT_REQ_RATE_2: "8r/s"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/load-balancer/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
server app3:80;
}
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/magento/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
proxy_buffers 4 512k;
proxy_buffer_size 256k;
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/mattermost/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
- LIMIT_REQ_URL_3=^/static/
- LIMIT_REQ_RATE_3=10r/s
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/mongo-express/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
CUSTOM_CONF_MODSEC_mongo-express=
SecRule REQUEST_FILENAME "@rx ^/db" "id:1,ctl:ruleRemoveByTag=attack-generic,ctl:ruleRemoveByTag=attack-protocol,nolog"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/moodle/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=https://mymoodle:8443
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/nextcloud/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
CUSTOM_CONF_MODSEC_nextcloud=
SecRule REQUEST_FILENAME "@rx ^/remote.php/dav/files/" "id:2000,ctl:ruleRemoveByTag=attack-protocol,ctl:ruleRemoveByTag=attack-generic,nolog"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/passbolt/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=https://mypassbolt
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/php-cookie-flags/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
- REMOTE_PHP=myphp
- REMOTE_PHP_PATH=/app
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/php-multisite/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- app2.example.com_REMOTE_PHP=myapp2
- app2.example.com_REMOTE_PHP_PATH=/app
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- net-app1
Expand Down
2 changes: 1 addition & 1 deletion examples/php-singlesite/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
- REMOTE_PHP=myphp
- REMOTE_PHP_PATH=/app
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/prestashop/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
LIMIT_REQ_URL_1: "/install/index.php"
LIMIT_REQ_RATE_1: "8r/s"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/proxy-protocol/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
- REAL_IP_FROM=10.10.10.0/24
- REAL_IP_HEADER=proxy_protocol
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- net-proxy
- bw-universe
Expand Down
2 changes: 1 addition & 1 deletion examples/radarr/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:
- LIMIT_REQ_URL_1=^/api/
- LIMIT_REQ_RATE_1=10r/s
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/redmine/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=http://myredmine:3000
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/reverse-proxy-multisite/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
- app2.example.com_REVERSE_PROXY_URL=/
- app2.example.com_REVERSE_PROXY_HOST=http://app2
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
2 changes: 1 addition & 1 deletion examples/reverse-proxy-singlesite/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
rewrite ^(.*)$$ $$1/ permanent;
}
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services
Expand Down
Loading

0 comments on commit 8ec9a7d

Please sign in to comment.