From 146ddc3ee0cb578655a1d6a43b5a6af8f96195ea Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 21 Dec 2017 19:26:51 +0800 Subject: [PATCH] [Update] Remove docker file --- Dockerfile | 21 -------- Dockerfile-py3 | 16 ------ config_docker.py | 120 --------------------------------------------- docker-compose.yml | 31 ------------ 4 files changed, 188 deletions(-) delete mode 100644 Dockerfile delete mode 100644 Dockerfile-py3 delete mode 100644 config_docker.py delete mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 019b20510..000000000 --- a/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM jumpserver/python:3 -MAINTAINER Jumpserver Team - - -COPY . /opt/jumpserver -WORKDIR /opt/jumpserver - -RUN yum -y install epel-release && yum clean all -y -RUN cd requirements && yum -y install $(cat rpm_requirements.txt) && yum clean all -y -RUN cd requirements && pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple - -RUN rm -r .git -RUN rm -f config.py - -VOLUME /opt/jumpserver/data -VOLUME /opt/jumpserver/logs - -RUN cp config_docker.py config.py - -EXPOSE 8080 -CMD cd utils && sh make_migrations.sh && sh init_db.sh && cd .. && python run_server.py diff --git a/Dockerfile-py3 b/Dockerfile-py3 deleted file mode 100644 index bf5a4dadb..000000000 --- a/Dockerfile-py3 +++ /dev/null @@ -1,16 +0,0 @@ -FROM centos:centos6 -LABEL MAINTAINER Jumpserver Team - -WORKDIR /tmp - -RUN yum -y install wget sqlite-devel xz gcc automake zlib-devel openssl-devel; yum clean all - -# Install Python -RUN wget https://www.python.org/ftp/python/3.6.1/Python-3.6.1.tar.xz && \ - tar xvf Python-3.6.1.tar.xz && cd Python-3.6.1 && ./configure && make && make install && \ - rm -rf /tmp/{Python-3.6.1.tar.xz,Python-3.6.1} - -RUN mv /usr/bin/python /usr/bin/python2 -RUN ln -s /usr/local/bin/python3 /usr/bin/python && ln -s /usr/local/bin/pip3 /usr/bin/pip -RUN sed -i 's@/usr/bin/python@/usr/bin/python2@g' /usr/bin/yum - diff --git a/config_docker.py b/config_docker.py deleted file mode 100644 index d23dbe4a1..000000000 --- a/config_docker.py +++ /dev/null @@ -1,120 +0,0 @@ -""" - jumpserver.config - ~~~~~~~~~~~~~~~~~ - - Jumpserver project setting file - - :copyright: (c) 2014-2016 by Jumpserver Team. - :license: GPL v2, see LICENSE for more details. -""" -import os - -BASE_DIR = os.path.dirname(os.path.abspath(__file__)) -LOG_DIR = os.path.join(BASE_DIR, 'logs') - - -class Config: - # Use it to encrypt or decrypt data - # SECURITY WARNING: keep the secret key used in production secret! - SECRET_KEY = os.environ.get('SECRET_KEY') or '2vym+ky!997d5kkcc64mnz06y1mmui3lut#(^wd=%s_qj$1%x' - - # How many line display every page, default 25 - DISPLAY_PER_PAGE = 25 - - # It's used to identify your site, When we send a create mail to user, we only know login url is /login/ - # But we should know the absolute url like: http://jms.jumpserver.org/login/, so SITE_URL is - # HTTP_PROTOCOL://HOST[:PORT] - SITE_URL = os.environ.get("SITE_URL") or 'http://localhost' - - # Domain name, If set app email will set as it - DOMAIN_NAME = 'jumpserver.org' - - # Django security setting, if your disable debug model, you should setting that - ALLOWED_HOSTS = ['*'] - - # Development env open this, when error occur display the full process track, Production disable it - DEBUG = os.environ.get("DEBUG") or False - - # DEBUG, INFO, WARNING, ERROR, CRITICAL can set. See https://docs.djangoproject.com/en/1.10/topics/logging/ - LOG_LEVEL = os.environ.get('INFO') or 'INFO' - - # Database setting, Support sqlite3, mysql, postgres .... - # See https://docs.djangoproject.com/en/1.10/ref/settings/#databases - - # Sqlite setting: - DB_ENGINE = 'sqlite3' - DB_NAME = os.path.join(BASE_DIR, 'data', 'db.sqlite3') - - # Mysql or postgres setting like: - # DB_ENGINE = 'mysql' - # DB_HOST = '127.0.0.1' - # DB_PORT = 3306 - # DB_USER = 'root' - # DB_PASSWORD = '' - # DB_NAME = 'jumpserver' - - # When Django start it will bind this host and port - # ./manage.py runserver 127.0.0.1:8080 - # Todo: Gunicorn or uwsgi run may be use it - HTTP_BIND_HOST = '0.0.0.0' - HTTP_LISTEN_PORT = 8080 - - # Use Redis as broker for celery and web socket - REDIS_HOST = '127.0.0.1' - REDIS_PORT = 6379 - REDIS_PASSWORD = '' - BROKER_URL = 'redis://%(password)s%(host)s:%(port)s/3' % { - 'password': REDIS_PASSWORD, - 'host': REDIS_HOST, - 'port': REDIS_PORT, - } - - # Api token expiration when create - TOKEN_EXPIRATION = 3600 - - # Session and csrf domain settings, If you deploy jumpserver,coco,luna standby, - # So than share cookie, and you need use a same top-level domain name - - # SESSION_COOKIE_DOMAIN = '.jms.com' - # CSRF_COOKIE_DOMAIN = '.jms.com' - SESSION_COOKIE_AGE = 3600*24 - - # Email SMTP setting, we only support smtp send mail - # EMAIL_HOST = 'smtp.qq.com' - # EMAIL_PORT = 25 - # EMAIL_HOST_USER = '' - # EMAIL_HOST_PASSWORD = '' - # EMAIL_USE_SSL = False # If port is 465, set True - # EMAIL_USE_TLS = False # If port is 587, set True - # EMAIL_SUBJECT_PREFIX = '[Jumpserver] ' - - CAPTCHA_TEST_MODE = False - - # You can set jumpserver usage url here, that when user submit wizard redirect to - USER_GUIDE_URL = '' - - # LDAP Auth settings - AUTH_LDAP = False - AUTH_LDAP_SERVER_URI = 'ldap://localhost:389' - AUTH_LDAP_BIND_DN = 'cn=admin,dc=jumpserver,dc=org' - AUTH_LDAP_BIND_PASSWORD = '' - AUTH_LDAP_USER_DN_TEMPLATE = "uid=%(user)s,ou=people,dc=jumpserver,dc=org" - AUTH_LDAP_USER_ATTR_MAP = { - "username": "cn", - "name": "sn", - "email": "mail" - } - AUTH_LDAP_START_TLS = False - - def __init__(self): - pass - - def __getattr__(self, item): - return None - - -config = { - 'docker': Config, -} - -env = 'docker' diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 9fa61f2ba..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: '2' -services: - redis: - image: redis:latest - container_name: redis - restart: always - jumpserver: - image: jumpserver/jumpserver:v0.4.0-beta1 - container_name: jumpserver - restart: always - ports: - - 8080:8080 - depends_on: - - redis - coco: - image: jumpserver/coco:v0.4.0-beta1 - container_name: coco - restart: always - ports: - - 2222:2222 - depends_on: - - jumpserver - luna: - image: jumpserver/luna:v0.4.0-beta1 - container_name: luna - restart: always - ports: - - 5000:5000 - depends_on: - - jumpserver -