Skip to content

J
jumpserver
Commit edc631ad authored by ibuler's avatar ibuler
Browse files
Options

[Docker] 添加Docker compose

parent ff374b71
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 20 deletions
Dockerfile
View file @ edc631ad
FROM jumpserver/alpine-py3:v3.4 FROM jumpserver/python:v3.6.1
LABEL MAINTAINER Jumpserver Team <ibuler@qq.com> LABEL MAINTAINER Jumpserver Team <ibuler@qq.com>
COPY . /opt/jumpserver COPY . /opt/jumpserver
COPY config_docker.py /opt/jumpserver/config.py
WORKDIR /opt/jumpserver WORKDIR /opt/jumpserver
RUN yum -y install epel-release
RUN cd requirements && yum -y install $(cat rpm_requirements.txt)
RUN cd requirements && pip install -r requirements.txt
RUN yum clean all
RUN rm -f data/db.sqlite3
RUN rm -r .git RUN rm -r .git
RUN rm -f config.py RUN rm -f config.py
VOLUME /opt/jumpserver/data VOLUME /opt/jumpserver/data
VOLUME /opt/jumpserver/logs VOLUME /opt/jumpserver/logs
RUN ln -s /usr/bin/pip3 /usr/bin/pip
RUN ln -s /usr/bin/python3 /usr/bin/python
RUN cp config_docker.py config.py RUN cp config_docker.py config.py
RUN pip install -r requirements/requirements.txt
RUN cd utils && sh make_migrations.sh && sh init_db.sh
EXPOSE 8080 EXPOSE 8080
CMD python run_server.py CMD cd utils && sh make_migrations.sh && sh init_db.sh && cd .. && python run_server.py
Dockerfile-alpine-py3 deleted 100644 → 0
View file @ ff374b71
FROM alpine:3.4
LABEL MAINTAINER Jumpserver Team <ibuler@qq.com>
RUN apk add --update python3 gcc python3-dev musl-dev linux-headers \
libffi-dev openssl-dev jpeg-dev freetype-dev && rm -rf /var/cache/apk/*
Dockerfile-py3 0 → 100644
View file @ edc631ad
FROM centos:centos6
LABEL MAINTAINER Jumpserver Team <ibuler@qq.com>
WORKDIR /tmp
RUN yum -y install wget sqlite-devel xz gcc automake zlib-devel openssl-devel
# 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
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
RUN rm -rf /tmp/{Python-3.6.1.tar.xz,Python-3.6.1}
apps/users/templates/users/user_asset_permission.html
View file @ edc631ad
...@@ -77,22 +77,22 @@ ...@@ -77,22 +77,22 @@
{% csrf_token %} {% csrf_token %}
<tr class="no-borders-tr"> <tr class="no-borders-tr">
<td colspan="1" style="padding-top: 0"> <td colspan="1" style="padding-top: 0">
{{ form.name|bootstrap }} {% bootstrap_field form.name layout="horizontal" %}
</td> </td>
</tr> </tr>
<tr class="no-borders-tr"> <tr class="no-borders-tr">
<td colspan="1" style="padding-top: 0"> <td colspan="1" style="padding-top: 0">
{{ form.assets|bootstrap }} {% bootstrap_field form.asset layout="horizontal" %}
</td> </td>
</tr> </tr>
<tr class="no-borders-tr"> <tr class="no-borders-tr">
<td colspan="1" style="padding-top: 0"> <td colspan="1" style="padding-top: 0">
{{ form.asset_groups|bootstrap }} {% bootstrap_field form.asset_groups layout="horizontal" %}
</td> </td>
</tr> </tr>
<tr class="no-borders-tr"> <tr class="no-borders-tr">
<td colspan="1" style="padding-top: 0"> <td colspan="1" style="padding-top: 0">
{{ form.system_users|bootstrap }} {% bootstrap_field form.system_users layout="horizontal" %}
</td> </td>
</tr> </tr>
<tr class="no-borders-tr"> <tr class="no-borders-tr">
......
apps/users/templates/users/user_group_asset_permission.html
View file @ edc631ad
...@@ -77,22 +77,22 @@ ...@@ -77,22 +77,22 @@
{% csrf_token %} {% csrf_token %}
<tr class="no-borders-tr"> <tr class="no-borders-tr">
<td colspan="1" style="padding-top: 0"> <td colspan="1" style="padding-top: 0">
{{ form.name|bootstrap }} {% bootstrap_field form.name layout="horizontal" %}
</td> </td>
</tr> </tr>
<tr class="no-borders-tr"> <tr class="no-borders-tr">
<td colspan="1" style="padding-top: 0"> <td colspan="1" style="padding-top: 0">
{{ form.assets|bootstrap }} {% bootstrap_field form.assets layout="horizontal" %}
</td> </td>
</tr> </tr>
<tr class="no-borders-tr"> <tr class="no-borders-tr">
<td colspan="1" style="padding-top: 0"> <td colspan="1" style="padding-top: 0">
{{ form.asset_groups|bootstrap }} {% bootstrap_field form.asset_groups layout="horizontal" %}
</td> </td>
</tr> </tr>
<tr class="no-borders-tr"> <tr class="no-borders-tr">
<td colspan="1" style="padding-top: 0"> <td colspan="1" style="padding-top: 0">
{{ form.system_users|bootstrap }} {% bootstrap_field form.system_users layout="horizontal" %}
</td> </td>
</tr> </tr>
<tr class="no-borders-tr"> <tr class="no-borders-tr">
......
docker-compose.yml 0 → 100644
View file @ edc631ad
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
utils/build_docker.sh 0 → 100755
View file @ edc631ad
#!/bin/bash
#
cd ..
docker build -t jumpserver/jumpserver:v0.4.0-beta1 .
\ No newline at end of file
utils/run_docker.sh 0 → 100755
View file @ edc631ad
#!/bin/bash
#
# Run redis
docker run --name redis -d redis
# Run jumpserver
docker run -d --name jumpserver -p 8080:8080 --link redis:redis jumpserver/jumpserver:v0.4.0-beta1
# Finished
echo -e "Please visit http://ServerIP:8080\n Username: admin\nPassword: admin\n"
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment