Merge branch 'develop' of github.com:getzealot/zealot into develop

tryzealot · Dec 31, 2020 · 66146e0 · 66146e0
2 parents edca624 + 0e66675
commit 66146e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml
@@ -6,4 +6,13 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: Build the Docker image
-      run: docker build --build-arg REPLACE_CHINA_MIRROR=false .
+      uses: elgohr/Publish-Docker-Github-Action@master
+      env:
+        REPLACE_CHINA_MIRROR: false
+        VCS_REF: ${{ github.sha }}
+        BUILD_DATE: ${{ steps.date.outputs.date }}
+        TAG: pr-test
+      with:
+        name: icyleafcn/zealot:${{ env.TAG }}
+        no_push: true
+        buildargs: BUILD_DATE,VCS_REF,TAG,REPLACE_CHINA_MIRROR
diff --git a/Dockerfile b/Dockerfile
@@ -64,7 +64,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG TAG
 
-ARG ZEALOT_VERSION="4.0.0.rc2"
+ARG ZEALOT_VERSION="4.0.0"
 ARG REPLACE_CHINA_MIRROR="true"
 ARG ORIGINAL_REPO_URL="http://dl-cdn.alpinelinux.org"
 ARG MIRROR_REPO_URL="https://mirrors.tuna.tsinghua.edu.cn"