github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'v3' of github.com:jumpserver/jumpserver into v3

pull/9090/head
Jiangjie.Bai 2022-11-16 11:29:10 +08:00
parent e118ed655b e8fb6d5380
commit 0dec61368c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Dockerfile
View File

@ -45,8 +45,10 @@ ARG TOOLS=" \
unzip \ unzip \
wget" wget"
ARG APT_MIRROR=http://mirrors.ustc.edu.cn
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \
sed -i 's@http://.*.debian.org@http://mirrors.ustc.edu.cn@g' /etc/apt/sources.list \ sed -i "s@http://.*.debian.org@${APT_MIRROR}@g" /etc/apt/sources.list \
&& rm -f /etc/apt/apt.conf.d/docker-clean \ && rm -f /etc/apt/apt.conf.d/docker-clean \
&& ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& apt-get update \ && apt-get update \
@ -61,18 +63,15 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=core \
&& echo "zh_CN.UTF-8" | dpkg-reconfigure locales \ && echo "zh_CN.UTF-8" | dpkg-reconfigure locales \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ARG ORACLE_LIB_MAJOR=19 ARG DOWNLOAD_URL=https://download.jumpserver.org
ARG ORACLE_LIB_MINOR=10
ENV ORACLE_FILE="instantclient-basiclite-linux.${TARGETARCH:-amd64}-${ORACLE_LIB_MAJOR}.${ORACLE_LIB_MINOR}.0.0.0dbru.zip"
RUN mkdir -p /opt/oracle/ \ RUN mkdir -p /opt/oracle/ \
&& cd /opt/oracle/ \ && cd /opt/oracle/ \
&& wget https://download.jumpserver.org/files/oracle/${ORACLE_FILE} \ && wget ${DOWNLOAD_URL}/public/instantclient-basiclite-linux.${TARGETARCH}-19.10.0.0.0.zip \
&& unzip instantclient-basiclite-linux.${TARGETARCH-amd64}-19.10.0.0.0dbru.zip \ && unzip instantclient-basiclite-linux.${TARGETARCH}-19.10.0.0.0.zip \
&& mv instantclient_${ORACLE_LIB_MAJOR}_${ORACLE_LIB_MINOR} instantclient \ && sh -c "echo /opt/oracle/instantclient_19_10 > /etc/ld.so.conf.d/oracle-instantclient.conf" \
&& echo "/opt/oracle/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf \
&& ldconfig \ && ldconfig \
&& rm -f ${ORACLE_FILE} && rm -f instantclient-basiclite-linux.${TARGETARCH}-19.10.0.0.0.zip
WORKDIR /tmp/build WORKDIR /tmp/build
COPY ./requirements ./requirements COPY ./requirements ./requirements

11
apps/perms/const.py
View File

@ -10,11 +10,11 @@ __all__ = ["ActionChoices"]
class ActionChoices(BitChoices): class ActionChoices(BitChoices):
connect = bit(1), _("Connect") connect = bit(0), _("Connect")
upload = bit(2), _("Upload") upload = bit(1), _("Upload")
download = bit(3), _("Download") download = bit(2), _("Download")
copy = bit(4), _("Copy") copy = bit(3), _("Copy")
paste = bit(5), _("Paste") paste = bit(4), _("Paste")
@classmethod @classmethod
def is_tree(cls): def is_tree(cls):
@ -23,6 +23,7 @@ class ActionChoices(BitChoices):
@classmethod @classmethod
def branches(cls): def branches(cls):
return ( return (
cls.connect,
(_("Transfer"), [cls.upload, cls.download]), (_("Transfer"), [cls.upload, cls.download]),
(_("Clipboard"), [cls.copy, cls.paste]), (_("Clipboard"), [cls.copy, cls.paste]),
) )