From f3a50610af0b569ae2f21929463fc2c0d158506b Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 19 Jun 2017 23:15:09 +0800 Subject: [PATCH] [Update] update docker-compose --- README.md | 8 ++++++++ apps/jumpserver/middleware.py | 4 ++-- docker-compose.yml | 6 +++--- utils/build_docker.sh | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d0e4fdc00fb5..f07721c47700 100644 --- a/README.md +++ b/README.md @@ -36,3 +36,11 @@ Jumpserver是一款使用Python, Django开发的开源跳板机系统, 助力互 * [项目结构描述](https://github.com/jumpserver/jumpserver/blob/dev/docs/project_structure.md) * [Python代码规范](https://github.com/jumpserver/jumpserver/blob/dev/docs/python_style_guide.md) * [API设计规范](https://github.com/jumpserver/jumpserver/blob/dev/docs/api_style_guide.md) + +### 贡献者 +#### 0.4.0 +- ibuler <广宏伟> +- 小彧 <李磊> Django资深开发者,为users模块贡献了很多代码 +- sofia <周小侠> 资深前端工程师, luna前端代码贡献者和现在维护者 +- liuz <刘正> 全栈工程师, 编写了luna大部分代码 + diff --git a/apps/jumpserver/middleware.py b/apps/jumpserver/middleware.py index 93fbdabb20fd..e2ac5c346b17 100644 --- a/apps/jumpserver/middleware.py +++ b/apps/jumpserver/middleware.py @@ -9,7 +9,7 @@ DEMO_MODE = os.environ.get("DEMO_MODE", "") -SAFE_URL = r'^/users/login|^/api/applications/v1/.*' +SAFE_URL = r'^/users/login|^/api/applications/v1/.*|/api/audits/.*|/api/users/v1/auth/|/api/users/v1/profile/' class TimezoneMiddleware(MiddlewareMixin): @@ -24,4 +24,4 @@ def process_request(self, request): class DemoMiddleware(MiddlewareMixin): def process_request(self, request): if DEMO_MODE and request.method not in ["GET", "HEAD"] and not re.match(SAFE_URL, request.path): - return HttpResponse("Demo mode, only get request accept", 403) + return HttpResponse("Demo mode, only get request accept", status=403) diff --git a/docker-compose.yml b/docker-compose.yml index 95a80ae9656d..9fa61f2ba2f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: container_name: redis restart: always jumpserver: - image: jumpserver/jumpserver:beta + image: jumpserver/jumpserver:v0.4.0-beta1 container_name: jumpserver restart: always ports: @@ -13,7 +13,7 @@ services: depends_on: - redis coco: - image: jumpserver/coco:beta + image: jumpserver/coco:v0.4.0-beta1 container_name: coco restart: always ports: @@ -21,7 +21,7 @@ services: depends_on: - jumpserver luna: - image: jumpserver/luna:beta + image: jumpserver/luna:v0.4.0-beta1 container_name: luna restart: always ports: diff --git a/utils/build_docker.sh b/utils/build_docker.sh index b64378e1028c..0c8411498dc8 100755 --- a/utils/build_docker.sh +++ b/utils/build_docker.sh @@ -2,4 +2,4 @@ # cd .. -docker build -t jumpserver/jumpserver:v0.4.0-beta1 . \ No newline at end of file +docker build -t jumpserver/jumpserver:v0.4.0-beta1 .