liuyuqi-dellpc 2 years ago
parent
commit
99078f9d9b
3 changed files with 9 additions and 8 deletions
  1. 3 3
      .github/workflows/build.yml
  2. 5 4
      Dockerfile
  3. 1 1
      README.md

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

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

+ 5 - 4
Dockerfile

@@ -1,5 +1,5 @@
 FROM kfwkfulq.mirror.aliyuncs.com/library/ubuntu:20.10
-LABEL Name=wordtohtml Version=1.0.2
+LABEL Name=wordtohtml Version=1.0.4
 EXPOSE 5000
 
 # Install requirements
@@ -7,9 +7,10 @@ RUN apt update && \
     apt install -y libreoffice
 
 WORKDIR /app
-COPY convert /usr/bin/convert
-RUN adduser -u 5678 --disabled-password --gecos "" lyq && chown -R lyq /app
+RUN mkdir -p /opt/wordtohtml
+COPY convert /opt/wordtohtml/convert
+RUN adduser -u 5678 --disabled-password --gecos "" lyq && chown -R lyq /app && chown -R lyq /opt/wordtohtml
 USER lyq
 
 VOLUME [ "/app" ]
-CMD ["convert"]
+CMD ["/opt/wordtohtml/convert"]

+ 1 - 1
README.md

@@ -24,7 +24,7 @@ docker pull hub.tencentyun.com/google/wordtohtml:v1.0.1
 
 docker pull ccr.ccs.tencentyun.com/jianboy/wordtohtml:v1.0.1
 
-docker run -it --rm -v /data:/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.1
 
 alias wordtohtml='docker run -it --rm -v /data:/app jianboy/wordtohtml'