Skip to content

Commit

Permalink
替换被和谐的 github.com.cnpmjs.org
Browse files Browse the repository at this point in the history
  • Loading branch information
facebook-github-bot committed Feb 10, 2022
1 parent 951d2ce commit ad7f4d6
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

FROM python:3.7-slim
ARG usesource="https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git"
ARG usesource="https://hub.fastgit.xyz/TechXueXi/TechXueXi.git"
ARG usebranche="dev"
ENV pullbranche=${usebranche}
ENV Sourcepath=${usesource}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

FROM python:3.7-slim
ARG usesource="https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git"
ARG usesource="https://hub.fastgit.xyz/TechXueXi/TechXueXi.git"
ARG usebranche="dev"
ENV pullbranche=${usebranche}
ENV Sourcepath=${usesource}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_arm32v7
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine AS builder
ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz
RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
FROM arm32v7/python:bullseye
ARG usesource="https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git"
ARG usesource="https://hub.fastgit.xyz/TechXueXi/TechXueXi.git"
ARG usebranche="dev"
ENV pullbranche=${usebranche}
ENV Sourcepath=${usesource}
Expand All @@ -23,7 +23,7 @@ ENV Secret=
ENV Nohead=True
ENV Pushmode=1
ENV islooplogin=False
#ENV Sourcepath="https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git"
#ENV Sourcepath="https://hub.fastgit.xyz/TechXueXi/TechXueXi.git"
ENV CRONTIME="30 9 * * *"
# RUN rm -f /xuexi/config/*; ls -la
COPY requirements.txt /xuexi/requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_arm32v7.dev
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine AS builder
ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz
RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
FROM arm32v7/python:bullseye
ARG usesource="https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git"
ARG usesource="https://hub.fastgit.xyz/TechXueXi/TechXueXi.git"
ARG usebranche="dev"
ENV pullbranche=${usebranche}
ENV Sourcepath=${usesource}
Expand All @@ -27,7 +27,7 @@ ENV Secret=
ENV Nohead=True
ENV Pushmode=1
ENV islooplogin=False
#ENV Sourcepath="https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git"
#ENV Sourcepath="https://hub.fastgit.xyz/TechXueXi/TechXueXi.git"
ENV CRONTIME="30 9 * * *"
# RUN rm -f /xuexi/config/*; ls -la
COPY requirements.txt /xuexi/requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_arm64v8
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1
FROM arm64v8/python:3.7-slim

COPY --from=builder qemu-aarch64-static /usr/bin
ARG usesource="https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git"
ARG usesource="https://hub.fastgit.xyz/TechXueXi/TechXueXi.git"
ARG usebranche="dev"
ENV pullbranche=${usebranche}
ENV Sourcepath=${usesource}
Expand All @@ -19,7 +19,7 @@ ENV Secret=
ENV Nohead=True
ENV Pushmode=1
ENV islooplogin=False
#ENV Sourcepath="https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git"
#ENV Sourcepath="https://hub.fastgit.xyz/TechXueXi/TechXueXi.git"
ENV CRONTIME="30 9 * * *"
# RUN rm -f /xuexi/config/*; ls -la
COPY requirements.txt /xuexi/requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile_arm64v8.dev
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN apk add --update --no-cache curl && curl -L ${QEMU_URL} | tar zxvf - -C . --
FROM arm64v8/python:3.7-slim

COPY --from=builder qemu-aarch64-static /usr/bin
ARG usesource="https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git"
ARG usesource="https://hub.fastgit.xyz/TechXueXi/TechXueXi.git"
ARG usebranche="dev"
ENV pullbranche=${usebranche}
ENV Sourcepath=${usesource}
Expand All @@ -31,7 +31,7 @@ ENV Secret=
ENV Nohead=True
ENV Pushmode=1
ENV islooplogin=False
#ENV Sourcepath="https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git"
#ENV Sourcepath="https://hub.fastgit.xyz/TechXueXi/TechXueXi.git"
ENV CRONTIME="30 9 * * *"
# RUN rm -f /xuexi/config/*; ls -la
COPY requirements.txt /xuexi/requirements.txt
Expand Down
5 changes: 4 additions & 1 deletion SourcePackages/pdlearn/version_info.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"techxuexi_version": "v20220209",
"techxuexi_version": "v20220210",
"notice": "欢迎使用 TechXueXi",
"least_version": "v20211020",
"old_version_warning": "您的版本太旧,请立即更新",
"techxuexi_update_log": [{
"version": "v20220210",
"info": "1.添加web控制台登录页面 2.替换被和谐的 github.com.cnpmjs.org"
},{
"version": "v20220209",
"info": "修改 淘宝chromedriver地址"
},{
Expand Down
4 changes: 2 additions & 2 deletions SourcePackages/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
var ajaxmockjax = 1;//是否启用虚拟Ajax的请求响 0 不启用 1 启用
//默认账号密码

var truelogin = "admin";
var truepwd = "admin";
var truelogin = "techxuexi";
var truepwd = "techxuexi.js.org";

var CodeVal = 0;
Code();
Expand Down
2 changes: 1 addition & 1 deletion windows系统git_pull_一键更新.bat
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ exit /b 0


:start
set repo_url1=https://github.com.cnpmjs.org/TechXueXi/TechXueXi.git
set repo_url1=https://hub.fastgit.xyz/TechXueXi/TechXueXi.git
set repo_url2=https://hub.fastgit.org/TechXueXi/TechXueXi.git
set push_url=git@github.com:TechXueXi/TechXueXi.git

Expand Down

0 comments on commit ad7f4d6

Please sign in to comment.