mirror of
https://github.com/bunkerity/bunkerized-nginx
synced 2023-12-13 21:30:18 +01:00
fix cors/docker example, add missing AUTOCONF_MODE=yes to integrations YMLs, proper save_config for Linux and fix image name for UI tests
This commit is contained in:
parent
d331131c09
commit
73b640bd3b
|
@ -99,3 +99,6 @@ networks:
|
|||
- subnet: 10.20.30.0/24
|
||||
bw-docker:
|
||||
bw-services:
|
||||
|
||||
volumes:
|
||||
bw-data:
|
|
@ -26,6 +26,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -38,6 +39,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -73,6 +75,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
- ADMIN_USERNAME=admin
|
||||
- ADMIN_PASSWORD=changeme
|
||||
- ABSOLUTE_URI=http://www.example.com/changeme
|
||||
|
|
|
@ -26,6 +26,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -38,6 +39,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
|
|
@ -26,6 +26,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -38,6 +39,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -73,6 +75,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
- ADMIN_USERNAME=admin
|
||||
- ADMIN_PASSWORD=admin
|
||||
- ABSOLUTE_URI=http://www.example.com/admin
|
||||
|
|
|
@ -26,6 +26,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -38,6 +39,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
|
|
@ -26,6 +26,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -38,6 +39,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -72,6 +74,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
- ADMIN_USERNAME=admin
|
||||
- ADMIN_PASSWORD=changeme
|
||||
- ABSOLUTE_URI=http://www.example.com/changeme
|
||||
|
|
|
@ -26,6 +26,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -38,6 +39,7 @@ services:
|
|||
environment:
|
||||
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
|
|
@ -26,6 +26,7 @@ services:
|
|||
- bw-data:/data
|
||||
environment:
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -39,6 +40,7 @@ services:
|
|||
- bw-data:/data
|
||||
environment:
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
@ -63,6 +65,7 @@ services:
|
|||
- bw-data:/data
|
||||
environment:
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
- ADMIN_USERNAME=admin
|
||||
- ADMIN_PASSWORD=changeme
|
||||
- ABSOLUTE_URI=http://www.example.com/changeme
|
||||
|
|
|
@ -24,6 +24,7 @@ services:
|
|||
- bw-docker
|
||||
environment:
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
volumes:
|
||||
- bw-data:/data
|
||||
networks:
|
||||
|
@ -39,6 +40,7 @@ services:
|
|||
- bw-data:/data
|
||||
environment:
|
||||
- DOCKER_HOST=tcp://bw-docker:2375
|
||||
- AUTOCONF_MODE=yes
|
||||
networks:
|
||||
- bw-universe
|
||||
- bw-docker
|
||||
|
|
|
@ -39,7 +39,11 @@ function start() {
|
|||
fi
|
||||
|
||||
# Update database
|
||||
/usr/share/bunkerweb/gen/save_config.py --variables /etc/bunkerweb/variables.env --init
|
||||
if [ ! -f /var/lib/bunkerweb/db.sqlite3 ]; then
|
||||
/usr/share/bunkerweb/gen/save_config.py --variables /etc/bunkerweb/variables.env --init
|
||||
else
|
||||
/usr/share/bunkerweb/gen/save_config.py --variables /etc/bunkerweb/variables.env
|
||||
fi
|
||||
if [ "$?" -ne 0 ] ; then
|
||||
log "ENTRYPOINT" "❌" "Scheduler generator failed"
|
||||
exit 1
|
||||
|
|
|
@ -24,6 +24,7 @@ services:
|
|||
www.example.com_REVERSE_PROXY_HOST: "http://bw-ui:7000"
|
||||
www.example.com_REVERSE_PROXY_HEADERS: "X-Script-Name /admin"
|
||||
www.example.com_REVERSE_PROXY_INTERCEPT_ERRORS: "no"
|
||||
www.example.com_INTERCEPTED_ERROR_CODES: "400 405 413 429 500 501 502 503 504"
|
||||
labels:
|
||||
- "bunkerweb.INSTANCE"
|
||||
networks:
|
||||
|
@ -37,38 +38,38 @@ services:
|
|||
depends_on:
|
||||
- bw
|
||||
environment:
|
||||
DOCKER_HOST: "tcp://docker-proxy:2375"
|
||||
DOCKER_HOST: "tcp://bw-docker-proxy:2375"
|
||||
volumes:
|
||||
- bw-data:/data
|
||||
networks:
|
||||
- bw-universe
|
||||
- net-docker
|
||||
- bw-docker
|
||||
|
||||
bw-ui:
|
||||
image: bunkerity/bunkerweb-ui:1.5.0-beta
|
||||
pull_policy: never
|
||||
depends_on:
|
||||
- bw
|
||||
- docker-proxy
|
||||
- bw-docker-proxy
|
||||
environment:
|
||||
ABSOLUTE_URI: "http://www.example.com:8080/admin/"
|
||||
ADMIN_USERNAME: "admin"
|
||||
ADMIN_PASSWORD: "admin"
|
||||
DOCKER_HOST: "tcp://docker-proxy:2375"
|
||||
DOCKER_HOST: "tcp://bw-docker-proxy:2375"
|
||||
volumes:
|
||||
- bw-data:/data
|
||||
networks:
|
||||
- net-docker
|
||||
- bw-docker
|
||||
- bw-universe
|
||||
|
||||
docker-proxy:
|
||||
bw-docker-proxy:
|
||||
image: tecnativa/docker-socket-proxy
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||
environment:
|
||||
- CONTAINERS=1
|
||||
networks:
|
||||
- net-docker
|
||||
- bw-docker
|
||||
|
||||
app1:
|
||||
image: tutum/hello-world
|
||||
|
@ -78,7 +79,6 @@ services:
|
|||
|
||||
volumes:
|
||||
bw-data:
|
||||
mariadb:
|
||||
|
||||
networks:
|
||||
bw-universe:
|
||||
|
@ -93,4 +93,4 @@ networks:
|
|||
driver: default
|
||||
config:
|
||||
- subnet: 192.168.0.0/24
|
||||
net-docker:
|
||||
bw-docker:
|
||||
|
|
|
@ -6,7 +6,7 @@ cd ./tests/ui
|
|||
# Prepare environment
|
||||
sed -i "s@bunkerity/bunkerweb:.*@bunkerweb-tests@" docker-compose.yml
|
||||
sed -i "s@bunkerity/bunkerweb-scheduler:.*@scheduler-tests@" docker-compose.yml
|
||||
sed -i "s@bunkerity/bunkerweb-ui:.*@scheduler-tests@" docker-compose.yml
|
||||
sed -i "s@bunkerity/bunkerweb-ui:.*@ui-tests@" docker-compose.yml
|
||||
|
||||
# Start stack
|
||||
docker-compose pull docker-proxy app1
|
||||
|
|
Loading…
Reference in a new issue