Fix: netfx nugets

ixre · Oct 24, 2021 · ce5c8d9 · ce5c8d9
1 parent 57ae819
commit ce5c8d9
Show file tree

Hide file tree

Showing 1,293 changed files with 133,455 additions and 133,471 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -1,30 +1,30 @@
-kind: pipeline
-name: default
-
-steps:
-  - name: docker
-    image: plugins/docker
-    settings:
-      repo: jarry6/cms
-      tags: latest
-      username: jarry6                                                                                                                                                                                            
-      password:
-          from_secret: docker_password
-  - name: "compile for fx48"
-    image: jarry6/drone-mono4:latest
-    settings:
-        exec: bash ./aspnet_pack.sh
-  - name: publish
-    image: appleboy/drone-scp
-    settings:
-      host: pub.56x.net
-      username: root
-      password:
-        from_secret: server_password
-      port: 22
-      target: /data/baozhang/nginx/data/files/${DRONE_REPO_NAME}
-      source: jrcms-aspnet-latest.tar.gz
-trigger:
-  branch:
-    - master
+kind: pipeline
+name: default
+
+steps:
+  - name: docker
+    image: plugins/docker
+    settings:
+      repo: jarry6/cms
+      tags: latest
+      username: jarry6                                                                                                                                                                                            
+      password:
+          from_secret: docker_password
+  - name: "compile for fx48"
+    image: jarry6/drone-mono4:latest
+    settings:
+        exec: bash ./aspnet_pack.sh
+  - name: publish
+    image: appleboy/drone-scp
+    settings:
+      host: pub.56x.net
+      username: root
+      password:
+        from_secret: server_password
+      port: 22
+      target: /data/baozhang/nginx/data/files/${DRONE_REPO_NAME}
+      source: jrcms-aspnet-latest.tar.gz
+trigger:
+  branch:
+    - master
     - feature
diff --git a/.gitignore b/.gitignore
@@ -1,50 +1,50 @@
-*.pdb
-*.txt
-*.suo
-.vs
-*.pid
-Debug
-dist
-obj
-bin/*
-.backup
-src/*.dll
-/chunk/Source_Code/UIApp/Ops.Cms.WebUI/config/cms.config.mssql
-/chunk/Source_Code/Framework/Ops.Cms.Cache/CacheCompoment
-bin
-tmp
-out
-dist
-/chunk/dist/atnet.devfw.dll
-/chunk/dist/atnet.cms.dll
-/chunk/dist/leveldb-sharp.dll
-/chunk/dist/Newtonsoft.Json.dll
-/chunk/dist/atnet.cms.extend.dll
-/chunk/Source_Code/UIApp/Ops.Cms.WebUI/config/cache.pid
-/chunk/dist/plugins
-packages
-.vs
-/script/generator/generated_code
-output
-/cms/core/JR.Cms.Core/*.user
-.DS_Store
-.idea
-
-/src/TestResults
-*.user
-cms.config
-devsofts
-txxf
-*.tar.gz
-src/NetFx/JR.Cms.AspNet.App/config/
-src/NetFx/JR.Cms.AspNet.App/public
-src/NetFx/JR.Cms.AspNet.App/templates
-src/NetFx/JR.Cms.App/templates/fze
-src/NetFx/JR.Cms.App/config
-src/NetFx/JR.Cms.AspNet.App/public
-src/NetFx/JR.Cms.AspNet.App/oem
-src/NetFx/JR.Cms.AspNet.App/install
-src/NetFx/JR.Cms.AspNet.App/uploads
-*.blob
-
-/src/JR.Cms.App/index.html
+*.pdb
+*.txt
+*.suo
+.vs
+*.pid
+Debug
+dist
+obj
+bin/*
+.backup
+src/*.dll
+/chunk/Source_Code/UIApp/Ops.Cms.WebUI/config/cms.config.mssql
+/chunk/Source_Code/Framework/Ops.Cms.Cache/CacheCompoment
+bin
+tmp
+out
+dist
+/chunk/dist/atnet.devfw.dll
+/chunk/dist/atnet.cms.dll
+/chunk/dist/leveldb-sharp.dll
+/chunk/dist/Newtonsoft.Json.dll
+/chunk/dist/atnet.cms.extend.dll
+/chunk/Source_Code/UIApp/Ops.Cms.WebUI/config/cache.pid
+/chunk/dist/plugins
+packages
+.vs
+/script/generator/generated_code
+output
+/cms/core/JR.Cms.Core/*.user
+.DS_Store
+.idea
+
+/src/TestResults
+*.user
+cms.config
+devsofts
+txxf
+*.tar.gz
+src/NetFx/JR.Cms.AspNet.App/config/
+src/NetFx/JR.Cms.AspNet.App/public
+src/NetFx/JR.Cms.AspNet.App/templates
+src/NetFx/JR.Cms.App/templates/fze
+src/NetFx/JR.Cms.App/config
+src/NetFx/JR.Cms.AspNet.App/public
+src/NetFx/JR.Cms.AspNet.App/oem
+src/NetFx/JR.Cms.AspNet.App/install
+src/NetFx/JR.Cms.AspNet.App/uploads
+*.blob
+
+/src/JR.Cms.App/index.html
diff --git a/Dockerfile b/Dockerfile
@@ -1,73 +1,73 @@
-# JR Cms .NET ! Open source .net cross platform cms.
-# Version : 3.2
-# Author : jarrysix([email protected])
-# Date : 2020-03-22 08:02
-
-# How to docked a dotnet app: 
-# https://docs.docker.com/engine/examples/dotnetcore/
-
-
-
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
-ENV RELEASE_DIR /app/out/release
-WORKDIR /app
-COPY . ./
-WORKDIR src/JR.Cms.App
-RUN dotnet restore && dotnet publish -c Release -o ${RELEASE_DIR}
-RUN mkdir -p ${RELEASE_DIR}/root && cp -r root/*.md ${RELEASE_DIR}/root && \
-    mkdir -p ${RELEASE_DIR}/templates && cp -r templates/default ${RELEASE_DIR}/templates && \
-    cp -r public oem install plugins ${RELEASE_DIR} && \
-    cd ${RELEASE_DIR} && \
-    rm -rf *.pdb *.xml appsettings.json appsettings.Development.json && \
-    rm -rf runtimes/win* runtimes/osx* runtimes/*arm* runtimes/*x86 && \
-    cp ../../LICENSE ../../README.md . && ls -al
-
-# 设置开发者
-MAINTAINER jarrysix
-# 设置标签
-LABEL Vendor="jarrysix"
-LABEL License="GPLv2"
-LABEL Version=4.0
-
-# Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine
-ENV CMS_RUN_ON_DOCKER yes
-WORKDIR /cms
-COPY --from=build-env /app/out/release ./
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
-    apk add libgdiplus --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted && \
-    apk add tzdata fontconfig ttf-dejavu && \
-    cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && apk del tzdata \
-    && echo "create data init folder.." && \
-    mkdir -p ${CMS_INIT_DIR:=/var/cms} && mv -f templates plugins oem root ${CMS_INIT_DIR} && \
-    echo "if [ \`ls /cms/templates|wc -w\` -eq 0 ];then cp -r ${CMS_INIT_DIR}/templates/* /cms/templates;fi;" \
-         "if [ \`ls /cms/plugins|wc -w\` -eq 0 ];then cp -r ${CMS_INIT_DIR}/plugins/* /cms/plugins;fi;"\
-         "if [ \`ls /cms/oem|wc -w\` -eq 0 ];then cp -r ${CMS_INIT_DIR}/oem/* /cms/oem;fi;"\
-         "dotnet JR.Cms.App.dll --urls http://+:80" > ../entrypoint.sh && chmod u+x ../entrypoint.sh
-
-VOLUME ["/cms/config","/cms/templates","/cms/plugins",\
-        "/cms/uploads","/cms/data","/cms/root","/cms/oem"]
-
-EXPOSE 80
-
-ENTRYPOINT ["sh","../entrypoint.sh"]
-
-# # Quick Start
-# # ```
-# # docker run --rm -it -p 8080:80 jarry6/cms
-# # ```
-# # open http://localhost:8080 in your brower.
-
-# # Advance
-# ```
-# docker run --rm -p 8080:8080 \
-# 	--volume=$(pwd)/config:/cms/config \
-#   --volume=$(pwd)/oem:/cms/oem \
-# 	--volume=$(pwd)/templates:/cms/templates \
-# 	--volume=$(pwd)/plugins:/cms/plugins \
-# 	--volume=$(pwd)/uploads:/cms/uploads \
-# 	--volume=$(pwd)/data:/cms/data \
-#   --volume=$(pwd)/root:/cms/root \
-# 	jarry6/cms
-# ```
-
+# JR Cms .NET ! Open source .net cross platform cms.
+# Version : 3.2
+# Author : jarrysix([email protected])
+# Date : 2020-03-22 08:02
+
+# How to docked a dotnet app: 
+# https://docs.docker.com/engine/examples/dotnetcore/
+
+
+
+FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
+ENV RELEASE_DIR /app/out/release
+WORKDIR /app
+COPY . ./
+WORKDIR src/JR.Cms.App
+RUN dotnet restore && dotnet publish -c Release -o ${RELEASE_DIR}
+RUN mkdir -p ${RELEASE_DIR}/root && cp -r root/*.md ${RELEASE_DIR}/root && \
+    mkdir -p ${RELEASE_DIR}/templates && cp -r templates/default ${RELEASE_DIR}/templates && \
+    cp -r public oem install plugins ${RELEASE_DIR} && \
+    cd ${RELEASE_DIR} && \
+    rm -rf *.pdb *.xml appsettings.json appsettings.Development.json && \
+    rm -rf runtimes/win* runtimes/osx* runtimes/*arm* runtimes/*x86 && \
+    cp ../../LICENSE ../../README.md . && ls -al
+
+# 设置开发者
+MAINTAINER jarrysix
+# 设置标签
+LABEL Vendor="jarrysix"
+LABEL License="GPLv2"
+LABEL Version=4.0
+
+# Build runtime image
+FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine
+ENV CMS_RUN_ON_DOCKER yes
+WORKDIR /cms
+COPY --from=build-env /app/out/release ./
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
+    apk add libgdiplus --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted && \
+    apk add tzdata fontconfig ttf-dejavu && \
+    cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && apk del tzdata \
+    && echo "create data init folder.." && \
+    mkdir -p ${CMS_INIT_DIR:=/var/cms} && mv -f templates plugins oem root ${CMS_INIT_DIR} && \
+    echo "if [ \`ls /cms/templates|wc -w\` -eq 0 ];then cp -r ${CMS_INIT_DIR}/templates/* /cms/templates;fi;" \
+         "if [ \`ls /cms/plugins|wc -w\` -eq 0 ];then cp -r ${CMS_INIT_DIR}/plugins/* /cms/plugins;fi;"\
+         "if [ \`ls /cms/oem|wc -w\` -eq 0 ];then cp -r ${CMS_INIT_DIR}/oem/* /cms/oem;fi;"\
+         "dotnet JR.Cms.App.dll --urls http://+:80" > ../entrypoint.sh && chmod u+x ../entrypoint.sh
+
+VOLUME ["/cms/config","/cms/templates","/cms/plugins",\
+        "/cms/uploads","/cms/data","/cms/root","/cms/oem"]
+
+EXPOSE 80
+
+ENTRYPOINT ["sh","../entrypoint.sh"]
+
+# # Quick Start
+# # ```
+# # docker run --rm -it -p 8080:80 jarry6/cms
+# # ```
+# # open http://localhost:8080 in your brower.
+
+# # Advance
+# ```
+# docker run --rm -p 8080:8080 \
+# 	--volume=$(pwd)/config:/cms/config \
+#   --volume=$(pwd)/oem:/cms/oem \
+# 	--volume=$(pwd)/templates:/cms/templates \
+# 	--volume=$(pwd)/plugins:/cms/plugins \
+# 	--volume=$(pwd)/uploads:/cms/uploads \
+# 	--volume=$(pwd)/data:/cms/data \
+#   --volume=$(pwd)/root:/cms/root \
+# 	jarry6/cms
+# ```
+