From d30db8cf9cabd764595bd13419c0e28b41d9338b Mon Sep 17 00:00:00 2001 From: colachg Date: Fri, 8 May 2020 14:12:45 +0800 Subject: [PATCH 1/2] Try to fix image tag --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index a8c5f12b7..7049f0c68 100644 --- 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 From 3ae036d5b66951fd61aa94fe7c1a8a2af7cb3e9b Mon Sep 17 00:00:00 2001 From: colachg Date: Fri, 8 May 2020 14:27:29 +0800 Subject: [PATCH 2/2] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e23e8a7f8..097f0306f 100644 --- 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"] \ No newline at end of file +CMD ["/etc/trojan-go/config.json"] \ No newline at end of file