diff --git a/dashboard/public/favicon.png b/dashboard/public/favicon.png index 2b96fed..b0b9c6b 100644 Binary files a/dashboard/public/favicon.png and b/dashboard/public/favicon.png differ diff --git a/dashboard/src/assets/jerp-logo.svg b/dashboard/src/assets/jerp-logo.svg index 814abff..8ca7b42 100644 --- a/dashboard/src/assets/jerp-logo.svg +++ b/dashboard/src/assets/jerp-logo.svg @@ -1,12 +1,162 @@ - - - - jerp-logo - Created with Sketch. - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/dashboard/src/assets/jingrow-cloud.svg b/dashboard/src/assets/jingrow-cloud.svg index 2947f78..8ca7b42 100644 --- a/dashboard/src/assets/jingrow-cloud.svg +++ b/dashboard/src/assets/jingrow-cloud.svg @@ -1,4 +1,162 @@ - - - - + + + + + + + + + + + diff --git a/dashboard/src/assets/jingrow-framework-logo.png b/dashboard/src/assets/jingrow-framework-logo.png index 5049078..74e327b 100644 Binary files a/dashboard/src/assets/jingrow-framework-logo.png and b/dashboard/src/assets/jingrow-framework-logo.png differ diff --git a/dashboard/src/components/icons/JLogo.vue b/dashboard/src/components/icons/JLogo.vue index 025ee1e..32997d5 100644 --- a/dashboard/src/components/icons/JLogo.vue +++ b/dashboard/src/components/icons/JLogo.vue @@ -1,198 +1,164 @@ \ No newline at end of file diff --git a/jcloud/docker/Dockerfile b/jcloud/docker/Dockerfile index b13de81..542fb37 100644 --- a/jcloud/docker/Dockerfile +++ b/jcloud/docker/Dockerfile @@ -184,6 +184,9 @@ RUN --mount=type=cache,target=/home/jingrow/.cache,uid=1000,gid=1000 npm install ENV PATH "$PATH:/home/jingrow/.local/bin" RUN wget https://bootstrap.pypa.io/get-pip.py && python${PYTHON_VERSION} get-pip.py `#stage-pre-pip` +RUN python${PYTHON_VERSION} -m pip install --upgrade pip `#stage-pre-pip-upgrade` +RUN python${PYTHON_VERSION} -m pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple `#stage-pre-pip-mirror` +RUN python${PYTHON_VERSION} -m pip config set global.trusted-host pypi.tuna.tsinghua.edu.cn `#stage-pre-pip-trusted` ENV {{ pg.get_dependency_version("bench", True) }} RUN --mount=type=cache,target=/home/jingrow/.cache,uid=1000,gid=1000 python${PYTHON_VERSION} -m pip install --upgrade --resume-retries 5 --timeout 100 git+http://git.jingrow.com:3000/jingrow/bench.git `#stage-bench-bench` @@ -203,6 +206,10 @@ ENV {{v.key}} {{ v.value }} {% endfor %} # Install Jingrow app +ENV PIP_RETRIES=10 +ENV PIP_TIMEOUT=300 +ENV PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple +ENV PIP_TRUSTED_HOST=pypi.tuna.tsinghua.edu.cn RUN --mount=type=cache,sharing=locked,target=/home/jingrow/.cache,uid=1000,gid=1000 --mount=type=bind,source=apps/jingrow,target=/home/jingrow/context/apps/jingrow bench init --python /usr/bin/python${PYTHON_VERSION} --no-backups --jingrow-path file:///home/jingrow/context/apps/jingrow jingrow-bench `#stage-apps-jingrow` WORKDIR /home/jingrow/jingrow-bench diff --git a/jcloud/public/images/jingrow-cloud-logo.png b/jcloud/public/images/jingrow-cloud-logo.png deleted file mode 100644 index 56a0d25..0000000 Binary files a/jcloud/public/images/jingrow-cloud-logo.png and /dev/null differ diff --git a/jcloud/public/images/logo.png b/jcloud/public/images/logo.png deleted file mode 100644 index ae5bae0..0000000 Binary files a/jcloud/public/images/logo.png and /dev/null differ diff --git a/jcloud/translations/zh.csv b/jcloud/translations/zh.csv index 2d06cf2..1cc8e4a 100644 --- a/jcloud/translations/zh.csv +++ b/jcloud/translations/zh.csv @@ -209,7 +209,7 @@ Provider,提供商, Provider Name,提供者名称, Public,公共, Public Key,公钥, -Published,发布时间, +Published,已发布, Pull,下拉, Query,查询, Queued,排队,