librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

fix redmine/docker example, remove double AUTOCONF_MODE in integrations, remove useless backslash in start.sh/linux, rename container for ui/tests

This commit is contained in:
florian 2023-03-22 19:53:22 +01:00
parent 55d24a8d14
commit 7dc25b3a52
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
11 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/redmine/docker-compose.yml
View File

@ -51,9 +51,9 @@ services:
- redmine-data:/usr/src/redmine/files
environment:
- REDMINE_DB_MYSQL=mydb
- REDMINE_DB_DATABASE=${REDMINE_DATABASE:-redminedb}
- REDMINE_DB_USERNAME=${REDMINE_USER:-user}
- REDMINE_DB_PASSWORD=${REDMINE_PASSWORD:-secret} # set a stronger password in a .env file (must match MYSQL_PASSWORD)
- REDMINE_DB_DATABASE=redminedb
- REDMINE_DB_USERNAME=user
- REDMINE_DB_PASSWORD=db-user-pwd # set a stronger password in a .env file (must match MYSQL_PASSWORD)
networks:
- bw-services

1
misc/integrations/autoconf.mariadb.ui.yml
View File

@ -27,7 +27,6 @@ services:
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
- AUTOCONF_MODE=yes
- DOCKER_HOST=tcp://bw-docker:2375
- AUTOCONF_MODE=yes
networks:
- bw-universe
- bw-docker

1
misc/integrations/autoconf.mariadb.yml
View File

@ -27,7 +27,6 @@ services:
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
- AUTOCONF_MODE=yes
- DOCKER_HOST=tcp://bw-docker:2375
- AUTOCONF_MODE=yes
networks:
- bw-universe
- bw-docker

1
misc/integrations/autoconf.mysql.ui.yml
View File

@ -27,7 +27,6 @@ services:
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
- AUTOCONF_MODE=yes
- DOCKER_HOST=tcp://bw-docker:2375
- AUTOCONF_MODE=yes
networks:
- bw-universe
- bw-docker

1
misc/integrations/autoconf.mysql.yml
View File

@ -27,7 +27,6 @@ services:
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db
- AUTOCONF_MODE=yes
- DOCKER_HOST=tcp://bw-docker:2375
- AUTOCONF_MODE=yes
networks:
- bw-universe
- bw-docker

1
misc/integrations/autoconf.postgres.ui.yml
View File

@ -27,7 +27,6 @@ services:
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
- AUTOCONF_MODE=yes
- DOCKER_HOST=tcp://bw-docker:2375
- AUTOCONF_MODE=yes
networks:
- bw-universe
- bw-docker

1
misc/integrations/autoconf.postgres.yml
View File

@ -27,7 +27,6 @@ services:
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db
- AUTOCONF_MODE=yes
- DOCKER_HOST=tcp://bw-docker:2375
- AUTOCONF_MODE=yes
networks:
- bw-universe
- bw-docker

1
misc/integrations/autoconf.ui.yml
View File

@ -27,7 +27,6 @@ services:
environment:
- AUTOCONF_MODE=yes
- DOCKER_HOST=tcp://bw-docker:2375
- AUTOCONF_MODE=yes
networks:
- bw-universe
- bw-docker

1
misc/integrations/autoconf.yml
View File

@ -39,7 +39,6 @@ services:
volumes:
- bw-data:/data
environment:
- AUTOCONF_MODE=yes
- DOCKER_HOST=tcp://bw-docker:2375
- AUTOCONF_MODE=yes
networks:

2
src/linux/scripts/start.sh
View File

@ -35,7 +35,7 @@ function start() {
# Create dummy variables.env
if [ ! -f /etc/bunkerweb/variables.env ]; then
echo -ne "\# remove IS_LOADING=yes when your config is ready\nIS_LOADING=yes\nHTTP_PORT=80\nHTTPS_PORT=443\nAPI_LISTEN_IP=127.0.0.1\nSERVER_NAME=\n" > /etc/bunkerweb/variables.env
echo -ne "# remove IS_LOADING=yes when your config is ready\nIS_LOADING=yes\nHTTP_PORT=80\nHTTPS_PORT=443\nAPI_LISTEN_IP=127.0.0.1\nSERVER_NAME=\n" > /etc/bunkerweb/variables.env
fi
# Update database

4
tests/ui/tests.sh
View File

@ -9,7 +9,7 @@ sed -i "s@bunkerity/bunkerweb-scheduler:.*@scheduler-tests@" docker-compose.yml
sed -i "s@bunkerity/bunkerweb-ui:.*@ui-tests@" docker-compose.yml
# Start stack
docker-compose pull docker-proxy app1
docker-compose pull bw-docker-proxy app1
if [ $? -ne 0 ] ; then
echo "❌ Pull failed"
exit 1
@ -21,7 +21,7 @@ if [ $? -ne 0 ] ; then
fi
i=0
while [ $i -lt 120 ] ; do
containers=("ui-bw-1" "ui-bw-scheduler-1" "ui-bw-ui-1" "ui-docker-proxy-1" "ui-app1-1")
containers=("ui-bw-1" "ui-bw-scheduler-1" "ui-bw-ui-1" "ui-bw-docker-proxy-1" "ui-app1-1")
healthy="true"
for container in "${containers[@]}" ; do
check="$(docker inspect --format "{{json .State.Health }}" $container | grep "healthy")"