Merge pull request #48 from colachg/dev

Fix docker image tag
p4gefau1t · May 8, 2020 · 3005f4c · 3005f4c
2 parents 86f0217 + 3ae036d
commit 3005f4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -32,7 +32,7 @@ jobs:
         id: prepare
         run: |
           if [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo ::set-output name=version::${GITHUB_REF#refs/tags/v}
+            echo ::set-output name=version::${GITHUB_REF#refs/tags/}
           else
             echo ::set-output name=version::snapshot
           fi

diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN apk add --update git &&\
 FROM alpine
 WORKDIR /
 COPY --from=builder /trojan-go/release /usr/local/bin/
-COPY example/server.json /etc/trojan-go/
+COPY example/server.json /etc/trojan-go/config.json
 
 ENTRYPOINT ["/usr/local/bin/trojan-go", "-config"]
-CMD ["/etc/trojan-go/server.json"]
+CMD ["/etc/trojan-go/config.json"]