Browse Source

修复编码

liuyuqi-dellpc 10 months ago
parent
commit
dce94e68f2
3 changed files with 10 additions and 8 deletions
  1. 3 3
      .github/workflows/build.yml
  2. 5 2
      Dockerfile
  3. 2 3
      README.md

+ 3 - 3
.github/workflows/build.yml

@@ -54,10 +54,10 @@ jobs:
       - name: docker build
         run: |
           docker login --username=${{ secrets.USERNAME }} --password ${{ secrets.PASSWORD }} ccr.ccs.tencentyun.com
-          docker build . -t ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.4
+          docker build . -t ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.5
 
       - name: docker push
         run: |
-          docker push ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.4
-          docker tag $(docker images ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.4 -q) ccr.ccs.tencentyun.com/jianboy/wordtohtml:latest
+          docker push ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.5
+          docker tag $(docker images ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.5 -q) ccr.ccs.tencentyun.com/jianboy/wordtohtml:latest
           docker push ccr.ccs.tencentyun.com/jianboy/wordtohtml:latest

+ 5 - 2
Dockerfile

@@ -1,11 +1,14 @@
-FROM kfwkfulq.mirror.aliyuncs.com/library/ubuntu:20.10
-LABEL Name=wordtohtml Version=1.0.4
+FROM kfwkfulq.mirror.aliyuncs.com/library/ubuntu:20.10 as dev
+LABEL Name=wordtohtml Version=1.0.5
 EXPOSE 5000
 
+ENV LANG en_US.UTF-8
+
 # Install requirements
 RUN apt update && \
     apt install -y libreoffice
 
+# FROM jianboy/libreoffice:v1.0.5 as prod
 WORKDIR /app
 RUN mkdir -p /opt/wordtohtml
 COPY convert /opt/wordtohtml/convert

+ 2 - 3
README.md

@@ -20,11 +20,10 @@ github action 配置docker参数: USERNAME, PASSWORD, REGISTRY, GITHUB_RUN_NUM
 
 
 ```
-docker pull hub.tencentyun.com/google/wordtohtml:v1.0.1
 
-docker pull ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.1
+docker pull ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.5
 
-docker run -it --rm -v /data/wordtohtml:/app ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.1
+docker run -it --rm -v /data/wordtohtml:/app ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.5
 
 alias wordtohtml='docker run -it --rm -v /data:/app jianboy/wordtohtml'