Skip to content

Commit

Permalink
[Update] update docker-compose
Browse files Browse the repository at this point in the history
  • Loading branch information
ibuler committed Jun 19, 2017
1 parent 4141ae5 commit f3a5061
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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大部分代码

4 changes: 2 additions & 2 deletions apps/jumpserver/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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)
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ services:
container_name: redis
restart: always
jumpserver:
image: jumpserver/jumpserver:beta
image: jumpserver/jumpserver:v0.4.0-beta1
container_name: jumpserver
restart: always
ports:
- 8080:8080
depends_on:
- redis
coco:
image: jumpserver/coco:beta
image: jumpserver/coco:v0.4.0-beta1
container_name: coco
restart: always
ports:
- 2222:2222
depends_on:
- jumpserver
luna:
image: jumpserver/luna:beta
image: jumpserver/luna:v0.4.0-beta1
container_name: luna
restart: always
ports:
Expand Down
2 changes: 1 addition & 1 deletion utils/build_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#

cd ..
docker build -t jumpserver/jumpserver:v0.4.0-beta1 .
docker build -t jumpserver/jumpserver:v0.4.0-beta1 .

0 comments on commit f3a5061

Please sign in to comment.