Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

quickstart guide fixes

Browse Source
This commit is contained in:
florian 2021-08-13 21:29:58 +02:00
parent f1d5c07cc1
commit 3cedc0ae13
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoconf/src/DockerController.py
View File

@ -70,10 +70,8 @@ class DockerController(Controller.Controller) :
# Generate first config # Generate first config
env = self.get_env() env = self.get_env()
if not self.gen_conf(env) : if not self.gen_conf(env) :
self.lock.release()
return False, env return False, env
# Wait for nginx # Wait for nginx
self.lock.release()
return self._config.wait(instances), env return self._config.wait(instances), env
except : except :
pass pass

30
docs/quickstart_guide.md
View File

@ -35,7 +35,7 @@ $ docker run -d \
--network services-net \ --network services-net \
tutum/hello-world tutum/hello-world
$ docker run -d \ $ docker run -d \
--network services-net --network services-net \
-p 80:8080 \ -p 80:8080 \
-p 443:8443 \ -p 443:8443 \
-v "${PWD}/certs:/etc/letsencrypt" \ -v "${PWD}/certs:/etc/letsencrypt" \
@ -87,7 +87,7 @@ When the Docker autoconf stack is running, you simply need to start the containe
$ docker run -d \ $ docker run -d \
--name myservice \ --name myservice \
--network services-net \ --network services-net \
-l bunkerized-nginx.SERVER_NAME=www.example.com \ -l bunkerized-nginx.SERVER_NAME=www.example.com \
-l bunkerized-nginx.USE_REVERSE_PROXY=yes \ -l bunkerized-nginx.USE_REVERSE_PROXY=yes \
-l bunkerized-nginx.REVERSE_PROXY_URL=/ \ -l bunkerized-nginx.REVERSE_PROXY_URL=/ \
-l bunkerized-nginx.REVERSE_PROXY_HOST=http://myservice \ -l bunkerized-nginx.REVERSE_PROXY_HOST=http://myservice \
@ -103,7 +103,7 @@ services:
myservice: myservice:
image: tutum/hello-world image: tutum/hello-world
networks: networks:
myservice: services-net:
aliases: aliases:
- myservice - myservice
labels: labels:
@ -354,8 +354,8 @@ When the Docker autoconf stack is running, you simply need to start the containe
$ docker run -d \ $ docker run -d \
--name myservice \ --name myservice \
--network services-net \ --network services-net \
-v "${PWD}/www/app.example.com:/app" \ -v "${PWD}/www/www.example.com:/app" \
-l bunkerized-nginx.SERVER_NAME=www.example.com \ -l bunkerized-nginx.SERVER_NAME=www.example.com \
-l bunkerized-nginx.REMOTE_PHP=myservice \ -l bunkerized-nginx.REMOTE_PHP=myservice \
-l bunkerized-nginx.REMOTE_PHP_PATH=/app \ -l bunkerized-nginx.REMOTE_PHP_PATH=/app \
php:fpm php:fpm
@ -369,9 +369,9 @@ services:
myservice: myservice:
image: php:fpm image: php:fpm
volumes: volumes:
- ./www/app.example.com:/app - ./www/www.example.com:/app
networks: networks:
myservice: services-net:
aliases: aliases:
- myservice - myservice
labels: labels:
@ -393,8 +393,8 @@ $ docker service create \
--name myservice \ --name myservice \
--constraint node.role==worker \ --constraint node.role==worker \
--network services-net \ --network services-net \
--mount type=bind,source=/shared/www/app.example.com,destination=/app \ --mount type=bind,source=/shared/www/www.example.com,destination=/app \
-l bunkerized-nginx.SERVER_NAME=www.example.com \ -l bunkerized-nginx.SERVER_NAME=www.example.com \
-l bunkerized-nginx.REMOTE_PHP=myservice \ -l bunkerized-nginx.REMOTE_PHP=myservice \
-l bunkerized-nginx.REMOTE_PHP_PATH=/app \ -l bunkerized-nginx.REMOTE_PHP_PATH=/app \
php:fpm php:fpm
@ -530,7 +530,7 @@ $ docker run -d \
-v "${PWD}/www/app2.example.com:/app" \ -v "${PWD}/www/app2.example.com:/app" \
php:fpm php:fpm
$ docker run -d \ $ docker run -d \
--network services-net --network services-net \
-p 80:8080 \ -p 80:8080 \
-p 443:8443 \ -p 443:8443 \
-v "${PWD}/www:/www:ro" \ -v "${PWD}/www:/www:ro" \
@ -540,7 +540,7 @@ $ docker run -d \
-e AUTO_LETS_ENCRYPT=yes \ -e AUTO_LETS_ENCRYPT=yes \
-e app1.example.com_USE_REVERSE_PROXY=yes \ -e app1.example.com_USE_REVERSE_PROXY=yes \
-e app1.example.com_REVERSE_PROXY_URL=/ \ -e app1.example.com_REVERSE_PROXY_URL=/ \
-e app1.example.com_REVERSE_PROXY_HOST=http://myservice \ -e app1.example.com_REVERSE_PROXY_HOST=http://myapp1 \
-e app2.example.com_REMOTE_PHP=myapp2 \ -e app2.example.com_REMOTE_PHP=myapp2 \
-e app2.example.com_REMOTE_PHP_PATH=/app \ -e app2.example.com_REMOTE_PHP_PATH=/app \
bunkerity/bunkerized-nginx bunkerity/bunkerized-nginx
@ -603,7 +603,7 @@ $ docker run -d \
-l bunkerized-nginx.SERVER_NAME=app1.example.com \ -l bunkerized-nginx.SERVER_NAME=app1.example.com \
-l bunkerized-nginx.USE_REVERSE_PROXY=yes \ -l bunkerized-nginx.USE_REVERSE_PROXY=yes \
-l bunkerized-nginx.REVERSE_PROXY_URL=/ \ -l bunkerized-nginx.REVERSE_PROXY_URL=/ \
-l bunkerized-nginx.REVERSE_PROXY_HOST=http://myapp1 -l bunkerized-nginx.REVERSE_PROXY_HOST=http://myapp1 \
tutum/hello-world tutum/hello-world
$ docker run -d \ $ docker run -d \
--name myapp2 \ --name myapp2 \
@ -624,7 +624,7 @@ services:
myapp1: myapp1:
image: tutum/hello-world image: tutum/hello-world
networks: networks:
myapp1: services-net:
aliases: aliases:
- myapp1 - myapp1
labels: labels:
@ -636,11 +636,11 @@ services:
myapp2: myapp2:
image: php:fpm image: php:fpm
networks: networks:
myapp2: services-net:
aliases: aliases:
- myapp2 - myapp2
volumes: volumes:
- ./www/app2.example.com:/www - ./www/app2.example.com:/app
labels: labels:
- bunkerized-nginx.SERVER_NAME=app2.example.com - bunkerized-nginx.SERVER_NAME=app2.example.com
- bunkerized-nginx.REMOTE_PHP=myapp2 - bunkerized-nginx.REMOTE_PHP=myapp2